diff -Naurp old/xsrc/external/mit/libdrm/dist/configure new/xsrc/external/mit/libdrm/dist/configure
--- old/xsrc/external/mit/libdrm/dist/configure	2010-11-21 08:49:31.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/configure	2011-02-08 11:14:00.000000000 +0100
@@ -1,14739 +1 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libdrm 2.4.22.
-#
-# Report bugs to <dri-devel@lists.sourceforge.net>.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: dri-devel@lists.sourceforge.net about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='libdrm'
-PACKAGE_TARNAME='libdrm'
-PACKAGE_VERSION='2.4.22'
-PACKAGE_STRING='libdrm 2.4.22'
-PACKAGE_BUGREPORT='dri-devel@lists.sourceforge.net'
-PACKAGE_URL=''
-
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_unique_file="Makefile.am"
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-WARN_CFLAGS
-kernel_source
-HAVE_RADEON_FALSE
-HAVE_RADEON_TRUE
-HAVE_INTEL_FALSE
-HAVE_INTEL_TRUE
-HAVE_LIBUDEV_FALSE
-HAVE_LIBUDEV_TRUE
-LIBUDEV_LIBS
-LIBUDEV_CFLAGS
-HAVE_CAIRO_FALSE
-HAVE_CAIRO_TRUE
-CAIRO_LIBS
-CAIRO_CFLAGS
-HAVE_NOUVEAU_FALSE
-HAVE_NOUVEAU_TRUE
-HAVE_VMWGFX_FALSE
-HAVE_VMWGFX_TRUE
-HAVE_LIBKMS_FALSE
-HAVE_LIBKMS_TRUE
-CLOCK_LIB
-pkgconfigdir
-PTHREADSTUBS_LIBS
-PTHREADSTUBS_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-ALLOCA
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-lt_ECHO
-RANLIB
-AR
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-SED
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_dependency_tracking
-enable_static
-enable_shared
-with_pic
-enable_fast_install
-with_gnu_ld
-enable_libtool_lock
-enable_largefile
-enable_silent_rules
-enable_udev
-enable_libkms
-enable_intel
-enable_radeon
-enable_vmwgfx_experimental_api
-enable_nouveau_experimental_api
-with_kernel_source
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
-PTHREADSTUBS_CFLAGS
-PTHREADSTUBS_LIBS
-CAIRO_CFLAGS
-CAIRO_LIBS
-LIBUDEV_CFLAGS
-LIBUDEV_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures libdrm 2.4.22 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/libdrm]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of libdrm 2.4.22:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-static[=PKGS]  build static libraries [default=no]
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-largefile     omit support for large files
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --enable-udev           Enable support for using udev instead of mknod
-                          (default: disabled)
-  --disable-libkms        Disable KMS mm abstraction library (default: auto)
-  --disable-intel         Enable support for intel's KMS API (default: auto)
-  --disable-radeon        Enable support for radeon's KMS API (default: auto)
-  --enable-vmwgfx-experimental-api
-                          Install vmwgfx's experimental kernel API header
-                          (default: disabled)
-  --enable-nouveau-experimental-api
-                          Enable support for nouveau's experimental API
-                          (default: disabled)
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-kernel-source    specify path to linux kernel source
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
-  PTHREADSTUBS_CFLAGS
-              C compiler flags for PTHREADSTUBS, overriding pkg-config
-  PTHREADSTUBS_LIBS
-              linker flags for PTHREADSTUBS, overriding pkg-config
-  CAIRO_CFLAGS
-              C compiler flags for CAIRO, overriding pkg-config
-  CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
-  LIBUDEV_CFLAGS
-              C compiler flags for LIBUDEV, overriding pkg-config
-  LIBUDEV_LIBS
-              linker flags for LIBUDEV, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <dri-devel@lists.sourceforge.net>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-libdrm configure 2.4.22
-generated by GNU Autoconf 2.67
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------- ##
-## Report this to dri-devel@lists.sourceforge.net ##
-## ---------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by libdrm $as_me 2.4.22, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
-
-
-  if test "$MINIX" = yes; then
-
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-
-$as_echo "#define _MINIX 1" >>confdefs.h
-
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_safe_to_define___extensions__=yes
-else
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
-am__api_version='1.11'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libdrm'
- VERSION='2.4.22'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=no
-fi
-
-
-
-
-
-
-
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6b'
-macro_revision='1.3017'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4913: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:4916: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:4919: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 6124 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7352: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7356: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7691: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7695: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7796: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:7800: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7851: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:7855: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    link_all_deplibs=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	link_all_deplibs=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo(void) {}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10235 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10331 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_working_alloca_h=yes
-else
-  ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-				    if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_func_alloca_works=yes
-else
-  ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_c_stack_direction=0
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-
-int
-main ()
-{
-  return find_stack_direction () < 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_stack_direction=1
-else
-  ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-
-# Enable quiet compiles on automake 1.11.
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
-esac
-AM_BACKSLASH='\'
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREADSTUBS" >&5
-$as_echo_n "checking for PTHREADSTUBS... " >&6; }
-
-if test -n "$PTHREADSTUBS_CFLAGS"; then
-    pkg_cv_PTHREADSTUBS_CFLAGS="$PTHREADSTUBS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_PTHREADSTUBS_CFLAGS=`$PKG_CONFIG --cflags "pthread-stubs" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$PTHREADSTUBS_LIBS"; then
-    pkg_cv_PTHREADSTUBS_LIBS="$PTHREADSTUBS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_PTHREADSTUBS_LIBS=`$PKG_CONFIG --libs "pthread-stubs" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pthread-stubs" 2>&1`
-        else
-	        PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pthread-stubs" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PTHREADSTUBS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (pthread-stubs) were not met:
-
-$PTHREADSTUBS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables PTHREADSTUBS_CFLAGS
-and PTHREADSTUBS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables PTHREADSTUBS_CFLAGS
-and PTHREADSTUBS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
-	PTHREADSTUBS_CFLAGS=$pkg_cv_PTHREADSTUBS_CFLAGS
-	PTHREADSTUBS_LIBS=$pkg_cv_PTHREADSTUBS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-
-pkgconfigdir=${libdir}/pkgconfig
-
-# Check whether --enable-udev was given.
-if test "${enable_udev+set}" = set; then :
-  enableval=$enable_udev; UDEV=$enableval
-else
-  UDEV=no
-fi
-
-
-# Check whether --enable-libkms was given.
-if test "${enable_libkms+set}" = set; then :
-  enableval=$enable_libkms; LIBKMS=$enableval
-else
-  LIBKMS=auto
-fi
-
-
-# Check whether --enable-intel was given.
-if test "${enable_intel+set}" = set; then :
-  enableval=$enable_intel; INTEL=$enableval
-else
-  INTEL=auto
-fi
-
-
-# Check whether --enable-radeon was given.
-if test "${enable_radeon+set}" = set; then :
-  enableval=$enable_radeon; RADEON=$enableval
-else
-  RADEON=auto
-fi
-
-
-# Check whether --enable-vmwgfx-experimental-api was given.
-if test "${enable_vmwgfx_experimental_api+set}" = set; then :
-  enableval=$enable_vmwgfx_experimental_api; VMWGFX=$enableval
-else
-  VMWGFX=no
-fi
-
-
-# Check whether --enable-nouveau-experimental-api was given.
-if test "${enable_nouveau_experimental_api+set}" = set; then :
-  enableval=$enable_nouveau_experimental_api; NOUVEAU=$enableval
-else
-  NOUVEAU=no
-fi
-
-
-
-
-
-
-for ac_func in clock_gettime
-do :
-  ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CLOCK_GETTIME 1
-_ACEOF
- CLOCK_LIB=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_rt_clock_gettime=yes
-else
-  ac_cv_lib_rt_clock_gettime=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
-  CLOCK_LIB=-lrt
-else
-  as_fn_error $? "Couldn't find clock_gettime" "$LINENO" 5
-fi
-
-fi
-done
-
-
-
-
-
-MAYBE_WARN="-Wall -Wextra \
--Wsign-compare -Werror-implicit-function-declaration \
--Wpointer-arith -Wwrite-strings -Wstrict-prototypes \
--Wmissing-prototypes -Wmissing-declarations -Wnested-externs \
--Wpacked -Wswitch-enum -Wmissing-format-attribute \
--Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
--Wdeclaration-after-statement -Wold-style-definition \
--Wno-missing-field-initializers -Wno-unused-parameter \
--Wno-attributes -Wno-long-long -Winline"
-
-# invalidate cached value if MAYBE_WARN has changed
-if test "x$libdrm_cv_warn_maybe" != "x$MAYBE_WARN"; then
-	unset libdrm_cv_warn_cflags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported warning flags" >&5
-$as_echo_n "checking for supported warning flags... " >&6; }
-if test "${libdrm_cv_warn_cflags+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	echo
-	WARN_CFLAGS=""
-
-	# Some warning options are not supported by all versions of
-	# gcc, so test all desired options against the current
-	# compiler.
-	#
-	# Note that there are some order dependencies
-	# here. Specifically, an option that disables a warning will
-	# have no net effect if a later option then enables that
-	# warnings, (perhaps implicitly). So we put some grouped
-	# options (-Wall and -Wextra) up front and the -Wno options
-	# last.
-
-	for W in $MAYBE_WARN; do
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $W" >&5
-$as_echo_n "checking whether $CC supports $W... " >&6; }
-
-  libdrm_save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $W"
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  libdrm_cc_flag=yes
-else
-  libdrm_cc_flag=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$libdrm_save_CFLAGS"
-
-  if test "x$libdrm_cc_flag" = "xyes"; then
-    WARN_CFLAGS="$WARN_CFLAGS $W"
-  else
-    :
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libdrm_cc_flag" >&5
-$as_echo "$libdrm_cc_flag" >&6; }
-
-	done
-
-	libdrm_cv_warn_cflags=$WARN_CFLAGS
-	libdrm_cv_warn_maybe=$MAYBE_WARN
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which warning flags were supported" >&5
-$as_echo_n "checking which warning flags were supported... " >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libdrm_cv_warn_cflags" >&5
-$as_echo "$libdrm_cv_warn_cflags" >&6; }
-WARN_CFLAGS="$libdrm_cv_warn_cflags"
-
-if test "x$UDEV" = xyes; then
-
-$as_echo "#define UDEV 1" >>confdefs.h
-
-fi
-
-
-if test "x$LIBKMS" = xauto ; then
-	case $host_os in
-		linux*)		LIBKMS="yes" ;;
-		*)		LIBKMS="no" ;;
-	esac
-fi
-
- if test "x$LIBKMS" = xyes; then
-  HAVE_LIBKMS_TRUE=
-  HAVE_LIBKMS_FALSE='#'
-else
-  HAVE_LIBKMS_TRUE='#'
-  HAVE_LIBKMS_FALSE=
-fi
-
-
- if test "x$VMWGFX" = xyes; then
-  HAVE_VMWGFX_TRUE=
-  HAVE_VMWGFX_FALSE='#'
-else
-  HAVE_VMWGFX_TRUE='#'
-  HAVE_VMWGFX_FALSE=
-fi
-
-if test "x$VMWGFX" = xyes; then
-
-$as_echo "#define HAVE_VMWGFX 1" >>confdefs.h
-
-fi
-
- if test "x$NOUVEAU" = xyes; then
-  HAVE_NOUVEAU_TRUE=
-  HAVE_NOUVEAU_FALSE='#'
-else
-  HAVE_NOUVEAU_TRUE='#'
-  HAVE_NOUVEAU_FALSE=
-fi
-
-if test "x$NOUVEAU" = xyes; then
-
-$as_echo "#define HAVE_NOUVEAU 1" >>confdefs.h
-
-fi
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
-$as_echo_n "checking for CAIRO... " >&6; }
-
-if test -n "$CAIRO_CFLAGS"; then
-    pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$CAIRO_LIBS"; then
-    pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo" 2>&1`
-        else
-	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CAIRO_PKG_ERRORS" >&5
-
-	HAVE_CAIRO=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	HAVE_CAIRO=no
-else
-	CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
-	CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVE_CAIRO=yes
-fi
-if test "x$HAVE_CAIRO" = xyes; then
-
-$as_echo "#define HAVE_CAIRO 1" >>confdefs.h
-
-fi
- if test "x$HAVE_CAIRO" = xyes; then
-  HAVE_CAIRO_TRUE=
-  HAVE_CAIRO_FALSE='#'
-else
-  HAVE_CAIRO_TRUE='#'
-  HAVE_CAIRO_FALSE=
-fi
-
-
-# For enumerating devices in test case
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5
-$as_echo_n "checking for LIBUDEV... " >&6; }
-
-if test -n "$LIBUDEV_CFLAGS"; then
-    pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBUDEV_LIBS"; then
-    pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev" 2>&1`
-        else
-	        LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBUDEV_PKG_ERRORS" >&5
-
-	HAVE_LIBUDEV=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	HAVE_LIBUDEV=no
-else
-	LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS
-	LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVE_LIBUDEV=yes
-fi
-if test "x$HAVE_LIBUDEV" = xyes; then
-
-$as_echo "#define HAVE_LIBUDEV 1" >>confdefs.h
-
-fi
- if test "x$HAVE_LIBUDEV" = xyes; then
-  HAVE_LIBUDEV_TRUE=
-  HAVE_LIBUDEV_FALSE='#'
-else
-  HAVE_LIBUDEV_TRUE='#'
-  HAVE_LIBUDEV_FALSE=
-fi
-
-
-if test "x$INTEL" != "xno" -o "x$RADEON" != "xno"; then
-    # Check for atomic intrinsics
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native atomic primitives" >&5
-$as_echo_n "checking for native atomic primitives... " >&6; }
-if test "${drm_cv_atomic_primitives+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	    drm_cv_atomic_primitives="none"
-
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-    int atomic_add(int i) { return __sync_fetch_and_add (&i, 1); }
-    int atomic_cmpxchg(int i, int j, int k) { return __sync_val_compare_and_swap (&i, j, k); }
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  drm_cv_atomic_primitives="Intel"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-	    if test "x$drm_cv_atomic_primitives" = "xnone"; then
-		    ac_fn_c_check_header_mongrel "$LINENO" "atomic_ops.h" "ac_cv_header_atomic_ops_h" "$ac_includes_default"
-if test "x$ac_cv_header_atomic_ops_h" = x""yes; then :
-  drm_cv_atomic_primitives="libatomic-ops"
-fi
-
-
-	    fi
-
-	    # atomic functions defined in <atomic.h> & libc on Solaris
-	    if test "x$drm_cv_atomic_primitives" = "xnone"; then
-		    ac_fn_c_check_func "$LINENO" "atomic_cas_uint" "ac_cv_func_atomic_cas_uint"
-if test "x$ac_cv_func_atomic_cas_uint" = x""yes; then :
-  drm_cv_atomic_primitives="Solaris"
-fi
-
-	    fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $drm_cv_atomic_primitives" >&5
-$as_echo "$drm_cv_atomic_primitives" >&6; }
-    if test "x$drm_cv_atomic_primitives" = xIntel; then
-
-$as_echo "#define HAVE_LIBDRM_ATOMIC_PRIMITIVES 1" >>confdefs.h
-
-    fi
-    if test "x$drm_cv_atomic_primitives" = "xlibatomic-ops"; then
-
-$as_echo "#define HAVE_LIB_ATOMIC_OPS 1" >>confdefs.h
-
-    fi
-
-    if test "x$drm_cv_atomic_primitives" = "xnone"; then
-           if test "x$INTEL" != "xauto"; then
-                   if test "x$INTEL" != "xno"; then
-                        as_fn_error $? "libdrm_intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package, or, failing both of those, disable support for Intel GPUs by passing --disable-intel to ./configure" "$LINENO" 5
-                   fi
-           else
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling libdrm_intel. It depends on atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package." >&5
-$as_echo "$as_me: WARNING: Disabling libdrm_intel. It depends on atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package." >&2;}
-                   INTEL=no
-           fi
-           if test "x$RADEON" != "xauto"; then
-                   if test "x$RADEON" != "xno"; then
-                        as_fn_error $? "libdrm_radeon depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package, or, failing both of those, disable support for Radeon support by passing --disable-radeon to ./configure" "$LINENO" 5
-                   fi
-           else
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling libdrm_radeon. It depends on atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package." >&5
-$as_echo "$as_me: WARNING: Disabling libdrm_radeon. It depends on atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package." >&2;}
-                   RADEON=no
-           fi
-
-    else
-           if test "x$INTEL" != "xno"; then
-                   INTEL=yes
-           fi
-           if test "x$RADEON" != "xno"; then
-                   RADEON=yes
-           fi
-    fi
-fi
-
- if test "x$INTEL" != "xno"; then
-  HAVE_INTEL_TRUE=
-  HAVE_INTEL_FALSE='#'
-else
-  HAVE_INTEL_TRUE='#'
-  HAVE_INTEL_FALSE=
-fi
-
- if test "x$RADEON" != "xno"; then
-  HAVE_RADEON_TRUE=
-  HAVE_RADEON_FALSE='#'
-else
-  HAVE_RADEON_TRUE='#'
-  HAVE_RADEON_FALSE=
-fi
-
-
-
-# Check whether --with-kernel-source was given.
-if test "${with_kernel_source+set}" = set; then :
-  withval=$with_kernel_source; kernel_source="$with_kernel_source"
-fi
-
-
-
-
-ac_config_files="$ac_config_files Makefile libkms/Makefile libkms/libkms.pc intel/Makefile intel/libdrm_intel.pc radeon/Makefile radeon/libdrm_radeon.pc nouveau/Makefile nouveau/libdrm_nouveau.pc tests/Makefile tests/modeprint/Makefile tests/modetest/Makefile tests/kmstest/Makefile tests/vbltest/Makefile include/Makefile include/drm/Makefile libdrm.pc"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${HAVE_LIBKMS_TRUE}" && test -z "${HAVE_LIBKMS_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_LIBKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_VMWGFX_TRUE}" && test -z "${HAVE_VMWGFX_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_VMWGFX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_NOUVEAU_TRUE}" && test -z "${HAVE_NOUVEAU_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_NOUVEAU\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_CAIRO_TRUE}" && test -z "${HAVE_CAIRO_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LIBUDEV_TRUE}" && test -z "${HAVE_LIBUDEV_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_LIBUDEV\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_INTEL_TRUE}" && test -z "${HAVE_INTEL_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_INTEL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_RADEON_TRUE}" && test -z "${HAVE_RADEON_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_RADEON\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by libdrm $as_me 2.4.22, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <dri-devel@lists.sourceforge.net>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-libdrm config.status 2.4.22
-configured by $0, generated by GNU Autoconf 2.67,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-AR \
-AR_FLAGS \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
-lt_prog_compiler_pic \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
-hardcode_libdir_separator \
-fix_srcfile_path \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "libkms/Makefile") CONFIG_FILES="$CONFIG_FILES libkms/Makefile" ;;
-    "libkms/libkms.pc") CONFIG_FILES="$CONFIG_FILES libkms/libkms.pc" ;;
-    "intel/Makefile") CONFIG_FILES="$CONFIG_FILES intel/Makefile" ;;
-    "intel/libdrm_intel.pc") CONFIG_FILES="$CONFIG_FILES intel/libdrm_intel.pc" ;;
-    "radeon/Makefile") CONFIG_FILES="$CONFIG_FILES radeon/Makefile" ;;
-    "radeon/libdrm_radeon.pc") CONFIG_FILES="$CONFIG_FILES radeon/libdrm_radeon.pc" ;;
-    "nouveau/Makefile") CONFIG_FILES="$CONFIG_FILES nouveau/Makefile" ;;
-    "nouveau/libdrm_nouveau.pc") CONFIG_FILES="$CONFIG_FILES nouveau/libdrm_nouveau.pc" ;;
-    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-    "tests/modeprint/Makefile") CONFIG_FILES="$CONFIG_FILES tests/modeprint/Makefile" ;;
-    "tests/modetest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/modetest/Makefile" ;;
-    "tests/kmstest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/kmstest/Makefile" ;;
-    "tests/vbltest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/vbltest/Makefile" ;;
-    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "include/drm/Makefile") CONFIG_FILES="$CONFIG_FILES include/drm/Makefile" ;;
-    "libdrm.pc") CONFIG_FILES="$CONFIG_FILES libdrm.pc" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
-
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-echo ""
-echo "$PACKAGE_STRING will be compiled with:"
-echo ""
-echo "  libkms         $LIBKMS"
-echo "  Intel API      $INTEL"
-echo "  vmwgfx API     $VMWGFX"
-echo "  Radeon API     $RADEON"
-echo "  Nouveau API    $NOUVEAU"
-echo ""
+PACKAGE_VERSION='2.4.15'
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c
--- old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c	2010-08-14 12:17:31.000000000 +0200
+++ new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c	2011-02-08 11:14:00.000000000 +0100
@@ -145,19 +145,6 @@ drm_intel_bo_exec(drm_intel_bo *bo, int
 	return bo->bufmgr->bo_exec(bo, used, cliprects, num_cliprects, DR4);
 }
 
-int
-drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
-		drm_clip_rect_t *cliprects, int num_cliprects, int DR4,
-		int ring_flag)
-{
-	if (bo->bufmgr->bo_mrb_exec)
-		return bo->bufmgr->bo_mrb_exec(bo, used,
-					cliprects, num_cliprects, DR4,
-					ring_flag);
-
-	return -ENODEV;
-}
-
 void drm_intel_bufmgr_set_debug(drm_intel_bufmgr *bufmgr, int enable_debug)
 {
 	bufmgr->debug = enable_debug;
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c
--- old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c	2010-08-14 12:17:32.000000000 +0200
+++ new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c	2011-02-08 11:14:00.000000000 +0100
@@ -299,10 +299,10 @@ _fence_wait_internal(drm_intel_bufmgr_fa
 		return;
 	}
 
-	iw.irq_seq = seq;
-
 	DBG("wait 0x%08x\n", iw.irq_seq);
 
+	iw.irq_seq = seq;
+
 	/* The kernel IRQ_WAIT implementation is all sorts of broken.
 	 * 1) It returns 1 to 0x7fffffff instead of using the full 32-bit
 	 *    unsigned range.
@@ -1292,6 +1292,42 @@ drm_intel_fake_emit_reloc(drm_intel_bo *
 	return 0;
 }
 
+static int
+drm_intel_fake_pin(drm_intel_bo *bo, uint32_t alignment)
+{
+   drm_intel_bufmgr_fake *bufmgr_fake = (drm_intel_bufmgr_fake *)bo->bufmgr;
+   drm_intel_bo_fake *bo_fake = (drm_intel_bo_fake *)bo;
+
+   assert(bo_fake->is_static == 0);
+
+   bo_fake->alignment = alignment;
+   if (drm_intel_fake_bo_validate(bo) == -1)
+      return ENOMEM;
+
+   bo_fake->is_static = 1;
+   bo->virtual = bo_fake->block->virtual;
+   /* we should be on the on_hardware list, take us off for now */
+   DRMLISTDEL(bo_fake->block);
+
+   return 0;
+}
+
+static int
+drm_intel_fake_unpin(drm_intel_bo *bo)
+{
+   drm_intel_bufmgr_fake *bufmgr_fake = (drm_intel_bufmgr_fake *)bo->bufmgr;
+   drm_intel_bo_fake *bo_fake = (drm_intel_bo_fake *)bo;
+
+   assert(bo_fake->is_static);
+
+   bo_fake->is_static = 0;
+   bo->virtual = NULL;
+   DRMLISTDEL(bo_fake->block);
+   DRMLISTADDTAIL(bo_fake->block, &bufmgr_fake->on_hardware);
+
+   return 0;
+}
+
 /**
  * Incorporates the validation flags associated with each relocation into
  * the combined validation flags for the buffer on this batchbuffer submission.
@@ -1602,6 +1638,9 @@ drm_intel_bufmgr *drm_intel_bufmgr_fake_
 	bufmgr_fake->bufmgr.bo_wait_rendering =
 	    drm_intel_fake_bo_wait_rendering;
 	bufmgr_fake->bufmgr.bo_emit_reloc = drm_intel_fake_emit_reloc;
+	bufmgr_fake->bufmgr.bo_pin = drm_intel_fake_pin;
+	bufmgr_fake->bufmgr.bo_unpin = drm_intel_fake_unpin;
+
 	bufmgr_fake->bufmgr.destroy = drm_intel_fake_destroy;
 	bufmgr_fake->bufmgr.bo_exec = drm_intel_fake_bo_exec;
 	bufmgr_fake->bufmgr.check_aperture_space =
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
--- old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c	2010-11-21 08:51:29.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c	2011-02-08 11:14:00.000000000 +0100
@@ -39,7 +39,6 @@
 #endif
 
 #include <xf86drm.h>
-#include <xf86atomic.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,7 +46,6 @@
 #include <unistd.h>
 #include <assert.h>
 #include <pthread.h>
-#include <stddef.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -55,6 +53,9 @@
 
 #include "errno.h"
 #include "libdrm_lists.h"
+#if 0
+#include "intel_atomic.h"
+#endif
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"
 #include "intel_chipset.h"
@@ -67,8 +68,6 @@
 		fprintf(stderr, __VA_ARGS__);		\
 } while (0)
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
 typedef struct _drm_intel_bo_gem drm_intel_bo_gem;
 
 struct drm_intel_gem_bo_bucket {
@@ -76,6 +75,10 @@ struct drm_intel_gem_bo_bucket {
 	unsigned long size;
 };
 
+/* Only cache objects up to 64MB.  Bigger than that, and the rounding of the
+ * size makes many operations fail that wouldn't otherwise.
+ */
+#define DRM_INTEL_GEM_BO_BUCKETS	14
 typedef struct _drm_intel_bufmgr_gem {
 	drm_intel_bufmgr bufmgr;
 
@@ -85,16 +88,13 @@ typedef struct _drm_intel_bufmgr_gem {
 
 	pthread_mutex_t lock;
 
-	struct drm_i915_gem_exec_object *exec_objects;
 	struct drm_i915_gem_exec_object2 *exec2_objects;
 	drm_intel_bo **exec_bos;
 	int exec_size;
 	int exec_count;
 
 	/** Array of lists of cached gem objects of power-of-two sizes */
-	struct drm_intel_gem_bo_bucket cache_bucket[14 * 4];
-	int num_buckets;
-	time_t time;
+	struct drm_intel_gem_bo_bucket cache_bucket[DRM_INTEL_GEM_BO_BUCKETS];
 
 	uint64_t gtt_size;
 	int available_fences;
@@ -114,7 +114,7 @@ typedef struct _drm_intel_reloc_target_i
 struct _drm_intel_bo_gem {
 	drm_intel_bo bo;
 
-	atomic_t refcount;
+	int refcount;
 	uint32_t gem_handle;
 	const char *name;
 
@@ -134,7 +134,6 @@ struct _drm_intel_bo_gem {
 	 */
 	uint32_t tiling_mode;
 	uint32_t swizzle_mode;
-	unsigned long stride;
 
 	time_t free_time;
 
@@ -146,10 +145,6 @@ struct _drm_intel_bo_gem {
 	drm_intel_reloc_target *reloc_target_info;
 	/** Number of entries in relocs */
 	int reloc_count;
-	/** Mapped address for the buffer, saved across map/unmap cycles */
-	void *mem_virtual;
-	/** GTT virtual address for the buffer, saved across map/unmap cycles */
-	void *gtt_virtual;
 
 	/** BO cache list */
 	drmMMListHead head;
@@ -190,6 +185,9 @@ struct _drm_intel_bo_gem {
 	 * relocations.
 	 */
 	int reloc_tree_fences;
+
+	/** Mapped address for the buffer, saved across map/unmap cycles */
+	void *saved_virtual;
 };
 
 static unsigned int
@@ -203,9 +201,8 @@ drm_intel_gem_bo_get_tiling(drm_intel_bo
 			    uint32_t * swizzle_mode);
 
 static int
-drm_intel_gem_bo_set_tiling_internal(drm_intel_bo *bo,
-				     uint32_t tiling_mode,
-				     uint32_t stride);
+drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
+			    uint32_t stride);
 
 static void drm_intel_gem_bo_unreference_locked_timed(drm_intel_bo *bo,
 						      time_t time);
@@ -255,7 +252,7 @@ drm_intel_gem_bo_tile_size(drm_intel_buf
  */
 static unsigned long
 drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem,
-			    unsigned long pitch, uint32_t *tiling_mode)
+			    unsigned long pitch, uint32_t tiling_mode)
 {
 	unsigned long tile_width;
 	unsigned long i;
@@ -263,10 +260,10 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bu
 	/* If untiled, then just align it so that we can do rendering
 	 * to it with the 3D engine.
 	 */
-	if (*tiling_mode == I915_TILING_NONE)
+	if (tiling_mode == I915_TILING_NONE)
 		return ALIGN(pitch, 64);
 
-	if (*tiling_mode == I915_TILING_X)
+	if (tiling_mode == I915_TILING_X)
 		tile_width = 512;
 	else
 		tile_width = 128;
@@ -275,14 +272,6 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bu
 	if (bufmgr_gem->gen >= 4)
 		return ROUND_UP_TO(pitch, tile_width);
 
-	/* The older hardware has a maximum pitch of 8192 with tiled
-	 * surfaces, so fallback to untiled if it's too large.
-	 */
-	if (pitch > 8192) {
-		*tiling_mode = I915_TILING_NONE;
-		return ALIGN(pitch, 64);
-	}
-
 	/* Pre-965 needs power of two tile width */
 	for (i = tile_width; i < pitch; i <<= 1)
 		;
@@ -296,7 +285,7 @@ drm_intel_gem_bo_bucket_for_size(drm_int
 {
 	int i;
 
-	for (i = 0; i < bufmgr_gem->num_buckets; i++) {
+	for (i = 0; i < DRM_INTEL_GEM_BO_BUCKETS; i++) {
 		struct drm_intel_gem_bo_bucket *bucket =
 		    &bufmgr_gem->cache_bucket[i];
 		if (bucket->size >= size) {
@@ -343,10 +332,14 @@ drm_intel_gem_dump_validation_list(drm_i
 static inline void
 drm_intel_gem_bo_reference(drm_intel_bo *bo)
 {
+	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
 
-	assert(atomic_read(&bo_gem->refcount) > 0);
-	atomic_inc(&bo_gem->refcount);
+	/* XXX atomics */
+	pthread_mutex_lock(&bufmgr_gem->lock);
+	assert(bo_gem->refcount > 0);
+	bo_gem->refcount++;
+	pthread_mutex_unlock(&bufmgr_gem->lock);
 }
 
 /**
@@ -358,44 +351,6 @@ drm_intel_gem_bo_reference(drm_intel_bo
  * access flags.
  */
 static void
-drm_intel_add_validate_buffer(drm_intel_bo *bo)
-{
-	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
-	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-	int index;
-
-	if (bo_gem->validate_index != -1)
-		return;
-
-	/* Extend the array of validation entries as necessary. */
-	if (bufmgr_gem->exec_count == bufmgr_gem->exec_size) {
-		int new_size = bufmgr_gem->exec_size * 2;
-
-		if (new_size == 0)
-			new_size = 5;
-
-		bufmgr_gem->exec_objects =
-		    realloc(bufmgr_gem->exec_objects,
-			    sizeof(*bufmgr_gem->exec_objects) * new_size);
-		bufmgr_gem->exec_bos =
-		    realloc(bufmgr_gem->exec_bos,
-			    sizeof(*bufmgr_gem->exec_bos) * new_size);
-		bufmgr_gem->exec_size = new_size;
-	}
-
-	index = bufmgr_gem->exec_count;
-	bo_gem->validate_index = index;
-	/* Fill in array entry */
-	bufmgr_gem->exec_objects[index].handle = bo_gem->gem_handle;
-	bufmgr_gem->exec_objects[index].relocation_count = bo_gem->reloc_count;
-	bufmgr_gem->exec_objects[index].relocs_ptr = (uintptr_t) bo_gem->relocs;
-	bufmgr_gem->exec_objects[index].alignment = 0;
-	bufmgr_gem->exec_objects[index].offset = 0;
-	bufmgr_gem->exec_bos[index] = bo;
-	bufmgr_gem->exec_count++;
-}
-
-static void
 drm_intel_add_validate_buffer2(drm_intel_bo *bo, int need_fence)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bo->bufmgr;
@@ -508,7 +463,9 @@ drm_intel_gem_bo_busy(drm_intel_bo *bo)
 	memset(&busy, 0, sizeof(busy));
 	busy.handle = bo_gem->gem_handle;
 
-	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
+	do {
+		ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
+	} while (ret == -1 && errno == EINTR);
 
 	return (ret == 0 && busy.busy);
 }
@@ -522,7 +479,7 @@ drm_intel_gem_bo_madvise_internal(drm_in
 	madv.handle = bo_gem->gem_handle;
 	madv.madv = state;
 	madv.retained = 1;
-	drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv);
+	ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv);
 
 	return madv.retained;
 }
@@ -559,9 +516,7 @@ static drm_intel_bo *
 drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr,
 				const char *name,
 				unsigned long size,
-				unsigned long flags,
-				uint32_t tiling_mode,
-				unsigned long stride)
+				unsigned long flags)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bufmgr;
 	drm_intel_bo_gem *bo_gem;
@@ -627,13 +582,6 @@ retry:
 								    bucket);
 				goto retry;
 			}
-
-			if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo,
-								 tiling_mode,
-								 stride)) {
-				drm_intel_gem_bo_free(&bo_gem->bo);
-				goto retry;
-			}
 		}
 	}
 	pthread_mutex_unlock(&bufmgr_gem->lock);
@@ -649,9 +597,11 @@ retry:
 		memset(&create, 0, sizeof(create));
 		create.size = bo_size;
 
-		ret = drmIoctl(bufmgr_gem->fd,
-			       DRM_IOCTL_I915_GEM_CREATE,
-			       &create);
+		do {
+			ret = ioctl(bufmgr_gem->fd,
+				    DRM_IOCTL_I915_GEM_CREATE,
+				    &create);
+		} while (ret == -1 && errno == EINTR);
 		bo_gem->gem_handle = create.handle;
 		bo_gem->bo.handle = bo_gem->gem_handle;
 		if (ret != 0) {
@@ -659,25 +609,16 @@ retry:
 			return NULL;
 		}
 		bo_gem->bo.bufmgr = bufmgr;
-
-		bo_gem->tiling_mode = I915_TILING_NONE;
-		bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
-		bo_gem->stride = 0;
-
-		if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo,
-							 tiling_mode,
-							 stride)) {
-		    drm_intel_gem_bo_free(&bo_gem->bo);
-		    return NULL;
-		}
 	}
 
 	bo_gem->name = name;
-	atomic_set(&bo_gem->refcount, 1);
+	bo_gem->refcount = 1;
 	bo_gem->validate_index = -1;
 	bo_gem->reloc_tree_fences = 0;
 	bo_gem->used_as_reloc_target = 0;
 	bo_gem->has_error = 0;
+	bo_gem->tiling_mode = I915_TILING_NONE;
+	bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
 	bo_gem->reusable = 1;
 
 	drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
@@ -695,8 +636,7 @@ drm_intel_gem_bo_alloc_for_render(drm_in
 				  unsigned int alignment)
 {
 	return drm_intel_gem_bo_alloc_internal(bufmgr, name, size,
-					       BO_ALLOC_FOR_RENDER,
-					       I915_TILING_NONE, 0);
+					       BO_ALLOC_FOR_RENDER);
 }
 
 static drm_intel_bo *
@@ -705,8 +645,7 @@ drm_intel_gem_bo_alloc(drm_intel_bufmgr
 		       unsigned long size,
 		       unsigned int alignment)
 {
-	return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0,
-					       I915_TILING_NONE, 0);
+	return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0);
 }
 
 static drm_intel_bo *
@@ -715,45 +654,46 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_b
 			     unsigned long *pitch, unsigned long flags)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bufmgr;
-	unsigned long size, stride;
-	uint32_t tiling;
+	drm_intel_bo *bo;
+	unsigned long size, stride, aligned_y = y;
+	int ret;
 
-	do {
-		unsigned long aligned_y;
+	/* If we're tiled, our allocations are in 8 or 32-row blocks,
+	 * so failure to align our height means that we won't allocate
+	 * enough pages.
+	 *
+	 * If we're untiled, we still have to align to 2 rows high
+	 * because the data port accesses 2x2 blocks even if the
+	 * bottom row isn't to be rendered, so failure to align means
+	 * we could walk off the end of the GTT and fault.  This is
+	 * documented on 965, and may be the case on older chipsets
+	 * too so we try to be careful.
+	 */
+	if (*tiling_mode == I915_TILING_NONE)
+		aligned_y = ALIGN(y, 2);
+	else if (*tiling_mode == I915_TILING_X)
+		aligned_y = ALIGN(y, 8);
+	else if (*tiling_mode == I915_TILING_Y)
+		aligned_y = ALIGN(y, 32);
+
+	stride = x * cpp;
+	stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride, *tiling_mode);
+	size = stride * aligned_y;
+	size = drm_intel_gem_bo_tile_size(bufmgr_gem, size, tiling_mode);
 
-		tiling = *tiling_mode;
+	bo = drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags);
+	if (!bo)
+		return NULL;
 
-		/* If we're tiled, our allocations are in 8 or 32-row blocks,
-		 * so failure to align our height means that we won't allocate
-		 * enough pages.
-		 *
-		 * If we're untiled, we still have to align to 2 rows high
-		 * because the data port accesses 2x2 blocks even if the
-		 * bottom row isn't to be rendered, so failure to align means
-		 * we could walk off the end of the GTT and fault.  This is
-		 * documented on 965, and may be the case on older chipsets
-		 * too so we try to be careful.
-		 */
-		aligned_y = y;
-		if (tiling == I915_TILING_NONE)
-			aligned_y = ALIGN(y, 2);
-		else if (tiling == I915_TILING_X)
-			aligned_y = ALIGN(y, 8);
-		else if (tiling == I915_TILING_Y)
-			aligned_y = ALIGN(y, 32);
-
-		stride = x * cpp;
-		stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride, tiling_mode);
-		size = stride * aligned_y;
-		size = drm_intel_gem_bo_tile_size(bufmgr_gem, size, tiling_mode);
-	} while (*tiling_mode != tiling);
-	*pitch = stride;
+	ret = drm_intel_gem_bo_set_tiling(bo, tiling_mode, stride);
+	if (ret != 0) {
+		drm_intel_gem_bo_unreference(bo);
+		return NULL;
+	}
 
-	if (tiling == I915_TILING_NONE)
-		stride = 0;
+	*pitch = stride;
 
-	return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags,
-					       tiling, stride);
+	return bo;
 }
 
 /**
@@ -779,9 +719,11 @@ drm_intel_bo_gem_create_from_name(drm_in
 
 	memset(&open_arg, 0, sizeof(open_arg));
 	open_arg.name = handle;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_GEM_OPEN,
-		       &open_arg);
+	do {
+		ret = ioctl(bufmgr_gem->fd,
+			    DRM_IOCTL_GEM_OPEN,
+			    &open_arg);
+	} while (ret == -1 && errno == EINTR);
 	if (ret != 0) {
 		fprintf(stderr, "Couldn't reference %s handle 0x%08x: %s\n",
 			name, handle, strerror(errno));
@@ -793,7 +735,7 @@ drm_intel_bo_gem_create_from_name(drm_in
 	bo_gem->bo.virtual = NULL;
 	bo_gem->bo.bufmgr = bufmgr;
 	bo_gem->name = name;
-	atomic_set(&bo_gem->refcount, 1);
+	bo_gem->refcount = 1;
 	bo_gem->validate_index = -1;
 	bo_gem->gem_handle = open_arg.handle;
 	bo_gem->global_name = handle;
@@ -801,16 +743,13 @@ drm_intel_bo_gem_create_from_name(drm_in
 
 	memset(&get_tiling, 0, sizeof(get_tiling));
 	get_tiling.handle = bo_gem->gem_handle;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_GET_TILING,
-		       &get_tiling);
+	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling);
 	if (ret != 0) {
 		drm_intel_gem_bo_unreference(&bo_gem->bo);
 		return NULL;
 	}
 	bo_gem->tiling_mode = get_tiling.tiling_mode;
 	bo_gem->swizzle_mode = get_tiling.swizzle_mode;
-	/* XXX stride is unknown */
 	drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
 
 	DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
@@ -826,15 +765,15 @@ drm_intel_gem_bo_free(drm_intel_bo *bo)
 	struct drm_gem_close close;
 	int ret;
 
-	if (bo_gem->mem_virtual)
-		munmap(bo_gem->mem_virtual, bo_gem->bo.size);
-	if (bo_gem->gtt_virtual)
-		munmap(bo_gem->gtt_virtual, bo_gem->bo.size);
+	if (bo->virtual)
+		munmap(bo->virtual, bo_gem->bo.size);
+	else if (bo_gem->saved_virtual)
+		munmap(bo_gem->saved_virtual, bo_gem->bo.size);
 
 	/* Close this object */
 	memset(&close, 0, sizeof(close));
 	close.handle = bo_gem->gem_handle;
-	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close);
+	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close);
 	if (ret != 0) {
 		fprintf(stderr,
 			"DRM_IOCTL_GEM_CLOSE %d failed (%s): %s\n",
@@ -849,10 +788,7 @@ drm_intel_gem_cleanup_bo_cache(drm_intel
 {
 	int i;
 
-	if (bufmgr_gem->time == time)
-		return;
-
-	for (i = 0; i < bufmgr_gem->num_buckets; i++) {
+	for (i = 0; i < DRM_INTEL_GEM_BO_BUCKETS; i++) {
 		struct drm_intel_gem_bo_bucket *bucket =
 		    &bufmgr_gem->cache_bucket[i];
 
@@ -869,8 +805,6 @@ drm_intel_gem_cleanup_bo_cache(drm_intel
 			drm_intel_gem_bo_free(&bo_gem->bo);
 		}
 	}
-
-	bufmgr_gem->time = time;
 }
 
 static void
@@ -879,15 +813,14 @@ drm_intel_gem_bo_unreference_final(drm_i
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
 	struct drm_intel_gem_bo_bucket *bucket;
+	uint32_t tiling_mode;
 	int i;
 
 	/* Unreference all the target buffers */
 	for (i = 0; i < bo_gem->reloc_count; i++) {
-		if (bo_gem->reloc_target_info[i].bo != bo) {
-			drm_intel_gem_bo_unreference_locked_timed(bo_gem->
-								  reloc_target_info[i].bo,
-								  time);
-		}
+		drm_intel_gem_bo_unreference_locked_timed(bo_gem->
+							  reloc_target_info[i].bo,
+							  time);
 	}
 	bo_gem->reloc_count = 0;
 	bo_gem->used_as_reloc_target = 0;
@@ -907,7 +840,9 @@ drm_intel_gem_bo_unreference_final(drm_i
 
 	bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size);
 	/* Put the buffer into our internal cache for reuse if we can. */
+	tiling_mode = I915_TILING_NONE;
 	if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL &&
+	    drm_intel_gem_bo_set_tiling(bo, &tiling_mode, 0) == 0 &&
 	    drm_intel_gem_bo_madvise_internal(bufmgr_gem, bo_gem,
 					      I915_MADV_DONTNEED)) {
 		bo_gem->free_time = time;
@@ -916,6 +851,8 @@ drm_intel_gem_bo_unreference_final(drm_i
 		bo_gem->validate_index = -1;
 
 		DRMLISTADDTAIL(&bo_gem->head, &bucket->head);
+
+		drm_intel_gem_cleanup_bo_cache(bufmgr_gem, time);
 	} else {
 		drm_intel_gem_bo_free(bo);
 	}
@@ -926,35 +863,44 @@ static void drm_intel_gem_bo_unreference
 {
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
 
-	assert(atomic_read(&bo_gem->refcount) > 0);
-	if (atomic_dec_and_test(&bo_gem->refcount))
+	/* XXX atomics */
+	assert(bo_gem->refcount > 0);
+	if (--bo_gem->refcount == 0)
 		drm_intel_gem_bo_unreference_final(bo, time);
 }
 
 static void drm_intel_gem_bo_unreference(drm_intel_bo *bo)
 {
+	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
 
-	assert(atomic_read(&bo_gem->refcount) > 0);
-	if (atomic_dec_and_test(&bo_gem->refcount)) {
+	pthread_mutex_lock(&bufmgr_gem->lock);
+	assert(bo_gem->refcount > 0);
+	if (--bo_gem->refcount == 0) {
 		drm_intel_bufmgr_gem *bufmgr_gem =
 		    (drm_intel_bufmgr_gem *) bo->bufmgr;
 		struct timespec time;
 
 		clock_gettime(CLOCK_MONOTONIC, &time);
 
-		pthread_mutex_lock(&bufmgr_gem->lock);
 		drm_intel_gem_bo_unreference_final(bo, time.tv_sec);
-		drm_intel_gem_cleanup_bo_cache(bufmgr_gem, time.tv_sec);
-		pthread_mutex_unlock(&bufmgr_gem->lock);
 	}
+	pthread_mutex_unlock(&bufmgr_gem->lock);
 }
 
+/*
+ * OpenBSD only supports GTT mapping of the backing memory, not a choice of
+ * faulted gtt memory, or the backing pages. This is due to cache coherency
+ * issues.
+ *
+ * Therefore, bo_map_gtt calls bo_map, and bo_unmap_gtt calls bo_unmap.
+ */
 static int drm_intel_gem_bo_map(drm_intel_bo *bo, int write_enable)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
 	struct drm_i915_gem_set_domain set_domain;
+	struct drm_i915_gem_mmap mmap_arg;
 	int ret;
 
 	pthread_mutex_lock(&bufmgr_gem->lock);
@@ -962,18 +908,18 @@ static int drm_intel_gem_bo_map(drm_inte
 	/* Allow recursive mapping. Mesa may recursively map buffers with
 	 * nested display loops.
 	 */
-	if (!bo_gem->mem_virtual) {
-		struct drm_i915_gem_mmap mmap_arg;
-
+	if (bo_gem->saved_virtual == NULL) {
 		DBG("bo_map: %d (%s)\n", bo_gem->gem_handle, bo_gem->name);
 
 		memset(&mmap_arg, 0, sizeof(mmap_arg));
 		mmap_arg.handle = bo_gem->gem_handle;
 		mmap_arg.offset = 0;
 		mmap_arg.size = bo->size;
-		ret = drmIoctl(bufmgr_gem->fd,
-			       DRM_IOCTL_I915_GEM_MMAP,
-			       &mmap_arg);
+		do {
+			ret = ioctl(bufmgr_gem->fd,
+				    DRM_IOCTL_I915_GEM_MMAP,
+				    &mmap_arg);
+		} while (ret == -1 && errno == EINTR);
 		if (ret != 0) {
 			ret = -errno;
 			fprintf(stderr,
@@ -983,25 +929,31 @@ static int drm_intel_gem_bo_map(drm_inte
 			pthread_mutex_unlock(&bufmgr_gem->lock);
 			return ret;
 		}
-		bo_gem->mem_virtual = (void *)(uintptr_t) mmap_arg.addr_ptr;
+
+		bo_gem->saved_virtual = (void *)(uintptr_t)mmap_arg.addr_ptr;
 	}
 	DBG("bo_map: %d (%s) -> %p\n", bo_gem->gem_handle, bo_gem->name,
-	    bo_gem->mem_virtual);
-	bo->virtual = bo_gem->mem_virtual;
+	    bo_gem->saved_virtual);
+	bo->virtual = bo_gem->saved_virtual;
 
 	set_domain.handle = bo_gem->gem_handle;
-	set_domain.read_domains = I915_GEM_DOMAIN_CPU;
+	set_domain.read_domains = I915_GEM_DOMAIN_GTT;
 	if (write_enable)
-		set_domain.write_domain = I915_GEM_DOMAIN_CPU;
+		set_domain.write_domain = I915_GEM_DOMAIN_GTT;
 	else
 		set_domain.write_domain = 0;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_SET_DOMAIN,
-		       &set_domain);
+	do {
+		ret = ioctl(bufmgr_gem->fd,
+			    DRM_IOCTL_I915_GEM_SET_DOMAIN,
+			    &set_domain);
+	} while (ret == -1 && errno == EINTR);
 	if (ret != 0) {
+		ret = -errno;
 		fprintf(stderr, "%s:%d: Error setting to CPU domain %d: %s\n",
 			__FILE__, __LINE__, bo_gem->gem_handle,
 			strerror(errno));
+		pthread_mutex_unlock(&bufmgr_gem->lock);
+		return ret;
 	}
 
 	pthread_mutex_unlock(&bufmgr_gem->lock);
@@ -1011,123 +963,28 @@ static int drm_intel_gem_bo_map(drm_inte
 
 int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo)
 {
-	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
-	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-	struct drm_i915_gem_set_domain set_domain;
-	int ret;
-
-	pthread_mutex_lock(&bufmgr_gem->lock);
-
-	/* Get a mapping of the buffer if we haven't before. */
-	if (bo_gem->gtt_virtual == NULL) {
-		struct drm_i915_gem_mmap_gtt mmap_arg;
-
-		DBG("bo_map_gtt: mmap %d (%s)\n", bo_gem->gem_handle,
-		    bo_gem->name);
-
-		memset(&mmap_arg, 0, sizeof(mmap_arg));
-		mmap_arg.handle = bo_gem->gem_handle;
-
-		/* Get the fake offset back... */
-		ret = drmIoctl(bufmgr_gem->fd,
-			       DRM_IOCTL_I915_GEM_MMAP_GTT,
-			       &mmap_arg);
-		if (ret != 0) {
-			ret = -errno;
-			fprintf(stderr,
-				"%s:%d: Error preparing buffer map %d (%s): %s .\n",
-				__FILE__, __LINE__,
-				bo_gem->gem_handle, bo_gem->name,
-				strerror(errno));
-			pthread_mutex_unlock(&bufmgr_gem->lock);
-			return ret;
-		}
-
-		/* and mmap it */
-		bo_gem->gtt_virtual = mmap(0, bo->size, PROT_READ | PROT_WRITE,
-					   MAP_SHARED, bufmgr_gem->fd,
-					   mmap_arg.offset);
-		if (bo_gem->gtt_virtual == MAP_FAILED) {
-			bo_gem->gtt_virtual = NULL;
-			ret = -errno;
-			fprintf(stderr,
-				"%s:%d: Error mapping buffer %d (%s): %s .\n",
-				__FILE__, __LINE__,
-				bo_gem->gem_handle, bo_gem->name,
-				strerror(errno));
-			pthread_mutex_unlock(&bufmgr_gem->lock);
-			return ret;
-		}
-	}
-
-	bo->virtual = bo_gem->gtt_virtual;
-
-	DBG("bo_map_gtt: %d (%s) -> %p\n", bo_gem->gem_handle, bo_gem->name,
-	    bo_gem->gtt_virtual);
-
-	/* Now move it to the GTT domain so that the CPU caches are flushed */
-	set_domain.handle = bo_gem->gem_handle;
-	set_domain.read_domains = I915_GEM_DOMAIN_GTT;
-	set_domain.write_domain = I915_GEM_DOMAIN_GTT;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_SET_DOMAIN,
-		       &set_domain);
-	if (ret != 0) {
-		fprintf(stderr, "%s:%d: Error setting domain %d: %s\n",
-			__FILE__, __LINE__, bo_gem->gem_handle,
-			strerror(errno));
-	}
-
-	pthread_mutex_unlock(&bufmgr_gem->lock);
-
-	return 0;
+	return drm_intel_gem_bo_map(bo, 1);
 }
-
-int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo)
+	
+static int drm_intel_gem_bo_unmap(drm_intel_bo *bo)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-	int ret = 0;
 
 	if (bo == NULL)
 		return 0;
 
-	assert(bo_gem->gtt_virtual != NULL);
-
+	assert(bo_gem->saved_virtual != NULL);
 	pthread_mutex_lock(&bufmgr_gem->lock);
 	bo->virtual = NULL;
 	pthread_mutex_unlock(&bufmgr_gem->lock);
 
-	return ret;
+	return 0;
 }
 
-static int drm_intel_gem_bo_unmap(drm_intel_bo *bo)
+int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo)
 {
-	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
-	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-	struct drm_i915_gem_sw_finish sw_finish;
-	int ret;
-
-	if (bo == NULL)
-		return 0;
-
-	assert(bo_gem->mem_virtual != NULL);
-
-	pthread_mutex_lock(&bufmgr_gem->lock);
-
-	/* Cause a flush to happen if the buffer's pinned for scanout, so the
-	 * results show up in a timely manner.
-	 */
-	sw_finish.handle = bo_gem->gem_handle;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_SW_FINISH,
-		       &sw_finish);
-	ret = ret == -1 ? -errno : 0;
-
-	bo->virtual = NULL;
-	pthread_mutex_unlock(&bufmgr_gem->lock);
-
-	return ret;
+	return drm_intel_gem_bo_unmap(bo);
 }
 
 static int
@@ -1144,9 +1001,11 @@ drm_intel_gem_bo_subdata(drm_intel_bo *b
 	pwrite.offset = offset;
 	pwrite.size = size;
 	pwrite.data_ptr = (uint64_t) (uintptr_t) data;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_PWRITE,
-		       &pwrite);
+	do {
+		ret = ioctl(bufmgr_gem->fd,
+			    DRM_IOCTL_I915_GEM_PWRITE,
+			    &pwrite);
+	} while (ret == -1 && errno == EINTR);
 	if (ret != 0) {
 		ret = -errno;
 		fprintf(stderr,
@@ -1161,14 +1020,14 @@ drm_intel_gem_bo_subdata(drm_intel_bo *b
 static int
 drm_intel_gem_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id)
 {
+#if 0
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bufmgr;
 	struct drm_i915_get_pipe_from_crtc_id get_pipe_from_crtc_id;
 	int ret;
 
 	get_pipe_from_crtc_id.crtc_id = crtc_id;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
-		       &get_pipe_from_crtc_id);
+	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
+		    &get_pipe_from_crtc_id);
 	if (ret != 0) {
 		/* We return -1 here to signal that we don't
 		 * know which pipe is associated with this crtc.
@@ -1180,6 +1039,9 @@ drm_intel_gem_get_pipe_from_crtc_id(drm_
 	}
 
 	return get_pipe_from_crtc_id.pipe;
+#endif
+	/* only needed for KMS */
+	return -1;
 }
 
 static int
@@ -1196,9 +1058,11 @@ drm_intel_gem_bo_get_subdata(drm_intel_b
 	pread.offset = offset;
 	pread.size = size;
 	pread.data_ptr = (uint64_t) (uintptr_t) data;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_PREAD,
-		       &pread);
+	do {
+		ret = ioctl(bufmgr_gem->fd,
+			    DRM_IOCTL_I915_GEM_PREAD,
+			    &pread);
+	} while (ret == -1 && errno == EINTR);
 	if (ret != 0) {
 		ret = -errno;
 		fprintf(stderr,
@@ -1214,7 +1078,7 @@ drm_intel_gem_bo_get_subdata(drm_intel_b
 static void
 drm_intel_gem_bo_wait_rendering(drm_intel_bo *bo)
 {
-	drm_intel_gem_bo_start_gtt_access(bo, 0);
+	drm_intel_gem_bo_start_gtt_access(bo, 1);
 }
 
 /**
@@ -1235,9 +1099,11 @@ drm_intel_gem_bo_start_gtt_access(drm_in
 	set_domain.handle = bo_gem->gem_handle;
 	set_domain.read_domains = I915_GEM_DOMAIN_GTT;
 	set_domain.write_domain = write_enable ? I915_GEM_DOMAIN_GTT : 0;
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_SET_DOMAIN,
-		       &set_domain);
+	do {
+		ret = ioctl(bufmgr_gem->fd,
+			    DRM_IOCTL_I915_GEM_SET_DOMAIN,
+			    &set_domain);
+	} while (ret == -1 && errno == EINTR);
 	if (ret != 0) {
 		fprintf(stderr,
 			"%s:%d: Error setting memory domains %d (%08x %08x): %s .\n",
@@ -1254,13 +1120,12 @@ drm_intel_bufmgr_gem_destroy(drm_intel_b
 	int i;
 
 	free(bufmgr_gem->exec2_objects);
-	free(bufmgr_gem->exec_objects);
 	free(bufmgr_gem->exec_bos);
 
 	pthread_mutex_destroy(&bufmgr_gem->lock);
 
 	/* Free any cached buffer objects we were going to reuse */
-	for (i = 0; i < bufmgr_gem->num_buckets; i++) {
+	for (i = 0; i < DRM_INTEL_GEM_BO_BUCKETS; i++) {
 		struct drm_intel_gem_bo_bucket *bucket =
 		    &bufmgr_gem->cache_bucket[i];
 		drm_intel_bo_gem *bo_gem;
@@ -1326,10 +1191,7 @@ do_bo_emit_reloc(drm_intel_bo *bo, uint3
 	 * already been accounted for.
 	 */
 	assert(!bo_gem->used_as_reloc_target);
-	if (target_bo_gem != bo_gem) {
-		target_bo_gem->used_as_reloc_target = 1;
-		bo_gem->reloc_tree_size += target_bo_gem->reloc_tree_size;
-	}
+	bo_gem->reloc_tree_size += target_bo_gem->reloc_tree_size;
 	/* An object needing a fence is a tiled buffer, so it won't have
 	 * relocs to other buffers.
 	 */
@@ -1338,6 +1200,7 @@ do_bo_emit_reloc(drm_intel_bo *bo, uint3
 	bo_gem->reloc_tree_fences += target_bo_gem->reloc_tree_fences;
 
 	/* Flag the target to disallow further relocations in it. */
+	target_bo_gem->used_as_reloc_target = 1;
 
 	bo_gem->relocs[bo_gem->reloc_count].offset = offset;
 	bo_gem->relocs[bo_gem->reloc_count].delta = target_offset;
@@ -1348,8 +1211,7 @@ do_bo_emit_reloc(drm_intel_bo *bo, uint3
 	bo_gem->relocs[bo_gem->reloc_count].presumed_offset = target_bo->offset;
 
 	bo_gem->reloc_target_info[bo_gem->reloc_count].bo = target_bo;
-	if (target_bo != bo)
-		drm_intel_gem_bo_reference(target_bo);
+	drm_intel_gem_bo_reference(target_bo);
 	if (need_fence)
 		bo_gem->reloc_target_info[bo_gem->reloc_count].flags =
 			DRM_INTEL_RELOC_FENCE;
@@ -1389,29 +1251,6 @@ drm_intel_gem_bo_emit_reloc_fence(drm_in
  * index values into the validation list.
  */
 static void
-drm_intel_gem_bo_process_reloc(drm_intel_bo *bo)
-{
-	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-	int i;
-
-	if (bo_gem->relocs == NULL)
-		return;
-
-	for (i = 0; i < bo_gem->reloc_count; i++) {
-		drm_intel_bo *target_bo = bo_gem->reloc_target_info[i].bo;
-
-		if (target_bo == bo)
-			continue;
-
-		/* Continue walking the tree depth-first. */
-		drm_intel_gem_bo_process_reloc(target_bo);
-
-		/* Add the target to the validate list */
-		drm_intel_add_validate_buffer(target_bo);
-	}
-}
-
-static void
 drm_intel_gem_bo_process_reloc2(drm_intel_bo *bo)
 {
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *)bo;
@@ -1424,9 +1263,6 @@ drm_intel_gem_bo_process_reloc2(drm_inte
 		drm_intel_bo *target_bo = bo_gem->reloc_target_info[i].bo;
 		int need_fence;
 
-		if (target_bo == bo)
-			continue;
-
 		/* Continue walking the tree depth-first. */
 		drm_intel_gem_bo_process_reloc2(target_bo);
 
@@ -1438,27 +1274,6 @@ drm_intel_gem_bo_process_reloc2(drm_inte
 	}
 }
 
-
-static void
-drm_intel_update_buffer_offsets(drm_intel_bufmgr_gem *bufmgr_gem)
-{
-	int i;
-
-	for (i = 0; i < bufmgr_gem->exec_count; i++) {
-		drm_intel_bo *bo = bufmgr_gem->exec_bos[i];
-		drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-
-		/* Update the buffer offset */
-		if (bufmgr_gem->exec_objects[i].offset != bo->offset) {
-			DBG("BO %d (%s) migrated: 0x%08lx -> 0x%08llx\n",
-			    bo_gem->gem_handle, bo_gem->name, bo->offset,
-			    (unsigned long long)bufmgr_gem->exec_objects[i].
-			    offset);
-			bo->offset = bufmgr_gem->exec_objects[i].offset;
-		}
-	}
-}
-
 static void
 drm_intel_update_buffer_offsets2 (drm_intel_bufmgr_gem *bufmgr_gem)
 {
@@ -1479,84 +1294,14 @@ drm_intel_update_buffer_offsets2 (drm_in
 }
 
 static int
-drm_intel_gem_bo_exec(drm_intel_bo *bo, int used,
-		      drm_clip_rect_t * cliprects, int num_cliprects, int DR4)
-{
-	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
-	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-	struct drm_i915_gem_execbuffer execbuf;
-	int ret, i;
-
-	if (bo_gem->has_error)
-		return -ENOMEM;
-
-	pthread_mutex_lock(&bufmgr_gem->lock);
-	/* Update indices and set up the validate list. */
-	drm_intel_gem_bo_process_reloc(bo);
-
-	/* Add the batch buffer to the validation list.  There are no
-	 * relocations pointing to it.
-	 */
-	drm_intel_add_validate_buffer(bo);
-
-	execbuf.buffers_ptr = (uintptr_t) bufmgr_gem->exec_objects;
-	execbuf.buffer_count = bufmgr_gem->exec_count;
-	execbuf.batch_start_offset = 0;
-	execbuf.batch_len = used;
-	execbuf.cliprects_ptr = (uintptr_t) cliprects;
-	execbuf.num_cliprects = num_cliprects;
-	execbuf.DR1 = 0;
-	execbuf.DR4 = DR4;
-
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_EXECBUFFER,
-		       &execbuf);
-	if (ret != 0) {
-		ret = -errno;
-		if (errno == ENOSPC) {
-			fprintf(stderr,
-				"Execbuffer fails to pin. "
-				"Estimate: %u. Actual: %u. Available: %u\n",
-				drm_intel_gem_estimate_batch_space(bufmgr_gem->exec_bos,
-								   bufmgr_gem->
-								   exec_count),
-				drm_intel_gem_compute_batch_space(bufmgr_gem->exec_bos,
-								  bufmgr_gem->
-								  exec_count),
-				(unsigned int)bufmgr_gem->gtt_size);
-		}
-	}
-	drm_intel_update_buffer_offsets(bufmgr_gem);
-
-	if (bufmgr_gem->bufmgr.debug)
-		drm_intel_gem_dump_validation_list(bufmgr_gem);
-
-	for (i = 0; i < bufmgr_gem->exec_count; i++) {
-		drm_intel_bo *bo = bufmgr_gem->exec_bos[i];
-		drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-
-		/* Disconnect the buffer from the validate list */
-		bo_gem->validate_index = -1;
-		bufmgr_gem->exec_bos[i] = NULL;
-	}
-	bufmgr_gem->exec_count = 0;
-	pthread_mutex_unlock(&bufmgr_gem->lock);
-
-	return ret;
-}
-
-static int
-drm_intel_gem_bo_mrb_exec2(drm_intel_bo *bo, int used,
-			drm_clip_rect_t *cliprects, int num_cliprects, int DR4,
-			int ring_flag)
+drm_intel_gem_bo_exec2(drm_intel_bo *bo, int used,
+		       drm_clip_rect_t *cliprects, int num_cliprects,
+		       int DR4)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bo->bufmgr;
 	struct drm_i915_gem_execbuffer2 execbuf;
 	int ret, i;
 
-	if ((ring_flag != I915_EXEC_RENDER) && (ring_flag != I915_EXEC_BSD))
-		return -EINVAL;
-
 	pthread_mutex_lock(&bufmgr_gem->lock);
 	/* Update indices and set up the validate list. */
 	drm_intel_gem_bo_process_reloc2(bo);
@@ -1570,20 +1315,18 @@ drm_intel_gem_bo_mrb_exec2(drm_intel_bo
 	execbuf.buffer_count = bufmgr_gem->exec_count;
 	execbuf.batch_start_offset = 0;
 	execbuf.batch_len = used;
-	execbuf.cliprects_ptr = (uintptr_t)cliprects;
-	execbuf.num_cliprects = num_cliprects;
-	execbuf.DR1 = 0;
-	execbuf.DR4 = DR4;
-	execbuf.flags = ring_flag;
+	execbuf.flags = 0;
 	execbuf.rsvd1 = 0;
 	execbuf.rsvd2 = 0;
 
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_EXECBUFFER2,
-		       &execbuf);
+	do {
+		ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2,
+			    &execbuf);
+	} while (ret != 0 && errno == EINTR);
+
 	if (ret != 0) {
 		ret = -errno;
-		if (ret == -ENOSPC) {
+		if (ret == -ENOMEM) {
 			fprintf(stderr,
 				"Execbuffer fails to pin. "
 				"Estimate: %u. Actual: %u. Available: %u\n",
@@ -1614,16 +1357,6 @@ drm_intel_gem_bo_mrb_exec2(drm_intel_bo
 }
 
 static int
-drm_intel_gem_bo_exec2(drm_intel_bo *bo, int used,
-		       drm_clip_rect_t *cliprects, int num_cliprects,
-		       int DR4)
-{
-	return drm_intel_gem_bo_mrb_exec2(bo, used,
-					cliprects, num_cliprects, DR4,
-					I915_EXEC_RENDER);
-}
-
-static int
 drm_intel_gem_bo_pin(drm_intel_bo *bo, uint32_t alignment)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
@@ -1635,9 +1368,12 @@ drm_intel_gem_bo_pin(drm_intel_bo *bo, u
 	pin.handle = bo_gem->gem_handle;
 	pin.alignment = alignment;
 
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_PIN,
-		       &pin);
+	do {
+		ret = ioctl(bufmgr_gem->fd,
+			    DRM_IOCTL_I915_GEM_PIN,
+			    &pin);
+	} while (ret == -1 && errno == EINTR);
+
 	if (ret != 0)
 		return -errno;
 
@@ -1656,7 +1392,7 @@ drm_intel_gem_bo_unpin(drm_intel_bo *bo)
 	memset(&unpin, 0, sizeof(unpin));
 	unpin.handle = bo_gem->gem_handle;
 
-	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_UNPIN, &unpin);
+	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_UNPIN, &unpin);
 	if (ret != 0)
 		return -errno;
 
@@ -1664,63 +1400,37 @@ drm_intel_gem_bo_unpin(drm_intel_bo *bo)
 }
 
 static int
-drm_intel_gem_bo_set_tiling_internal(drm_intel_bo *bo,
-				     uint32_t tiling_mode,
-				     uint32_t stride)
+drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
+			    uint32_t stride)
 {
 	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
 	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
 	struct drm_i915_gem_set_tiling set_tiling;
 	int ret;
 
-	if (bo_gem->global_name == 0 &&
-	    tiling_mode == bo_gem->tiling_mode &&
-	    stride == bo_gem->stride)
+	if (bo_gem->global_name == 0 && *tiling_mode == bo_gem->tiling_mode)
 		return 0;
 
 	memset(&set_tiling, 0, sizeof(set_tiling));
+	set_tiling.handle = bo_gem->gem_handle;
+
 	do {
-		/* set_tiling is slightly broken and overwrites the
-		 * input on the error path, so we have to open code
-		 * rmIoctl.
-		 */
-		set_tiling.handle = bo_gem->gem_handle;
-		set_tiling.tiling_mode = tiling_mode;
+		set_tiling.tiling_mode = *tiling_mode;
 		set_tiling.stride = stride;
 
 		ret = ioctl(bufmgr_gem->fd,
 			    DRM_IOCTL_I915_GEM_SET_TILING,
 			    &set_tiling);
-	} while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-	if (ret == -1)
-		return -errno;
-
-	bo_gem->tiling_mode = set_tiling.tiling_mode;
-	bo_gem->swizzle_mode = set_tiling.swizzle_mode;
-	bo_gem->stride = set_tiling.stride;
-	return 0;
-}
-
-static int
-drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
-			    uint32_t stride)
-{
-	drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
-	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-	int ret;
-
-	/* Linear buffers have no stride. By ensuring that we only ever use
-	 * stride 0 with linear buffers, we simplify our code.
-	 */
-	if (*tiling_mode == I915_TILING_NONE)
-		stride = 0;
+	} while (ret == -1 && errno == EINTR);
+	if (ret == 0) {
+		bo_gem->tiling_mode = set_tiling.tiling_mode;
+		bo_gem->swizzle_mode = set_tiling.swizzle_mode;
+	}
 
-	ret = drm_intel_gem_bo_set_tiling_internal(bo, *tiling_mode, stride);
-	if (ret == 0)
-		drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
+	drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
 
 	*tiling_mode = bo_gem->tiling_mode;
-	return ret;
+	return ret == 0 ? 0 : -errno;
 }
 
 static int
@@ -1746,7 +1456,7 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo,
 		memset(&flink, 0, sizeof(flink));
 		flink.handle = bo_gem->gem_handle;
 
-		ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_FLINK, &flink);
+		ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_GEM_FLINK, &flink);
 		if (ret != 0)
 			return -errno;
 		bo_gem->global_name = flink.name;
@@ -1989,8 +1699,6 @@ _drm_intel_gem_bo_references(drm_intel_b
 	for (i = 0; i < bo_gem->reloc_count; i++) {
 		if (bo_gem->reloc_target_info[i].bo == target_bo)
 			return 1;
-		if (bo == bo_gem->reloc_target_info[i].bo)
-			continue;
 		if (_drm_intel_gem_bo_references(bo_gem->reloc_target_info[i].bo,
 						target_bo))
 			return 1;
@@ -2012,45 +1720,6 @@ drm_intel_gem_bo_references(drm_intel_bo
 	return 0;
 }
 
-static void
-add_bucket(drm_intel_bufmgr_gem *bufmgr_gem, int size)
-{
-	unsigned int i = bufmgr_gem->num_buckets;
-
-	assert(i < ARRAY_SIZE(bufmgr_gem->cache_bucket));
-
-	DRMINITLISTHEAD(&bufmgr_gem->cache_bucket[i].head);
-	bufmgr_gem->cache_bucket[i].size = size;
-	bufmgr_gem->num_buckets++;
-}
-
-static void
-init_cache_buckets(drm_intel_bufmgr_gem *bufmgr_gem)
-{
-	unsigned long size, cache_max_size = 64 * 1024 * 1024;
-
-	/* OK, so power of two buckets was too wasteful of memory.
-	 * Give 3 other sizes between each power of two, to hopefully
-	 * cover things accurately enough.  (The alternative is
-	 * probably to just go for exact matching of sizes, and assume
-	 * that for things like composited window resize the tiled
-	 * width/height alignment and rounding of sizes to pages will
-	 * get us useful cache hit rates anyway)
-	 */
-	add_bucket(bufmgr_gem, 4096);
-	add_bucket(bufmgr_gem, 4096 * 2);
-	add_bucket(bufmgr_gem, 4096 * 3);
-
-	/* Initialize the linked lists for BO reuse cache. */
-	for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
-		add_bucket(bufmgr_gem, size);
-
-		add_bucket(bufmgr_gem, size + size * 1 / 4);
-		add_bucket(bufmgr_gem, size + size * 2 / 4);
-		add_bucket(bufmgr_gem, size + size * 3 / 4);
-	}
-}
-
 /**
  * Initializes the GEM buffer manager, which uses the kernel to allocate, map,
  * and manage map buffer objections.
@@ -2063,8 +1732,8 @@ drm_intel_bufmgr_gem_init(int fd, int ba
 	drm_intel_bufmgr_gem *bufmgr_gem;
 	struct drm_i915_gem_get_aperture aperture;
 	drm_i915_getparam_t gp;
-	int ret;
-	int exec2 = 0, has_bsd = 0;
+	int ret, i;
+	unsigned long size;
 
 	bufmgr_gem = calloc(1, sizeof(*bufmgr_gem));
 	if (bufmgr_gem == NULL)
@@ -2077,9 +1746,7 @@ drm_intel_bufmgr_gem_init(int fd, int ba
 		return NULL;
 	}
 
-	ret = drmIoctl(bufmgr_gem->fd,
-		       DRM_IOCTL_I915_GEM_GET_APERTURE,
-		       &aperture);
+	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
 
 	if (ret == 0)
 		bufmgr_gem->gtt_size = aperture.aper_available_size;
@@ -2095,7 +1762,7 @@ drm_intel_bufmgr_gem_init(int fd, int ba
 
 	gp.param = I915_PARAM_CHIPSET_ID;
 	gp.value = &bufmgr_gem->pci_device;
-	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
+	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
 	if (ret) {
 		fprintf(stderr, "get chip id failed: %d [%d]\n", ret, errno);
 		fprintf(stderr, "param: %d, val: %d\n", gp.param, *gp.value);
@@ -2110,20 +1777,10 @@ drm_intel_bufmgr_gem_init(int fd, int ba
 	else
 		bufmgr_gem->gen = 6;
 
-	gp.param = I915_PARAM_HAS_EXECBUF2;
-	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
-	if (!ret)
-		exec2 = 1;
-
-	gp.param = I915_PARAM_HAS_BSD;
-	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
-	if (!ret)
-		has_bsd = 1;
-
 	if (bufmgr_gem->gen < 4) {
 		gp.param = I915_PARAM_NUM_FENCES_AVAIL;
 		gp.value = &bufmgr_gem->available_fences;
-		ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
+		ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
 		if (ret) {
 			fprintf(stderr, "get fences failed: %d [%d]\n", ret,
 				errno);
@@ -2172,13 +1829,7 @@ drm_intel_bufmgr_gem_init(int fd, int ba
 	bufmgr_gem->bufmgr.bo_get_tiling = drm_intel_gem_bo_get_tiling;
 	bufmgr_gem->bufmgr.bo_set_tiling = drm_intel_gem_bo_set_tiling;
 	bufmgr_gem->bufmgr.bo_flink = drm_intel_gem_bo_flink;
-	/* Use the new one if available */
-	if (exec2) {
-		bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec2;
-		if (has_bsd)
-			bufmgr_gem->bufmgr.bo_mrb_exec = drm_intel_gem_bo_mrb_exec2;
-	} else
-		bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec;
+	bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec2;
 	bufmgr_gem->bufmgr.bo_busy = drm_intel_gem_bo_busy;
 	bufmgr_gem->bufmgr.bo_madvise = drm_intel_gem_bo_madvise;
 	bufmgr_gem->bufmgr.destroy = drm_intel_bufmgr_gem_destroy;
@@ -2191,7 +1842,11 @@ drm_intel_bufmgr_gem_init(int fd, int ba
 	    drm_intel_gem_get_pipe_from_crtc_id;
 	bufmgr_gem->bufmgr.bo_references = drm_intel_gem_bo_references;
 
-	init_cache_buckets(bufmgr_gem);
+	/* Initialize the linked lists for BO reuse cache. */
+	for (i = 0, size = 4096; i < DRM_INTEL_GEM_BO_BUCKETS; i++, size *= 2) {
+		DRMINITLISTHEAD(&bufmgr_gem->cache_bucket[i].head);
+		bufmgr_gem->cache_bucket[i].size = size;
+	}
 
 	return &bufmgr_gem->bufmgr;
 }
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h
--- old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h	2010-11-21 08:49:32.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h	2011-02-08 11:14:00.000000000 +0100
@@ -66,11 +66,7 @@ struct _drm_intel_bo {
 	 * Virtual address for accessing the buffer data.  Only valid while
 	 * mapped.
 	 */
-#ifdef __cplusplus
-	void *virt;
-#else
 	void *virtual;
-#endif
 
 	/** Buffer manager context associated with this buffer object */
 	drm_intel_bufmgr *bufmgr;
@@ -110,9 +106,6 @@ void drm_intel_bufmgr_set_debug(drm_inte
 void drm_intel_bufmgr_destroy(drm_intel_bufmgr *bufmgr);
 int drm_intel_bo_exec(drm_intel_bo *bo, int used,
 		      drm_clip_rect_t * cliprects, int num_cliprects, int DR4);
-int drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
-			drm_clip_rect_t *cliprects, int num_cliprects, int DR4,
-			int ring_flag);
 int drm_intel_bufmgr_check_aperture_space(drm_intel_bo ** bo_array, int count);
 
 int drm_intel_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset,
@@ -172,7 +165,7 @@ void drm_intel_bufmgr_fake_set_fence_cal
 drm_intel_bo *drm_intel_bo_fake_alloc_static(drm_intel_bufmgr *bufmgr,
 					     const char *name,
 					     unsigned long offset,
-					     unsigned long size, void *virt);
+					     unsigned long size, void *virtual);
 void drm_intel_bo_fake_disable_backing_store(drm_intel_bo *bo,
 					     void (*invalidate_cb) (drm_intel_bo
 								    * bo,
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h
--- old/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h	2010-08-14 12:17:31.000000000 +0200
+++ new/xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h	2011-02-08 11:14:00.000000000 +0100
@@ -173,13 +173,6 @@ struct _drm_intel_bufmgr {
 			drm_clip_rect_t *cliprects, int num_cliprects,
 			int DR4);
 
-	/** Executes the command buffer pointed to by bo on the selected
-	 * ring buffer
-	 */
-	int (*bo_mrb_exec) (drm_intel_bo *bo, int used,
-			drm_clip_rect_t *cliprects, int num_cliprects,
-			int DR4, int ring_flag);
-
 	/**
 	 * Pin a buffer to the aperture and fix the offset until unpinned
 	 *
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/libdrm_intel.pc.in new/xsrc/external/mit/libdrm/dist/intel/libdrm_intel.pc.in
--- old/xsrc/external/mit/libdrm/dist/intel/libdrm_intel.pc.in	2010-05-22 23:45:13.000000000 +0200
+++ new/xsrc/external/mit/libdrm/dist/intel/libdrm_intel.pc.in	2011-02-08 11:14:00.000000000 +0100
@@ -6,6 +6,5 @@ includedir=@includedir@
 Name: libdrm
 Description: Userspace interface to kernel DRM services
 Version: @PACKAGE_VERSION@
-Requires: libdrm
-Libs: -L${libdir} -ldrm_intel
-Cflags: -I${includedir} -I${includedir}/libdrm
+Libs: -L${libdir} -ldrm -ldrm_intel
+Cflags: -I${includedir} -I/usr/include/dev/pci/drm
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/Makefile new/xsrc/external/mit/libdrm/dist/intel/Makefile
--- old/xsrc/external/mit/libdrm/dist/intel/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/intel/Makefile	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,37 @@
+# $OpenBSD: Makefile,v 1.3 2010/05/08 14:15:29 matthieu Exp $
+.include <bsd.xconf.mk>
+
+LIB=		drm_intel
+
+INCSDIR=	${X11BASE}/include/
+
+CPPFLAGS+=	-I${.CURDIR}			\
+		-I${.CURDIR}/..			\
+		-I${X11BASE}/include		\
+		-I/usr/include/dev/pci/drm 
+
+INCS= 		intel_bufmgr.h
+
+SRCS=		intel_bufmgr.c		\
+		intel_bufmgr_fake.c	\
+		intel_bufmgr_gem.c	\
+		mm.c
+
+PKGCONFIG=	libdrm_intel.pc
+
+LDADD+=		-L${X11BASE}/lib -lX11
+
+includes:
+	cd ${.CURDIR}; for i in ${INCS}; do \
+	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
+		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
+		echo "\tinstalling $$i"; \
+		eval "$$j"; \
+	done
+
+NOPROFILE =
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
diff -Naurp old/xsrc/external/mit/libdrm/dist/intel/shlib_version new/xsrc/external/mit/libdrm/dist/intel/shlib_version
--- old/xsrc/external/mit/libdrm/dist/intel/shlib_version	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/intel/shlib_version	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+major=1
+minor=3
diff -Naurp old/xsrc/external/mit/libdrm/dist/Makefile new/xsrc/external/mit/libdrm/dist/Makefile
--- old/xsrc/external/mit/libdrm/dist/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/Makefile	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,47 @@
+# $OpenBSD: Makefile,v 1.5 2010/05/08 14:15:29 matthieu Exp $
+.include <bsd.xconf.mk>
+.include "${.CURDIR}/Makefile.inc"
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+SUBDIR=intel
+.endif
+
+LIB=		drm
+
+INCSDIR=	${X11BASE}/include/
+
+CPP=		cpp -notraditional
+DEBUG?=
+
+CPPFLAGS+=	-I${.CURDIR} \
+		-I${X11BASE}/include \
+		-I/usr/include/dev/pci/drm \
+		-DX_PRIVSEP
+
+INCS= 		xf86drm.h	\
+		xf86drmMode.h
+
+SRCS=		xf86drm.c	\
+		xf86drmHash.c	\
+		xf86drmMode.c	\
+		xf86drmRandom.c	\
+		xf86drmSL.c	
+
+includes: _SUBDIRUSE
+	cd ${.CURDIR}; for i in ${INCS}; do \
+	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
+		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
+		echo "\tinstalling $$i"; \
+		eval "$$j"; \
+	done
+
+NOPROFILE =
+
+PKGCONFIG=	libdrm.pc
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.include <bsd.subdir.mk>
diff -Naurp old/xsrc/external/mit/libdrm/dist/Makefile.inc new/xsrc/external/mit/libdrm/dist/Makefile.inc
--- old/xsrc/external/mit/libdrm/dist/Makefile.inc	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/Makefile.inc	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+PACKAGE_VERSION=	2.4.15
+
diff -Naurp old/xsrc/external/mit/libdrm/dist/shlib_version new/xsrc/external/mit/libdrm/dist/shlib_version
--- old/xsrc/external/mit/libdrm/dist/shlib_version	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/shlib_version	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+major=2
+minor=6
diff -Naurp old/xsrc/external/mit/libdrm/dist/xf86drm.c new/xsrc/external/mit/libdrm/dist/xf86drm.c
--- old/xsrc/external/mit/libdrm/dist/xf86drm.c	2010-11-21 08:51:29.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/xf86drm.c	2011-02-08 11:14:00.000000000 +0100
@@ -31,14 +31,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -59,21 +55,8 @@
 
 #include "xf86drm.h"
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#define DRM_MAJOR 145
-#endif
-
-#ifdef __NetBSD__
-#undef DRM_MAJOR
-#define DRM_MAJOR 180
-#endif
-
-# ifdef __OpenBSD__
-#  define DRM_MAJOR 81
-# endif
-
-#ifndef DRM_MAJOR
-#define DRM_MAJOR 226		/* Linux */
+#ifndef DRM_MAX_MINOR
+#define DRM_MAX_MINOR 16
 #endif
 
 /*
@@ -230,7 +213,7 @@ drmHashEntry *drmGetEntry(int fd)
  * PCI:b:d:f format and the newer pci:oooo:bb:dd.f format.  In the format, o is
  * domain, b is bus, d is device, f is function.
  */
-static int drmMatchBusID(const char *id1, const char *id2, int pci_domain_ok)
+static int drmMatchBusID(const char *id1, const char *id2)
 {
     /* First, check if the IDs are exactly the same */
     if (strcasecmp(id1, id2) == 0)
@@ -258,13 +241,6 @@ static int drmMatchBusID(const char *id1
 		return 0;
 	}
 
-	/* If domains aren't properly supported by the kernel interface,
-	 * just ignore them, which sucks less than picking a totally random
-	 * card with "open by name"
-	 */
-	if (!pci_domain_ok)
-		o1 = o2 = 0;
-
 	if ((o1 != o2) || (b1 != b2) || (d1 != d2) || (f1 != f2))
 	    return 0;
 	else
@@ -274,36 +250,6 @@ static int drmMatchBusID(const char *id1
 }
 
 /**
- * Handles error checking for chown call.
- *
- * \param path to file.
- * \param id of the new owner.
- * \param id of the new group.
- *
- * \return zero if success or -1 if failure.
- *
- * \internal
- * Checks for failure. If failure was caused by signal call chown again.
- * If any other failure happened then it will output error mesage using
- * drmMsg() call.
- */
-static int chown_check_return(const char *path, uid_t owner, gid_t group)
-{
-	int rv;
-
-	do {
-		rv = chown(path, owner, group);
-	} while (rv != 0 && errno == EINTR);
-
-	if (rv == 0)
-		return 0;
-
-	drmMsg("Failed to change owner or group for file %s! %d: %s\n",
-			path, errno, strerror(errno));
-	return -1;
-}
-
-/**
  * Open the DRM device, creating it if necessary.
  *
  * \param dev major and minor numbers of the device.
@@ -336,79 +282,18 @@ static int drmOpenDevice(long dev, int m
 	group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
     }
 
-#if !defined(UDEV)
-    if (stat(DRM_DIR_NAME, &st)) {
-	if (!isroot)
-	    return DRM_ERR_NOT_ROOT;
-	mkdir(DRM_DIR_NAME, DRM_DEV_DIRMODE);
-	chown_check_return(DRM_DIR_NAME, 0, 0); /* root:root */
-	chmod(DRM_DIR_NAME, DRM_DEV_DIRMODE);
-    }
-
-    /* Check if the device node exists and create it if necessary. */
-    if (stat(buf, &st)) {
-	if (!isroot)
-	    return DRM_ERR_NOT_ROOT;
-	remove(buf);
-	mknod(buf, S_IFCHR | devmode, dev);
-    }
-
-    if (drm_server_info) {
-	chown_check_return(buf, user, group);
-	chmod(buf, devmode);
-    }
+#ifndef X_PRIVSEP
+    fd = open(buf, O_RDWR, 0);
 #else
-    /* if we modprobed then wait for udev */
-    {
-	int udev_count = 0;
-wait_for_udev:
-        if (stat(DRM_DIR_NAME, &st)) {
-		usleep(20);
-		udev_count++;
-
-		if (udev_count == 50)
-			return -1;
-		goto wait_for_udev;
-	}
-
-    	if (stat(buf, &st)) {
-		usleep(20);
-		udev_count++;
-
-		if (udev_count == 50)
-			return -1;
-		goto wait_for_udev;
-    	}
-    }
+    fd = priv_open_device(buf);
 #endif
-
-    fd = open(buf, O_RDWR, 0);
-    drmMsg("drmOpenDevice: open result is %d, (%s)\n",
-		fd, fd < 0 ? strerror(errno) : "OK");
-    if (fd >= 0)
-	return fd;
-
-    /* Check if the device node is not what we expect it to be, and recreate it
-     * and try again if so.
-     */
-    if (st.st_rdev != dev) {
-	if (!isroot)
-	    return DRM_ERR_NOT_ROOT;
-	remove(buf);
-	mknod(buf, S_IFCHR | devmode, dev);
-	if (drm_server_info) {
-	    chown_check_return(buf, user, group);
-	    chmod(buf, devmode);
-	}
-    }
-    fd = open(buf, O_RDWR, 0);
     drmMsg("drmOpenDevice: open result is %d, (%s)\n",
 		fd, fd < 0 ? strerror(errno) : "OK");
     if (fd >= 0)
 	return fd;
 
     drmMsg("drmOpenDevice: Open failed\n");
-    remove(buf);
+    
     return -errno;
 }
 
@@ -434,7 +319,12 @@ static int drmOpenMinor(int minor, int c
 	return drmOpenDevice(makedev(DRM_MAJOR, minor), minor, type);
     
     sprintf(buf, type ? DRM_DEV_NAME : DRM_CONTROL_DEV_NAME, DRM_DIR_NAME, minor);
-    if ((fd = open(buf, O_RDWR, 0)) >= 0)
+#ifndef X_PRIVSEP
+    fd = open(buf, O_RDWR, 0);
+#else
+    fd = priv_open_device(buf);
+#endif
+    if (fd >= 0)
 	return fd;
     return -errno;
 }
@@ -490,7 +380,7 @@ int drmAvailable(void)
  */
 static int drmOpenByBusid(const char *busid)
 {
-    int        i, pci_domain_ok = 1;
+    int        i;
     int        fd;
     const char *buf;
     drmSetVersion sv;
@@ -500,27 +390,14 @@ static int drmOpenByBusid(const char *bu
 	fd = drmOpenMinor(i, 1, DRM_NODE_RENDER);
 	drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd);
 	if (fd >= 0) {
-	    /* We need to try for 1.4 first for proper PCI domain support
-	     * and if that fails, we know the kernel is busted
-	     */
 	    sv.drm_di_major = 1;
-	    sv.drm_di_minor = 4;
+	    sv.drm_di_minor = 1;
 	    sv.drm_dd_major = -1;	/* Don't care */
 	    sv.drm_dd_minor = -1;	/* Don't care */
-	    if (drmSetInterfaceVersion(fd, &sv)) {
-#ifndef __alpha__
-		pci_domain_ok = 0;
-#endif
-		sv.drm_di_major = 1;
-		sv.drm_di_minor = 1;
-		sv.drm_dd_major = -1;       /* Don't care */
-		sv.drm_dd_minor = -1;       /* Don't care */
-		drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n",fd);
-		drmSetInterfaceVersion(fd, &sv);
-	    }
+	    drmSetInterfaceVersion(fd, &sv);
 	    buf = drmGetBusid(fd);
 	    drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf);
-	    if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) {
+	    if (buf && drmMatchBusID(buf, busid)) {
 		drmFreeBusid(buf);
 		return fd;
 	    }
@@ -2513,12 +2390,25 @@ void drmCloseOnce(int fd)
 
 int drmSetMaster(int fd)
 {
-	return ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
+#ifdef NOTYET
+	int ret;
+
+	fprintf(stderr,"Setting master \n");
+	ret = ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
+	return ret;
+#endif
+	return 0;
 }
 
 int drmDropMaster(int fd)
 {
-	return ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
+#ifdef NOTYET
+	int ret;
+	fprintf(stderr,"Dropping master \n");
+	ret = ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
+	return ret;
+#endif
+	return 0;
 }
 
 char *drmGetDeviceNameFromFd(int fd)
@@ -2546,3 +2436,15 @@ char *drmGetDeviceNameFromFd(int fd)
 
 	return drmStrdup(name);
 }
+
+#ifdef X_PRIVSEP
+static int
+_priv_open_device(const char *path)
+{
+	drmMsg("_priv_open_device\n");
+	return open(path, O_RDWR, 0);
+}
+
+int priv_open_device(const char *)
+	__attribute__((weak, alias ("_priv_open_device")));
+#endif
diff -Naurp old/xsrc/external/mit/libdrm/dist/xf86drm.h new/xsrc/external/mit/libdrm/dist/xf86drm.h
--- old/xsrc/external/mit/libdrm/dist/xf86drm.h	2010-05-22 23:47:42.000000000 +0200
+++ new/xsrc/external/mit/libdrm/dist/xf86drm.h	2011-02-08 11:14:00.000000000 +0100
@@ -35,39 +35,10 @@
 #define _XF86DRM_H_
 
 #include <stdarg.h>
-#if 1
-#include <sys/atomic.h>
-#else
 #include <sys/types.h>
-#endif
 #include <stdint.h>
 #include <drm.h>
 
-#ifndef DRM_MAX_MINOR
-#define DRM_MAX_MINOR   16
-#endif
-
-#if defined(__linux__)
-
-#define DRM_IOCTL_NR(n)		_IOC_NR(n)
-#define DRM_IOC_VOID		_IOC_NONE
-#define DRM_IOC_READ		_IOC_READ
-#define DRM_IOC_WRITE		_IOC_WRITE
-#define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
-#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-
-#else /* One of the *BSDs */
-
-#include <sys/ioccom.h>
-#define DRM_IOCTL_NR(n)         ((n) & 0xff)
-#define DRM_IOC_VOID            IOC_VOID
-#define DRM_IOC_READ            IOC_OUT
-#define DRM_IOC_WRITE           IOC_IN
-#define DRM_IOC_READWRITE       IOC_INOUT
-#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-
-#endif
-
 				/* Defaults, if nothing set in xf86config */
 #define DRM_DEV_UID	 0
 #define DRM_DEV_GID	 0
@@ -76,6 +47,7 @@
 	(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
 #define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
 
+
 #define DRM_DIR_NAME  "/dev/dri"
 #define DRM_DEV_NAME  "%s/card%d"
 #define DRM_CONTROL_DEV_NAME  "%s/controlD%d"
@@ -337,12 +309,7 @@ typedef struct _drmSetVersion {
 #define DRM_LOCK_HELD  0x80000000U /**< Hardware lock is held */
 #define DRM_LOCK_CONT  0x40000000U /**< Hardware lock is contended */
 
-#if 1
-
-#define DRM_CAS(lock, old, new, __ret)	\
- (__ret = atomic_cas_uint(&__drm_dummy_lock(lock), (old), (new)) != (old));
-
-#elif defined(__GNUC__) && (__GNUC__ >= 2)
+#if defined(__GNUC__) && (__GNUC__ >= 2)
 # if defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)
 				/* Reflect changes here to drmP.h */
 #define DRM_CAS(lock,old,new,__ret)                                    \
@@ -702,7 +669,7 @@ extern void drmMsg(const char *format, .
 extern int drmSetMaster(int fd);
 extern int drmDropMaster(int fd);
 
-#define DRM_EVENT_CONTEXT_VERSION 2
+#define DRM_EVENT_CONTEXT_VERSION 1
 
 typedef struct _drmEventContext {
 
@@ -715,13 +682,6 @@ typedef struct _drmEventContext {
 			       unsigned int tv_sec,
 			       unsigned int tv_usec,
 			       void *user_data);
-
-	void (*page_flip_handler)(int fd,
-				  unsigned int sequence,
-				  unsigned int tv_sec,
-				  unsigned int tv_usec,
-				  void *user_data);
-
 } drmEventContext, *drmEventContextPtr;
 
 extern int drmHandleEvent(int fd, drmEventContextPtr evctx);
diff -Naurp old/xsrc/external/mit/libdrm/dist/xf86drmMode.c new/xsrc/external/mit/libdrm/dist/xf86drmMode.c
--- old/xsrc/external/mit/libdrm/dist/xf86drmMode.c	2010-11-21 08:49:32.000000000 +0100
+++ new/xsrc/external/mit/libdrm/dist/xf86drmMode.c	2011-02-08 11:14:00.000000000 +0100
@@ -46,18 +46,11 @@
 #include <drm.h>
 #include <string.h>
 #include <dirent.h>
-#include <unistd.h>
 #include <errno.h>
 
 #define U642VOID(x) ((void *)(unsigned long)(x))
 #define VOID2U64(x) ((uint64_t)(unsigned long)(x))
 
-static inline DRM_IOCTL(int fd, int cmd, void *arg)
-{
-	int ret = drmIoctl(fd, cmd, arg);
-	return ret < 0 ? -errno : ret;
-}
-
 /*
  * Util functions
  */
@@ -142,62 +135,35 @@ void drmModeFreeEncoder(drmModeEncoderPt
 
 drmModeResPtr drmModeGetResources(int fd)
 {
-	struct drm_mode_card_res res, counts;
+	struct drm_mode_card_res res;
 	drmModeResPtr r = 0;
 
-retry:
 	memset(&res, 0, sizeof(struct drm_mode_card_res));
+
 	if (drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
 		return 0;
 
-	counts = res;
-
-	if (res.count_fbs) {
+	if (res.count_fbs)
 		res.fb_id_ptr = VOID2U64(drmMalloc(res.count_fbs*sizeof(uint32_t)));
-		if (!res.fb_id_ptr)
-			goto err_allocs;
-	}
-	if (res.count_crtcs) {
+	if (res.count_crtcs)
 		res.crtc_id_ptr = VOID2U64(drmMalloc(res.count_crtcs*sizeof(uint32_t)));
-		if (!res.crtc_id_ptr)
-			goto err_allocs;
-	}
-	if (res.count_connectors) {
+	if (res.count_connectors)
 		res.connector_id_ptr = VOID2U64(drmMalloc(res.count_connectors*sizeof(uint32_t)));
-		if (!res.connector_id_ptr)
-			goto err_allocs;
-	}
-	if (res.count_encoders) {
+	if (res.count_encoders)
 		res.encoder_id_ptr = VOID2U64(drmMalloc(res.count_encoders*sizeof(uint32_t)));
-		if (!res.encoder_id_ptr)
-			goto err_allocs;
-	}
 
-	if (drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
+	if (drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res)) {
+		r = NULL;
 		goto err_allocs;
-
-	/* The number of available connectors and etc may have changed with a
-	 * hotplug event in between the ioctls, in which case the field is
-	 * silently ignored by the kernel.
-	 */
-	if (counts.count_fbs < res.count_fbs ||
-	    counts.count_crtcs < res.count_crtcs ||
-	    counts.count_connectors < res.count_connectors ||
-	    counts.count_encoders < res.count_encoders)
-	{
-		drmFree(U642VOID(res.fb_id_ptr));
-		drmFree(U642VOID(res.crtc_id_ptr));
-		drmFree(U642VOID(res.connector_id_ptr));
-		drmFree(U642VOID(res.encoder_id_ptr));
-
-		goto retry;
 	}
 
 	/*
 	 * return
 	 */
+
+
 	if (!(r = drmMalloc(sizeof(*r))))
-		goto err_allocs;
+		return 0;
 
 	r->min_width     = res.min_width;
 	r->max_width     = res.max_width;
@@ -207,23 +173,11 @@ retry:
 	r->count_crtcs   = res.count_crtcs;
 	r->count_connectors = res.count_connectors;
 	r->count_encoders = res.count_encoders;
-
-	r->fbs        = drmAllocCpy(U642VOID(res.fb_id_ptr), res.count_fbs, sizeof(uint32_t));
-	r->crtcs      = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t));
-	r->connectors = drmAllocCpy(U642VOID(res.connector_id_ptr), res.count_connectors, sizeof(uint32_t));
-	r->encoders   = drmAllocCpy(U642VOID(res.encoder_id_ptr), res.count_encoders, sizeof(uint32_t));
-	if ((res.count_fbs && !r->fbs) ||
-	    (res.count_crtcs && !r->crtcs) ||
-	    (res.count_connectors && !r->connectors) ||
-	    (res.count_encoders && !r->encoders))
-	{
-		drmFree(r->fbs);
-		drmFree(r->crtcs);
-		drmFree(r->connectors);
-		drmFree(r->encoders);
-		drmFree(r);
-		r = 0;
-	}
+	/* TODO we realy should test if these allocs fails. */
+	r->fbs           = drmAllocCpy(U642VOID(res.fb_id_ptr), res.count_fbs, sizeof(uint32_t));
+	r->crtcs         = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t));
+	r->connectors       = drmAllocCpy(U642VOID(res.connector_id_ptr), res.count_connectors, sizeof(uint32_t));
+	r->encoders      = drmAllocCpy(U642VOID(res.encoder_id_ptr), res.count_encoders, sizeof(uint32_t));
 
 err_allocs:
 	drmFree(U642VOID(res.fb_id_ptr));
@@ -248,7 +202,7 @@ int drmModeAddFB(int fd, uint32_t width,
 	f.depth  = depth;
 	f.handle = bo_handle;
 
-	if ((ret = DRM_IOCTL(fd, DRM_IOCTL_MODE_ADDFB, &f)))
+	if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_ADDFB, &f)))
 		return ret;
 
 	*buf_id = f.fb_id;
@@ -257,7 +211,7 @@ int drmModeAddFB(int fd, uint32_t width,
 
 int drmModeRmFB(int fd, uint32_t bufferId)
 {
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_RMFB, &bufferId);
+	return drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &bufferId);
 
 
 }
@@ -286,18 +240,6 @@ drmModeFBPtr drmModeGetFB(int fd, uint32
 	return r;
 }
 
-int drmModeDirtyFB(int fd, uint32_t bufferId,
-		   drmModeClipPtr clips, uint32_t num_clips)
-{
-	struct drm_mode_fb_dirty_cmd dirty = { 0 };
-
-	dirty.fb_id = bufferId;
-	dirty.clips_ptr = VOID2U64(clips);
-	dirty.num_clips = num_clips;
-
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty);
-}
-
 
 /*
  * Crtc functions
@@ -350,7 +292,7 @@ int drmModeSetCrtc(int fd, uint32_t crtc
 	} else
 	  crtc.mode_valid = 0;
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
+	return drmIoctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
 }
 
 /*
@@ -367,7 +309,7 @@ int drmModeSetCursor(int fd, uint32_t cr
 	arg.height = height;
 	arg.handle = bo_handle;
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg);
+	return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
 }
 
 int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
@@ -379,7 +321,7 @@ int drmModeMoveCursor(int fd, uint32_t c
 	arg.x = x;
 	arg.y = y;
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg);
+	return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
 }
 
 /*
@@ -416,57 +358,37 @@ drmModeEncoderPtr drmModeGetEncoder(int
 
 drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 {
-	struct drm_mode_get_connector conn, counts;
+	struct drm_mode_get_connector conn;
 	drmModeConnectorPtr r = NULL;
 
-retry:
-	memset(&conn, 0, sizeof(struct drm_mode_get_connector));
 	conn.connector_id = connector_id;
+	conn.connector_type_id = 0;
+	conn.connector_type  = 0;
+	conn.count_modes  = 0;
+	conn.modes_ptr    = 0;
+	conn.count_props  = 0;
+	conn.props_ptr    = 0;
+	conn.prop_values_ptr = 0;
+	conn.count_encoders  = 0;
+	conn.encoders_ptr = 0;
 
 	if (drmIoctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
 		return 0;
 
-	counts = conn;
-
 	if (conn.count_props) {
 		conn.props_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint32_t)));
-		if (!conn.props_ptr)
-			goto err_allocs;
 		conn.prop_values_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint64_t)));
-		if (!conn.prop_values_ptr)
-			goto err_allocs;
 	}
 
-	if (conn.count_modes) {
+	if (conn.count_modes)
 		conn.modes_ptr = VOID2U64(drmMalloc(conn.count_modes*sizeof(struct drm_mode_modeinfo)));
-		if (!conn.modes_ptr)
-			goto err_allocs;
-	}
 
-	if (conn.count_encoders) {
+	if (conn.count_encoders)
 		conn.encoders_ptr = VOID2U64(drmMalloc(conn.count_encoders*sizeof(uint32_t)));
-		if (!conn.encoders_ptr)
-			goto err_allocs;
-	}
 
 	if (drmIoctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
 		goto err_allocs;
 
-	/* The number of available connectors and etc may have changed with a
-	 * hotplug event in between the ioctls, in which case the field is
-	 * silently ignored by the kernel.
-	 */
-	if (counts.count_props < conn.count_props ||
-	    counts.count_modes < conn.count_modes ||
-	    counts.count_encoders < conn.count_encoders) {
-		drmFree(U642VOID(conn.props_ptr));
-		drmFree(U642VOID(conn.prop_values_ptr));
-		drmFree(U642VOID(conn.modes_ptr));
-		drmFree(U642VOID(conn.encoders_ptr));
-
-		goto retry;
-	}
-
 	if(!(r = drmMalloc(sizeof(*r)))) {
 		goto err_allocs;
 	}
@@ -479,6 +401,7 @@ retry:
 	/* convert subpixel from kernel to userspace */
 	r->subpixel     = conn.subpixel + 1;
 	r->count_modes  = conn.count_modes;
+	/* TODO we should test if these alloc & cpy fails. */
 	r->count_props  = conn.count_props;
 	r->props        = drmAllocCpy(U642VOID(conn.props_ptr), conn.count_props, sizeof(uint32_t));
 	r->prop_values  = drmAllocCpy(U642VOID(conn.prop_values_ptr), conn.count_props, sizeof(uint64_t));
@@ -488,17 +411,8 @@ retry:
 	r->connector_type  = conn.connector_type;
 	r->connector_type_id = conn.connector_type_id;
 
-	if ((r->count_props && !r->props) ||
-	    (r->count_props && !r->prop_values) ||
-	    (r->count_modes && !r->modes) ||
-	    (r->count_encoders && !r->encoders)) {
-		drmFree(r->props);
-		drmFree(r->prop_values);
-		drmFree(r->modes);
-		drmFree(r->encoders);
-		drmFree(r);
-		r = 0;
-	}
+	if (!r->props || !r->prop_values || !r->modes || !r->encoders)
+		goto err_allocs;
 
 err_allocs:
 	drmFree(U642VOID(conn.prop_values_ptr));
@@ -516,7 +430,7 @@ int drmModeAttachMode(int fd, uint32_t c
 	memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
 	res.connector_id = connector_id;
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_ATTACHMODE, &res);
+	return drmIoctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res);
 }
 
 int drmModeDetachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_info)
@@ -526,7 +440,7 @@ int drmModeDetachMode(int fd, uint32_t c
 	memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
 	res.connector_id = connector_id;
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
+	return drmIoctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
 }
 
 
@@ -619,7 +533,7 @@ drmModePropertyBlobPtr drmModeGetPropert
 	}
 
 	if (!(r = drmMalloc(sizeof(*r))))
-		goto err_allocs;
+		return NULL;
 
 	r->id = blob.blob_id;
 	r->length = blob.length;
@@ -643,12 +557,16 @@ int drmModeConnectorSetProperty(int fd,
 			     uint64_t value)
 {
 	struct drm_mode_connector_set_property osp;
+	int ret;
 
 	osp.connector_id = connector_id;
 	osp.prop_id = property_id;
 	osp.value = value;
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp);
+	if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp)))
+		return ret;
+
+	return 0;
 }
 
 /*
@@ -717,6 +635,7 @@ int drmCheckModesettingSupported(const c
 int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
 			uint16_t *red, uint16_t *green, uint16_t *blue)
 {
+	int ret;
 	struct drm_mode_crtc_lut l;
 
 	l.crtc_id = crtc_id;
@@ -725,12 +644,16 @@ int drmModeCrtcGetGamma(int fd, uint32_t
 	l.green = VOID2U64(green);
 	l.blue = VOID2U64(blue);
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_GETGAMMA, &l);
+	if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_GETGAMMA, &l)))
+		return ret;
+
+	return 0;
 }
 
 int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size,
 			uint16_t *red, uint16_t *green, uint16_t *blue)
 {
+	int ret;
 	struct drm_mode_crtc_lut l;
 
 	l.crtc_id = crtc_id;
@@ -739,7 +662,10 @@ int drmModeCrtcSetGamma(int fd, uint32_t
 	l.green = VOID2U64(green);
 	l.blue = VOID2U64(blue);
 
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETGAMMA, &l);
+	if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETGAMMA, &l)))
+		return ret;
+
+	return 0;
 }
 
 int drmHandleEvent(int fd, drmEventContextPtr evctx)
@@ -773,17 +699,6 @@ int drmHandleEvent(int fd, drmEventConte
 					      vblank->tv_usec,
 					      U642VOID (vblank->user_data));
 			break;
-		case DRM_EVENT_FLIP_COMPLETE:
-			if (evctx->version < 2 ||
-			    evctx->page_flip_handler == NULL)
-				break;
-			vblank = (struct drm_event_vblank *) e;
-			evctx->page_flip_handler(fd,
-						 vblank->sequence,
-						 vblank->tv_sec,
-						 vblank->tv_usec,
-						 U642VOID (vblank->user_data));
-			break;
 		default:
 			break;
 		}
@@ -792,17 +707,3 @@ int drmHandleEvent(int fd, drmEventConte
 
 	return 0;
 }
-
-int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id,
-		    uint32_t flags, void *user_data)
-{
-	struct drm_mode_crtc_page_flip flip;
-
-	flip.fb_id = fb_id;
-	flip.crtc_id = crtc_id;
-	flip.user_data = VOID2U64(user_data);
-	flip.flags = flags;
-	flip.reserved = 0;
-
-	return DRM_IOCTL(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip);
-}
diff -Naurp old/xsrc/external/mit/libdrm/dist/xf86drmMode.h new/xsrc/external/mit/libdrm/dist/xf86drmMode.h
--- old/xsrc/external/mit/libdrm/dist/xf86drmMode.h	2010-05-22 23:45:11.000000000 +0200
+++ new/xsrc/external/mit/libdrm/dist/xf86drmMode.h	2011-02-08 11:14:00.000000000 +0100
@@ -133,8 +133,6 @@
 #define DRM_MODE_CONNECTOR_DisplayPort  10
 #define DRM_MODE_CONNECTOR_HDMIA        11
 #define DRM_MODE_CONNECTOR_HDMIB        12
-#define DRM_MODE_CONNECTOR_TV		13
-#define DRM_MODE_CONNECTOR_eDP		14
 
 #define DRM_MODE_PROP_PENDING   (1<<0)
 #define DRM_MODE_PROP_RANGE     (1<<1)
@@ -147,17 +145,6 @@
 
 #endif /* _DRM_MODE_H */
 
-
-/*
- * Feature defines
- *
- * Just because these are defined doesn't mean that the kernel
- * can do that feature, its just for new code vs old libdrm.
- */
-#define DRM_MODE_FEATURE_KMS		1
-#define DRM_MODE_FEATURE_DIRTYFB	1
-
-
 typedef struct _drmModeRes {
 
 	int count_fbs;
@@ -181,7 +168,7 @@ typedef struct _drmModeModeInfo {
 	uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew;
 	uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan;
 
-	uint32_t vrefresh;
+	uint32_t vrefresh; /* vertical refresh * 1000 */
 
 	uint32_t flags;
 	uint32_t type;
@@ -198,8 +185,6 @@ typedef struct _drmModeFB {
 	uint32_t handle;
 } drmModeFB, *drmModeFBPtr;
 
-typedef struct drm_clip_rect drmModeClip, *drmModeClipPtr;
-
 typedef struct _drmModePropertyBlob {
 	uint32_t id;
 	uint32_t length;
@@ -308,13 +293,6 @@ extern int drmModeAddFB(int fd, uint32_t
  */
 extern int drmModeRmFB(int fd, uint32_t bufferId);
 
-/**
- * Mark a region of a framebuffer as dirty.
- */
-extern int drmModeDirtyFB(int fd, uint32_t bufferId,
-			  drmModeClipPtr clips, uint32_t num_clips);
-
-
 /*
  * Crtc functions
  */
@@ -384,5 +362,3 @@ extern int drmModeCrtcSetGamma(int fd, u
 			       uint16_t *red, uint16_t *green, uint16_t *blue);
 extern int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
 			       uint16_t *red, uint16_t *green, uint16_t *blue);
-extern int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id,
-			   uint32_t flags, void *user_data);
diff -Naurp old/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.c new/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.c
--- old/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.c	2010-07-19 07:31:38.000000000 +0200
+++ new/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_batchbuffer.c	2011-02-08 11:14:00.000000000 +0100
@@ -130,7 +130,7 @@ _intel_batchbuffer_flush(struct intel_ba
    struct intel_context *intel = batch->intel;
    GLuint used = batch->ptr - batch->map;
 
-   if (!intel->using_dri2_swapbuffers &&
+   if (/* !intel->using_dri2_swapbuffers && */
        intel->first_post_swapbuffers_batch == NULL) {
       intel->first_post_swapbuffers_batch = intel->batch->buf;
       drm_intel_bo_reference(intel->first_post_swapbuffers_batch);
diff -Naurp old/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_context.c new/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_context.c
--- old/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_context.c	2010-07-19 07:31:38.000000000 +0200
+++ new/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_context.c	2011-02-08 11:14:00.000000000 +0100
@@ -529,7 +529,7 @@ intel_glFlush(GLcontext *ctx)
     * and getting our hands on that doesn't seem worth it, so we just us the
     * first batch we emitted after the last swap.
     */
-   if (!intel->using_dri2_swapbuffers &&
+   if (/* !intel->using_dri2_swapbuffers && */
        intel->first_post_swapbuffers_batch != NULL) {
       drm_intel_bo_wait_rendering(intel->first_post_swapbuffers_batch);
       drm_intel_bo_unreference(intel->first_post_swapbuffers_batch);
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/aclocal.m4 new/xsrc/external/mit/xf86-video-intel/dist/aclocal.m4
--- old/xsrc/external/mit/xf86-video-intel/dist/aclocal.m4	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/aclocal.m4	2011-02-08 11:14:00.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 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.
@@ -11,196 +11,102 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 56 LT_INIT
 
+# serial 52 AC_PROG_LIBTOOL
 
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
 
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
 
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
 
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
 
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
 
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
 
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
 
 
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
 AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
 AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
 
-m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -216,653 +122,116 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
 
 # Sed substitution to delay expansion of an escaped shell variable in a
 # double_quote_subst'ed string.
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
 # Sed substitution to avoid accidental globbing in evaled expressions
 no_glob_subst='s/\*/\\\*/g'
 
+# Constants:
+rm="rm -f"
+
 # Global variables:
-ofile=libtool
+default_ofile=libtool
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
-
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
 with_gnu_ld="$lt_cv_prog_gnu_ld"
 
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
 old_CC="$CC"
 old_CFLAGS="$CFLAGS"
 
 # Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
 _LT_CC_BASENAME([$compiler])
 
 # Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
+    AC_PATH_MAGIC
   fi
   ;;
 esac
 
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
+_LT_REQUIRED_DARWIN_CHECKS
 
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
 
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
 
 
-# _LT_CONFIG_COMMANDS
+# _LT_AC_SYS_COMPILER
 # -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
+AC_DEFUN([_LT_AC_SYS_COMPILER],
 [AC_REQUIRE([AC_PROG_CC])dnl
 
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
@@ -871,20 +240,36 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
 # Allow CC to be a program name with arguments.
 compiler=$CC
-])# _LT_TAG_COMPILER
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
 
 
 # _LT_COMPILER_BOILERPLATE
 # ------------------------
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
+$rm conftest*
 ])# _LT_COMPILER_BOILERPLATE
 
 
@@ -892,57 +277,39 @@ $RM conftest*
 # ----------------------
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
 # _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
   case $host_os in
     rhapsody* | darwin*)
     AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
     AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
 
     AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
       [lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
       fi])
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
@@ -951,26 +318,26 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
     ])
     case $host_os in
-    rhapsody* | darwin1.[[012]])
+    rhapsody* | darwin1.[[0123]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it?
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -980,10 +347,10 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
     if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
       _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
     else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
     fi
     if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
     else
       _lt_dsymutil=
     fi
@@ -991,51 +358,16 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
   esac
 ])
 
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 AC_LINK_IFELSE(AC_LANG_PROGRAM,[
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -1050,45 +382,45 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_SYS_MODULE_PATH_AIX
+])# _LT_AC_SYS_LIBPATH_AIX
 
 
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
 [ifdef([AC_DIVERSION_NOTICE],
 	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
 	 [AC_DIVERT_PUSH(NOTICE)])
 $1
 AC_DIVERT_POP
-])# _LT_SHELL_INIT
+])# _LT_AC_SHELL_INIT
 
 
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
 # Add some code to the start of the generated configure script which
 # will find an echo command which doesn't interpret backslashes.
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
+case X$ECHO in
 X*--fallback-echo)
   # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
   ;;
 esac
 
-ECHO=${lt_ECHO-echo}
+echo=${ECHO-echo}
 if test "X[$]1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X[$]1" = X--fallback-echo; then
   # Avoid inline document here, it may be left over
   :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
   :
 else
   # Restart under the correct shell.
@@ -1098,9 +430,9 @@ fi
 if test "X[$]1" = X--fallback-echo; then
   # used as fallback echo
   shift
-  cat <<_LT_EOF
+  cat <<EOF
 [$]*
-_LT_EOF
+EOF
   exit 0
 fi
 
@@ -1108,127 +440,124 @@ fi
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
 
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
 
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
     IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
 
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
 	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
 
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
 	  fi
-        fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
       fi
     fi
   fi
 fi
+fi
 
 # Copy echo and quote the copy suitably for passing to libtool from
 # the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
 fi
 
-AC_SUBST(lt_ECHO)
-])
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
 
 
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
 [AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
@@ -1239,12 +568,12 @@ ia64-*-hpux*)
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
     esac
   fi
   rm -rf conftest*
@@ -1253,79 +582,79 @@ ia64-*-hpux*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
   fi
   rm -rf conftest*
   ;;
 
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
+    *32-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
     esac
   fi
   rm -rf conftest*
@@ -1337,7 +666,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
     [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
      AC_LANG_POP])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -1353,7 +682,7 @@ sparc*-*solaris*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
       *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
 	fi
 	;;
@@ -1363,63 +692,30 @@ sparc*-*solaris*)
   fi
   rm -rf conftest*
   ;;
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
 esac
 
 need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
 
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-])# _LT_CMD_OLD_ARCHIVE
+])# _LT_AC_LOCK
 
 
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 #		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 # ----------------------------------------------------------------
 # Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -1439,35 +735,29 @@ AC_CACHE_CHECK([$1], [$2],
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
-   $RM conftest*
+   $rm conftest*
 ])
 
 if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
+    ifelse([$5], , :, [$5])
 else
-    m4_if([$6], , :, [$6])
+    ifelse([$6], , :, [$6])
 fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+])# AC_LIBTOOL_COMPILER_OPTION
 
 
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
@@ -1479,7 +769,7 @@ AC_CACHE_CHECK([$1], [$2],
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1488,28 +778,22 @@ AC_CACHE_CHECK([$1], [$2],
        $2=yes
      fi
    fi
-   $RM -r conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
 if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
+    ifelse([$4], , :, [$4])
 else
-    m4_if([$5], , :, [$5])
+    ifelse([$5], , :, [$5])
 fi
-])# _LT_LINKER_OPTION
+])# AC_LIBTOOL_LINKER_OPTION
 
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
 
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
@@ -1531,7 +815,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
-  cygwin* | mingw* | cegcc*)
+  cygwin* | mingw*)
     # On Win9x/ME, this test blows up -- it succeeds, but takes
     # about 5 minutes as the teststring grows exponentially.
     # Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1586,7 +870,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -1597,28 +881,20 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
       done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
       teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
     fi
     ;;
@@ -1629,35 +905,27 @@ if test -n $lt_cv_sys_max_cmd_len ; then
 else
   AC_MSG_RESULT(none)
 fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
 
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
 
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
 
 
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "$cross_compiling" = yes; then :
   [$4]
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
+  cat > conftest.$ac_ext <<EOF
 [#line __oline__ "configure"
 #include "confdefs.h"
 
@@ -1699,6 +967,10 @@ else
 #  endif
 #endif
 
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
 void fnord() { int i=42;}
 int main ()
 {
@@ -1714,9 +986,9 @@ int main ()
   else
     puts (dlerror ());
 
-  return status;
+    exit (status);
 }]
-_LT_EOF
+EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
@@ -1731,13 +1003,13 @@ _LT_EOF
   fi
 fi
 rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
+])# _LT_AC_TRY_DLOPEN_SELF
 
 
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
@@ -1753,15 +1025,15 @@ else
     lt_cv_dlopen_self=yes
     ;;
 
-  mingw* | pw32* | cegcc*)
+  mingw* | pw32*)
     lt_cv_dlopen="LoadLibrary"
     lt_cv_dlopen_libs=
-    ;;
+   ;;
 
   cygwin*)
     lt_cv_dlopen="dlopen"
     lt_cv_dlopen_libs=
-    ;;
+   ;;
 
   darwin*)
   # if libdl is installed we need to link against it
@@ -1771,7 +1043,7 @@ else
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ])
-    ;;
+   ;;
 
   *)
     AC_CHECK_FUNC([shl_load],
@@ -1813,7 +1085,7 @@ else
 
     AC_CACHE_CHECK([whether a program can dlopen itself],
 	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
+	  _LT_AC_TRY_DLOPEN_SELF(
 	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
     ])
@@ -1821,8 +1093,8 @@ else
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
 	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
 	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
       ])
@@ -1844,32 +1116,19 @@ else
   *) enable_dlopen_self_static=unknown ;;
   esac
 fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+])# AC_LIBTOOL_DLOPEN_SELF
 
 
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
@@ -1893,41 +1152,37 @@ AC_CACHE_CHECK([if $compiler supports -c
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
    chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
+   $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
-   $RM -r conftest
-   $RM conftest*
+   rmdir conftest
+   $rm conftest*
 ])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
+])# AC_LIBTOOL_PROG_CC_C_O
 
 
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
 # Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
 
 hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
   AC_MSG_CHECKING([if we can lock with hard links])
   hard_links=yes
-  $RM conftest*
+  $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
@@ -1940,13 +1195,12 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler
 else
   need_locks=no
 fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
 
 
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
 [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
 [rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -1958,46 +1212,40 @@ else
 fi
 rmdir .libs 2>/dev/null])
 objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
+])# AC_LIBTOOL_OBJDIR
 
 
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
 # Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
     # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
   else
     # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
   fi
 else
   # We cannot hardcode anything, or else we can only hardcode existing
   # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
 fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
 
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
@@ -2005,70 +1253,73 @@ elif test "$shlibpath_overrides_runpath"
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
 
 
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
 old_striplib=
 AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   AC_MSG_RESULT([yes])
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
     ;;
   esac
 fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
+])# AC_LIBTOOL_SYS_LIB_STRIP
 
 
-# _LT_SYS_DYNAMIC_LINKER([TAG])
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
   case $host_os in
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
@@ -2082,7 +1333,7 @@ if test "$GCC" = yes; then
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -2102,23 +1353,10 @@ BEGIN {RS=" "; FS="/|\n";} {
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -2155,7 +1393,7 @@ aix[[4-9]]*)
       aix4 | aix4.[[01]] | aix4.[[01]].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
 	:
       else
 	can_build_shared=no
@@ -2181,18 +1419,9 @@ aix[[4-9]]*)
   ;;
 
 amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -2215,28 +1444,25 @@ bsdi[[45]]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | mingw* | pw32*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  yes,cygwin* | yes,mingw* | yes,pw32*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $RM \$dlpath'
+       $rm \$dlpath'
     shlibpath_overrides_runpath=yes
 
     case $host_os in
@@ -2245,20 +1471,20 @@ cygwin* | mingw* | pw32* | cegcc*)
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    mingw* | cegcc*)
+    mingw*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
         # path with ; separators, and with drive letters. We can handle the
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
@@ -2282,13 +1508,13 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -2381,18 +1607,18 @@ hpux9* | hpux10* | hpux11*)
     fi
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
     shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
@@ -2469,17 +1695,6 @@ linux* | k*bsd*-gnu)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
@@ -2487,7 +1702,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -2500,23 +1715,11 @@ linux* | k*bsd*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
@@ -2537,16 +1740,14 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-*nto* | *qnx*)
-  version_type=qnx
+nto-qnx*)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
+  shlibpath_overrides_runpath=yes
   ;;
 
 openbsd*)
@@ -2555,13 +1756,13 @@ openbsd*)
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
       openbsd2.[[89]] | openbsd2.[[89]].*)
 	shlibpath_overrides_runpath=no
@@ -2633,6 +1834,7 @@ sysv4 | sysv4.3*)
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -2663,12 +1865,13 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   if test "$with_gnu_ld" = yes; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
@@ -2678,17 +1881,6 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
   sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2703,58 +1895,288 @@ esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
 
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
 
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 [case $MAGIC_CMD in
@@ -2767,7 +2189,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
   for ac_dir in $ac_dummy; do
     IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
@@ -2782,7 +2204,7 @@ dnl not every word.  This closes a longs
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<_LT_EOF 1>&2
+	    cat <<EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -2793,7 +2215,7 @@ dnl not every word.  This closes a longs
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-_LT_EOF
+EOF
 	  fi ;;
 	esac
       fi
@@ -2810,47 +2232,37 @@ if test -n "$MAGIC_CMD"; then
 else
   AC_MSG_RESULT(no)
 fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
+])# AC_PATH_TOOL_PREFIX
 
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
 
-
-# _LT_PATH_MAGIC
-# --------------
+# AC_PATH_MAGIC
+# -------------
 # find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
   else
     MAGIC_CMD=:
   fi
 fi
-])# _LT_PATH_MAGIC
+])# AC_PATH_MAGIC
 
 
-# LT_PATH_LD
+# AC_PROG_LD
 # ----------
 # find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
     [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
@@ -2867,9 +2279,9 @@ if test "$GCC" = yes; then
     [[\\/]]* | ?:[[\\/]]*)
       re_direlt='/[[^/]][[^/]]*/\.\./'
       # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -2919,24 +2331,15 @@ else
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
+AC_PROG_LD_GNU
+])# AC_PROG_LD
 
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
 
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -2947,14 +2350,14 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac])
 with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
+])# AC_PROG_LD_GNU
 
 
-# _LT_CMD_RELOAD
-# --------------
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
 # find reload flag for linker
 #   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
 [AC_CACHE_CHECK([for $LD option to reload object files],
   lt_cv_ld_reload_flag,
   [lt_cv_ld_reload_flag='-r'])
@@ -2973,19 +2376,15 @@ case $host_os in
     fi
     ;;
 esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
+])# AC_PROG_LD_RELOAD_FLAG
 
 
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -3035,18 +2434,12 @@ mingw* | pw32*)
   fi
   ;;
 
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
@@ -3103,8 +2496,8 @@ linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
@@ -3117,12 +2510,12 @@ newos6*)
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
   ;;
 
 openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3141,10 +2534,6 @@ solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
@@ -3172,7 +2561,7 @@ sysv4 | sysv4.3*)
   esac
   ;;
 
-tpf*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -3180,20 +2569,14 @@ esac
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
 
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
 
-
-# LT_PATH_NM
+# AC_PROG_NM
 # ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
@@ -3235,51 +2618,16 @@ else
     done
     IFS="$lt_save_ifs"
   done
-  : ${lt_cv_path_NM=no}
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
 
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
 
-
-# LT_LIB_M
-# --------
+# AC_CHECK_LIBM
+# -------------
 # check for math library
-AC_DEFUN([LT_LIB_M],
+AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
@@ -3294,4696 +2642,4011 @@ case $host in
   AC_CHECK_LIB(m, cos, LIBM="-lm")
   ;;
 esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
+])# AC_CHECK_LIBM
 
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
 
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
 
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
 
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
 
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
 
 
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
 
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
 [
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
 
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
 
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
 
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
 
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
 
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
 
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
 
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
 
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
 
-  # Check to see that the pipe works correctly.
-  pipe_works=no
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
 
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
+# Source file extension for C test sources.
+ac_ext=c
 
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
 
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
 
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
 
-	  cat <<_LT_EOF >> conftest.$ac_ext
+_LT_AC_SYS_COMPILER
 
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
 
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+    ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
     else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
     fi
   else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
+    with_gnu_ld=no
+    wlarc=
 
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
 else
-  AC_MSG_RESULT(ok)
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
 fi
 
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-]) # _LT_CMD_GLOBAL_SYMBOLS
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix[[4-9]]*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
 
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
 
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  :
+	else
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	fi
+	;;
+      esac
+      shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
+    else
+      # not using gcc
       if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
       fi
-      ;;
+    fi
 
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
+    fi
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
+  chorus*)
+    case $cc_basename in
       *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+      darwin* | rhapsody*)
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
+      output_verbose_link_cmd='echo'
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+      fi
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
       esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
+      fi
+        ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx*)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
     esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
+    ;;
+  freebsd[[12]]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd* | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
+      *)
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
 	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
 	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
+    esac
+    ;;
+  interix[[3-9]]*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC*)
+	# SGI C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	  else
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux* | k*bsd*-gnu)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc*)
+	# Intel C++
+	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
 	esac
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      pgCC* | pgcpp*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
+	# Compaq C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
 	esac
 	;;
-      lynxos*)
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      m88k*)
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
-      netbsd* | netbsdelf*-gnu)
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
 	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
-      psos*)
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
 	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc*)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+	output_verbose_link_cmd='echo'
+
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx*)
+	# Green Hills C++ Compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
 	    ;;
-	esac
+	  esac
+	fi
 	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	;;
-      vxworks*)
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	;;
       *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	;;
     esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
       *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
+AC_LIBTOOL_CONFIG($1)
 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
 
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
 
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
 
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
 
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
 
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
 
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
 
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
 
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+    *) ;; # Ignore the rest.
 
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+    esac
+  done
 
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
 
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+$rm -f confest.$objext
 
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
 
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
 
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
       ;;
     esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
+  esac
+  ;;
 
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
 
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
     fi
     ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
+  ;;
+esac
+])
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
 
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
 
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
+# Source file extension for f77 test sources.
+ac_ext=f
 
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
-_LT_EOF
-      fi
-      ;;
+# Code to be used in simple link tests
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
 
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
 
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
 
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+AC_LIBTOOL_CONFIG($1)
 
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
 
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
 
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
 
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+# Source file extension for Java test sources.
+ac_ext=java
 
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
 
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
 
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+AC_LIBTOOL_CONFIG($1)
 
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
 
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
 
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
 
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
+# Source file extension for RC test sources.
+ac_ext=rc
 
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
 
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
 
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+AC_LIBTOOL_CONFIG($1)
 
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
 
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
       ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
       ;;
+    esac
+  done
 
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
 
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
 
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# A sed program that does not truncate output.
+SED=$lt_SED
 
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
 
-    *nto* | *qnx*)
-      ;;
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+# The names of the tagged configurations supported by this script.
+available_tags=
 
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
 
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
 
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
 
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
 
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
 
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
+# A C compiler.
+LTCC=$lt_LTCC
 
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
 
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+# An ERE matcher.
+EGREP=$lt_EGREP
 
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
 
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+# A BSD-compatible nm program.
+NM=$lt_NM
 
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
+# A symbol stripping program
+STRIP=$lt_STRIP
 
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
 
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
 
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
 
-# Source file extension for C test sources.
-ac_ext=c
+# Used on cygwin: assembler.
+AS="$AS"
 
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
 
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
+# Object file suffix (normally "o").
+objext="$ac_objext"
 
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
+# Old archive suffix (normally "a").
+libext="$libext"
 
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
 
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
+# Executable file suffix (normally "").
+exeext="$exeext"
 
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
 
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
 
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
 
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
+# Do we need a version for libraries?
+need_version=$need_version
 
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
-# Source file extension for C++ test sources.
-ac_ext=cpp
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
 
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
 
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
 
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
 
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
 
-      LT_PATH_LD
+# Library versioning type.
+version_type=$version_type
 
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
 
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
 
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
 
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
 
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
 
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
 
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
 
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 
-      cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
 
-      freebsd[[12]]*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
 
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
 
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
 
-      gnu*)
-        ;;
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
 
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
 
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
 
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
 
-      linux* | k*bsd*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 will use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  xl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='echo'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
 
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
 
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
 
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
 
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=echo
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
 
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
 
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
 
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
 
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
 
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
 
-      solaris*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 
-	    output_verbose_link_cmd='echo'
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
 
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
 
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
 
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
 
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
 
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
+__EOF__
 
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
 
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
 
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
 
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
 
 
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
 
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
 
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
 
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-    *) ;; # Ignore the rest.
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
-    esac
-  done
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
   ;;
-
 solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
   ;;
 esac
-])
 
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
 esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
 
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
 
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
 
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
-# Source file extension for f77 test sources.
-ac_ext=f
+  # Check to see that the pipe works correctly.
+  pipe_works=no
 
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
 
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
 
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
 
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${F77-"f77"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
 
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
 
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
 
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
 fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${FC-"f95"}
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
 
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
 
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
     case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC="$lt_save_CC"
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  icpc* | ecpc*)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
 
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
 
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
 
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
 
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
 
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
 
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
 
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
 
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
 
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
 
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
 
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
 
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
 
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
 
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
 
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
 
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 
-_LT_EOF
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
     ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
+esac
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
 
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
 
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
   esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
 
-_LT_EOF
-esac
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
-_LT_EOF
-    ;;
-  esac
-])
+EOF
+      fi
+      ;;
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
 
-# serial 6 ltoptions.m4
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+    interix[[3-9]]*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
 
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
 
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
 
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
 
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
 
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
 
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
 
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
 
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
 
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
 
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
 
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
 
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+    bsdi[[45]]*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
 
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
 
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-])# win32-dll
+    darwin* | rhapsody*)
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
+      ;;
 
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
 
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
 
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
 
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
 
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
       ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
 
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
 
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
 
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
 
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
+	# Both c and cxx compiler support -rpath directly
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
 
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	fi
-      done
-      IFS="$lt_save_ifs"
+	;;
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
 
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
 
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
 
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
 
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
+# Do we need to explicitly link libc?
 #
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
 
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
 
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
 
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
 
 
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
 
 
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
 
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
 
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
 
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
 
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
 
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
 
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
 
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
 ])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Generated from ltversion.in.
-
-# serial 3012 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
 ])
 
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 4 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -8132,7 +6795,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -8142,56 +6805,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-dnl Copyright 2005 Red Hat, Inc
-dnl 
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl 
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl 
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl 
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl 
-
-# XORG_DRIVER_CHECK_EXT()
-# --------------------------
-# Checks for the $1 define in xorg-server.h (from the sdk).  If it
-# is defined, then add $1 to $REQUIRED_MODULES.
-
-AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include "xorg-server.h"
-#if !defined $1
-#error $1 not defined
-#endif
-		]])],
-		[_EXT_CHECK=yes],
-		[_EXT_CHECK=no])
-	CFLAGS="$SAVE_CFLAGS"
-	AC_MSG_CHECKING([if $1 is defined])
-	AC_MSG_RESULT([$_EXT_CHECK])
-	if test "$_EXT_CHECK" != no; then
-		REQUIRED_MODULES="$REQUIRED_MODULES $2"
-	fi
-])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8201,31 +6815,14 @@ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.2], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -8282,14 +6879,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 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
+# serial 7
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -8298,10 +6895,8 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -8315,14 +6910,15 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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 9
+# serial 8
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -8350,7 +6946,6 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -8416,7 +7011,6 @@ AC_CACHE_CHECK([dependency style of $dep
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -8469,34 +7063,24 @@ if test "x$enable_dependency_tracking" !
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([AMDEPBACKSLASH])
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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 4
+#serial 3
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
+[for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.
@@ -8504,9 +7088,8 @@ do
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -8565,14 +7148,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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 13
+# serial 12
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -8589,20 +7172,16 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.58])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 
 # test whether we have cygpath
@@ -8622,9 +7201,6 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -8660,10 +7236,6 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -8677,17 +7249,16 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
-_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $_am_arg | $_am_arg:* )
+    $1 | $1:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -8700,7 +7271,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNA
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -8805,14 +7376,13 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 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 6
+# serial 3
 
 # AM_PROG_CC_C_O
 # --------------
@@ -8820,13 +7390,11 @@ rm -f confinc confmf
 AC_DEFUN([AM_PROG_CC_C_O],
 [AC_REQUIRE([AC_PROG_CC_C_O])dnl
 AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
 # FIXME: we rely on the cache variable name because
 # there is no other way.
 set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
    # But if we don't then we get into trouble of one sort or another.
@@ -8834,22 +7402,18 @@ if test "$am_t" != yes; then
    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
    CC="$am_aux_dir/compile $CC"
 fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
 ])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 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 5
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -8865,7 +7429,6 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -8876,7 +7439,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8884,33 +7447,70 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check for `mkdir -p'.
+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+#
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake.  There are at least two reasons why we must not
+# use `-m 0755':
+#   - it causes special bits like SGID to be ignored,
+#   - it may be too restrictive (some setups expect 775 directories).
+#
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out.  Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
+  else
+    mkdir_p='$(SHELL) $(install_sh) -d'
+  fi
+fi
+AC_SUBST([mkdir_p])])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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 4
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -8927,7 +7527,7 @@ AC_DEFUN([_AM_SET_OPTION],
 # ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------
@@ -8935,58 +7535,6 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# 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 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -9012,21 +7560,9 @@ dnl Don't test for $cross_compiling = ye
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006  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.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -9128,29 +7664,23 @@ dnl
 dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
 dnl 
 dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the
-dnl "Software"), to deal in the Software without restriction, including
-dnl without limitation the rights to use, copy, modify, merge, publish,
-dnl distribute, and/or sell copies of the Software, and to permit persons
-dnl to whom the Software is furnished to do so, provided that the above
-dnl copyright notice(s) and this permission notice appear in all copies of
-dnl the Software and that both the above copyright notice(s) and this
-dnl permission notice appear in supporting documentation.
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
+dnl and/or sell copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following conditions:
 dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl The above copyright notice and this permission notice (including the next
+dnl paragraph) shall be included in all copies or substantial portions of the
+dnl Software.
 dnl
-dnl Except as contained in this notice, the name of a copyright holder
-dnl shall not be used in advertising or otherwise to promote the sale, use
-dnl or other dealings in this Software without prior written authorization
-dnl of the copyright holder.
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+dnl DEALINGS IN THE SOFTWARE.
 
 # XORG_MACROS_VERSION(required-version)
 # -------------------------------------
@@ -9167,21 +7697,17 @@ dnl of the copyright holder.
 #
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
-AC_DEFUN([XORG_MACROS_VERSION],[
-	[XORG_MACROS_needed_version=$1
-	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
-	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
-	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.2.1
-	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
-	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
-	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
-		AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_needed_major}.x])
-	fi
-	if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
-		AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}.0 or newer])
-	fi
-	AC_MSG_RESULT([yes, $XORG_MACROS_version])
+m4_defun([XORG_MACROS_VERSION],[
+m4_define([vers_have], [1.6.1])
+m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
+m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
+m4_if(m4_cmp(maj_have, maj_needed), 0,,
+    [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
+m4_if(m4_version_compare(vers_have, [$1]), -1,
+    [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
+m4_undefine([vers_have])
+m4_undefine([maj_have])
+m4_undefine([maj_needed])
 ]) # XORG_MACROS_VERSION
 
 # XORG_PROG_RAWCPP()
@@ -9336,7 +7862,7 @@ fi
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
 
-AC_MSG_CHECKING([Whether to build documentation])
+AC_MSG_CHECKING([whether to build documentation])
 
 if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
    BUILDDOC=yes
@@ -9348,7 +7874,7 @@ AM_CONDITIONAL(BUILD_LINUXDOC, [test x$B
 
 AC_MSG_RESULT([$BUILDDOC])
 
-AC_MSG_CHECKING([Whether to build pdf documentation])
+AC_MSG_CHECKING([whether to build pdf documentation])
 
 if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
    BUILDPDFDOC=yes
@@ -9396,7 +7922,7 @@ AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
 AC_PATH_PROG(DOCBOOKHTML, docbook2html)
 AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
 
-AC_MSG_CHECKING([Whether to build text documentation])
+AC_MSG_CHECKING([whether to build text documentation])
 if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
    test x$BUILD_TXTDOC != xno; then
 	BUILDTXTDOC=yes
@@ -9404,7 +7930,7 @@ fi
 AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
 AC_MSG_RESULT([$BUILDTXTDOC])
 
-AC_MSG_CHECKING([Whether to build PDF documentation])
+AC_MSG_CHECKING([whether to build PDF documentation])
 if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
    test x$BUILD_PDFDOC != xno; then
 	BUILDPDFDOC=yes
@@ -9412,7 +7938,7 @@ fi
 AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
 AC_MSG_RESULT([$BUILDPDFDOC])
 
-AC_MSG_CHECKING([Whether to build PostScript documentation])
+AC_MSG_CHECKING([whether to build PostScript documentation])
 if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
    test x$BUILD_PSDOC != xno; then
 	BUILDPSDOC=yes
@@ -9420,7 +7946,7 @@ fi
 AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
 AC_MSG_RESULT([$BUILDPSDOC])
 
-AC_MSG_CHECKING([Whether to build HTML documentation])
+AC_MSG_CHECKING([whether to build HTML documentation])
 if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
    test x$BUILD_HTMLDOC != xno; then
 	BUILDHTMLDOC=yes
@@ -9439,6 +7965,490 @@ AC_SUBST(MAKE_PDF)
 AC_SUBST(MAKE_HTML)
 ]) # XORG_CHECK_DOCBOOK
 
+# XORG_WITH_XMLTO([MIN-VERSION])
+# ----------------
+# Minimum version: 1.5.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-xmlto option, it allows maximum flexibilty in making decisions
+# as whether or not to use the xmlto package.
+#
+# Interface to module:
+# HAVE_XMLTO: 	used in makefiles to conditionally generate documentation
+# XMLTO:	returns the path of the xmlto program found
+#		returns the path set by the user in the environment
+# --with-xmlto:	'yes' user instructs the module to use xmlto
+#		'no' user instructs the module not to use xmlto
+#
+# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_XMLTO],[
+AC_ARG_VAR([XMLTO], [Path to xmlto command])
+AC_ARG_WITH(xmlto,
+	AS_HELP_STRING([--with-xmlto],
+	   [Use xmlto to regenerate documentation (default: yes, if installed)]),
+	   [use_xmlto=$withval], [use_xmlto=auto])
+
+if test "x$use_xmlto" = x"auto"; then
+   AC_PATH_PROG([XMLTO], [xmlto])
+   if test "x$XMLTO" = "x"; then
+        AC_MSG_WARN([xmlto not found - documentation targets will be skipped])
+	have_xmlto=no
+   else
+        have_xmlto=yes
+   fi
+elif test "x$use_xmlto" = x"yes" ; then
+   AC_PATH_PROG([XMLTO], [xmlto])
+   if test "x$XMLTO" = "x"; then
+        AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH])
+   fi
+   have_xmlto=yes
+elif test "x$use_xmlto" = x"no" ; then
+   if test "x$XMLTO" != "x"; then
+      AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified])
+   fi
+   have_xmlto=no
+else
+   AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
+fi
+m4_ifval([$1],
+[if test "$have_xmlto" = yes; then
+    # scrape the xmlto version
+    AC_MSG_CHECKING([the xmlto version])
+    xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
+    AC_MSG_RESULT([$xmlto_version])
+    AS_VERSION_COMPARE([$xmlto_version], [$1],
+        [if test "x$use_xmlto" = xauto; then
+            AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed])
+            have_xmlto=no
+        else
+            AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
+        fi])
+fi])
+AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
+]) # XORG_WITH_XMLTO
+
+# XORG_WITH_ASCIIDOC([MIN-VERSION])
+# ----------------
+# Minimum version: 1.5.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-asciidoc option, it allows maximum flexibilty in making decisions
+# as whether or not to use the asciidoc package.
+#
+# Interface to module:
+# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
+# ASCIIDOC:	 returns the path of the asciidoc program found
+#		 returns the path set by the user in the environment
+# --with-asciidoc: 'yes' user instructs the module to use asciidoc
+#		  'no' user instructs the module not to use asciidoc
+#
+# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_ASCIIDOC],[
+AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
+AC_ARG_WITH(asciidoc,
+	AS_HELP_STRING([--with-asciidoc],
+	   [Use asciidoc to regenerate documentation (default: yes, if installed)]),
+	   [use_asciidoc=$withval], [use_asciidoc=auto])
+
+if test "x$use_asciidoc" = x"auto"; then
+   AC_PATH_PROG([ASCIIDOC], [asciidoc])
+   if test "x$ASCIIDOC" = "x"; then
+        AC_MSG_WARN([asciidoc not found - documentation targets will be skipped])
+	have_asciidoc=no
+   else
+        have_asciidoc=yes
+   fi
+elif test "x$use_asciidoc" = x"yes" ; then
+   AC_PATH_PROG([ASCIIDOC], [asciidoc])
+   if test "x$ASCIIDOC" = "x"; then
+        AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH])
+   fi
+   have_asciidoc=yes
+elif test "x$use_asciidoc" = x"no" ; then
+   if test "x$ASCIIDOC" != "x"; then
+      AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified])
+   fi
+   have_asciidoc=no
+else
+   AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no'])
+fi
+m4_ifval([$1],
+[if test "$have_asciidoc" = yes; then
+    # scrape the asciidoc version
+    AC_MSG_CHECKING([the asciidoc version])
+    asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2`
+    AC_MSG_RESULT([$asciidoc_version])
+    AS_VERSION_COMPARE([$asciidoc_version], [$1],
+        [if test "x$use_asciidoc" = xauto; then
+            AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed])
+            have_asciidoc=no
+        else
+            AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed])
+        fi])
+fi])
+AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
+]) # XORG_WITH_ASCIIDOC
+
+# XORG_WITH_DOXYGEN([MIN-VERSION])
+# --------------------------------
+# Minimum version: 1.5.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-doxygen option, it allows maximum flexibilty in making decisions
+# as whether or not to use the doxygen package.
+#
+# Interface to module:
+# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
+# DOXYGEN:	 returns the path of the doxygen program found
+#		 returns the path set by the user in the environment
+# --with-doxygen: 'yes' user instructs the module to use doxygen
+#		  'no' user instructs the module not to use doxygen
+#
+# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_DOXYGEN],[
+AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+AC_ARG_WITH(doxygen,
+	AS_HELP_STRING([--with-doxygen],
+	   [Use doxygen to regenerate documentation (default: yes, if installed)]),
+	   [use_doxygen=$withval], [use_doxygen=auto])
+
+if test "x$use_doxygen" = x"auto"; then
+   AC_PATH_PROG([DOXYGEN], [doxygen])
+   if test "x$DOXYGEN" = "x"; then
+        AC_MSG_WARN([doxygen not found - documentation targets will be skipped])
+	have_doxygen=no
+   else
+        have_doxygen=yes
+   fi
+elif test "x$use_doxygen" = x"yes" ; then
+   AC_PATH_PROG([DOXYGEN], [doxygen])
+   if test "x$DOXYGEN" = "x"; then
+        AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH])
+   fi
+   have_doxygen=yes
+elif test "x$use_doxygen" = x"no" ; then
+   if test "x$DOXYGEN" != "x"; then
+      AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified])
+   fi
+   have_doxygen=no
+else
+   AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no'])
+fi
+m4_ifval([$1],
+[if test "$have_doxygen" = yes; then
+    # scrape the doxygen version
+    AC_MSG_CHECKING([the doxygen version])
+    doxygen_version=`$DOXYGEN --version 2>/dev/null`
+    AC_MSG_RESULT([$doxygen_version])
+    AS_VERSION_COMPARE([$doxygen_version], [$1],
+        [if test "x$use_doxygen" = xauto; then
+            AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed])
+            have_doxygen=no
+        else
+            AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
+        fi])
+fi])
+AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
+]) # XORG_WITH_DOXYGEN
+
+# XORG_WITH_GROFF
+# ----------------
+# Minimum version: 1.6.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-groff option, it allows maximum flexibilty in making decisions
+# as whether or not to use the groff package.
+#
+# Interface to module:
+# HAVE_GROFF:	 used in makefiles to conditionally generate documentation
+# HAVE_GROFF_MM: the memorandum macros (-mm) package
+# HAVE_GROFF_MS: the -ms macros package
+# GROFF:	 returns the path of the groff program found
+#		 returns the path set by the user in the environment
+# --with-groff:	 'yes' user instructs the module to use groff
+#		 'no' user instructs the module not to use groff
+#
+# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
+#
+# OS and distros often splits groff in a basic and full package, the former
+# having the groff program and the later having devices, fonts and macros
+# Checking for the groff executable is not enough.
+#
+# If macros are missing, we cannot assume that groff is useless, so we don't
+# unset HAVE_GROFF or GROFF env variables.
+# HAVE_GROFF_?? can never be true while HAVE_GROFF is false.
+#
+AC_DEFUN([XORG_WITH_GROFF],[
+AC_ARG_VAR([GROFF], [Path to groff command])
+AC_ARG_WITH(groff,
+	AS_HELP_STRING([--with-groff],
+	   [Use groff to regenerate documentation (default: yes, if installed)]),
+	   [use_groff=$withval], [use_groff=auto])
+
+if test "x$use_groff" = x"auto"; then
+   AC_PATH_PROG([GROFF], [groff])
+   if test "x$GROFF" = "x"; then
+        AC_MSG_WARN([groff not found - documentation targets will be skipped])
+	have_groff=no
+   else
+        have_groff=yes
+   fi
+elif test "x$use_groff" = x"yes" ; then
+   AC_PATH_PROG([GROFF], [groff])
+   if test "x$GROFF" = "x"; then
+        AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH])
+   fi
+   have_groff=yes
+elif test "x$use_groff" = x"no" ; then
+   if test "x$GROFF" != "x"; then
+      AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified])
+   fi
+   have_groff=no
+else
+   AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
+fi
+# We have groff, test for the presence of the macro packages
+if test "x$have_groff" = x"yes"; then
+    AC_MSG_CHECKING([for ${GROFF} -ms macros])
+    if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then
+        groff_ms_works=yes
+    else
+        groff_ms_works=no
+    fi
+    AC_MSG_RESULT([$groff_ms_works])
+    AC_MSG_CHECKING([for ${GROFF} -mm macros])
+    if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then
+        groff_mm_works=yes
+    else
+        groff_mm_works=no
+    fi
+    AC_MSG_RESULT([$groff_mm_works])
+fi
+AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
+AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
+AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
+]) # XORG_WITH_GROFF
+
+# XORG_WITH_FOP
+# ----------------
+# Minimum version: 1.6.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-fop option, it allows maximum flexibilty in making decisions
+# as whether or not to use the fop package.
+#
+# Interface to module:
+# HAVE_FOP: 	used in makefiles to conditionally generate documentation
+# FOP:	 	returns the path of the fop program found
+#		returns the path set by the user in the environment
+# --with-fop: 	'yes' user instructs the module to use fop
+#		'no' user instructs the module not to use fop
+#
+# If the user sets the value of FOP, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_FOP],[
+AC_ARG_VAR([FOP], [Path to fop command])
+AC_ARG_WITH(fop,
+	AS_HELP_STRING([--with-fop],
+	   [Use fop to regenerate documentation (default: yes, if installed)]),
+	   [use_fop=$withval], [use_fop=auto])
+
+if test "x$use_fop" = x"auto"; then
+   AC_PATH_PROG([FOP], [fop])
+   if test "x$FOP" = "x"; then
+        AC_MSG_WARN([fop not found - documentation targets will be skipped])
+	have_fop=no
+   else
+        have_fop=yes
+   fi
+elif test "x$use_fop" = x"yes" ; then
+   AC_PATH_PROG([FOP], [fop])
+   if test "x$FOP" = "x"; then
+        AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH])
+   fi
+   have_fop=yes
+elif test "x$use_fop" = x"no" ; then
+   if test "x$FOP" != "x"; then
+      AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified])
+   fi
+   have_fop=no
+else
+   AC_MSG_ERROR([--with-fop expects 'yes' or 'no'])
+fi
+AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
+]) # XORG_WITH_FOP
+
+# XORG_WITH_PS2PDF
+# ----------------
+# Minimum version: 1.6.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
+# as whether or not to use the ps2pdf package.
+#
+# Interface to module:
+# HAVE_PS2PDF: 	used in makefiles to conditionally generate documentation
+# PS2PDF:	returns the path of the ps2pdf program found
+#		returns the path set by the user in the environment
+# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf
+#		 'no' user instructs the module not to use ps2pdf
+#
+# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_PS2PDF],[
+AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
+AC_ARG_WITH(ps2pdf,
+	AS_HELP_STRING([--with-ps2pdf],
+	   [Use ps2pdf to regenerate documentation (default: yes, if installed)]),
+	   [use_ps2pdf=$withval], [use_ps2pdf=auto])
+
+if test "x$use_ps2pdf" = x"auto"; then
+   AC_PATH_PROG([PS2PDF], [ps2pdf])
+   if test "x$PS2PDF" = "x"; then
+        AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped])
+	have_ps2pdf=no
+   else
+        have_ps2pdf=yes
+   fi
+elif test "x$use_ps2pdf" = x"yes" ; then
+   AC_PATH_PROG([PS2PDF], [ps2pdf])
+   if test "x$PS2PDF" = "x"; then
+        AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH])
+   fi
+   have_ps2pdf=yes
+elif test "x$use_ps2pdf" = x"no" ; then
+   if test "x$PS2PDF" != "x"; then
+      AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified])
+   fi
+   have_ps2pdf=no
+else
+   AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no'])
+fi
+AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
+]) # XORG_WITH_PS2PDF
+
+# XORG_ENABLE_DOCS (enable_docs=yes)
+# ----------------
+# Minimum version: 1.6.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a builder to skip all
+# documentation targets except traditional man pages.
+# Combined with the specific tool checking macros XORG_WITH_*, it provides
+# maximum flexibilty in controlling documentation building.
+# Refer to:
+# XORG_WITH_XMLTO         --with-xmlto
+# XORG_WITH_ASCIIDOC      --with-asciidoc
+# XORG_WITH_DOXYGEN       --with-doxygen
+# XORG_WITH_FOP           --with-fop
+# XORG_WITH_GROFF         --with-groff
+# XORG_WITH_PS2PDF        --with-ps2pdf
+#
+# Interface to module:
+# ENABLE_DOCS: 	  used in makefiles to conditionally generate documentation
+# --enable-docs: 'yes' user instructs the module to generate docs
+#		 'no' user instructs the module not to generate docs
+# parm1:	specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_DOCS],[
+default=$1
+if test "x$default" = x ; then
+  default="yes"
+fi
+AC_ARG_ENABLE(docs,
+	AS_HELP_STRING([--enable-docs],
+	   [Enable building the documentation (default: yes)]),
+	   [build_docs=$enableval], [build_docs=$default])
+AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
+AC_MSG_CHECKING([whether to build documentation])
+AC_MSG_RESULT([$build_docs])
+]) # XORG_ENABLE_DOCS
+
+# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes)
+# ----------------
+# Minimum version: 1.6.0
+#
+# This macro enables a builder to skip all developer documentation.
+# Combined with the specific tool checking macros XORG_WITH_*, it provides
+# maximum flexibilty in controlling documentation building.
+# Refer to:
+# XORG_WITH_XMLTO         --with-xmlto
+# XORG_WITH_ASCIIDOC      --with-asciidoc
+# XORG_WITH_DOXYGEN       --with-doxygen
+# XORG_WITH_FOP           --with-fop
+# XORG_WITH_GROFF         --with-groff
+# XORG_WITH_PS2PDF        --with-ps2pdf
+#
+# Interface to module:
+# ENABLE_DEVEL_DOCS:	used in makefiles to conditionally generate developer docs
+# --enable-devel-docs:	'yes' user instructs the module to generate developer docs
+#			'no' user instructs the module not to generate developer docs
+# parm1:		specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
+devel_default=$1
+if test "x$devel_default" = x ; then
+  devel_default="yes"
+fi
+AC_ARG_ENABLE(devel-docs,
+	AS_HELP_STRING([--enable-devel-docs],
+	   [Enable building the developer documentation (default: yes)]),
+	   [build_devel_docs=$enableval], [build_devel_docs=$devel_default])
+AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
+AC_MSG_CHECKING([whether to build developer documentation])
+AC_MSG_RESULT([$build_devel_docs])
+]) # XORG_ENABLE_DEVEL_DOCS
+
+# XORG_ENABLE_SPECS (enable_specs=yes)
+# ----------------
+# Minimum version: 1.6.0
+#
+# This macro enables a builder to skip all functional specification targets.
+# Combined with the specific tool checking macros XORG_WITH_*, it provides
+# maximum flexibilty in controlling documentation building.
+# Refer to:
+# XORG_WITH_XMLTO         --with-xmlto
+# XORG_WITH_ASCIIDOC      --with-asciidoc
+# XORG_WITH_DOXYGEN       --with-doxygen
+# XORG_WITH_FOP           --with-fop
+# XORG_WITH_GROFF         --with-groff
+# XORG_WITH_PS2PDF        --with-ps2pdf
+#
+# Interface to module:
+# ENABLE_SPECS:		used in makefiles to conditionally generate specs
+# --enable-specs:	'yes' user instructs the module to generate specs
+#			'no' user instructs the module not to generate specs
+# parm1:		specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_SPECS],[
+spec_default=$1
+if test "x$spec_default" = x ; then
+  spec_default="yes"
+fi
+AC_ARG_ENABLE(specs,
+	AS_HELP_STRING([--enable-specs],
+	   [Enable building the specs (default: yes)]),
+	   [build_specs=$enableval], [build_specs=$spec_default])
+AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
+AC_MSG_CHECKING([whether to build functional specifications])
+AC_MSG_RESULT([$build_specs])
+]) # XORG_ENABLE_SPECS
+
 # XORG_CHECK_MALLOC_ZERO
 # ----------------------
 # Minimum version: 1.0.0
@@ -9448,7 +8458,7 @@ AC_SUBST(MAKE_HTML)
 # their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
 AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
 AC_ARG_ENABLE(malloc0returnsnull,
-	AC_HELP_STRING([--enable-malloc0returnsnull],
+	AS_HELP_STRING([--enable-malloc0returnsnull],
 		       [malloc(0) returns NULL (default: auto)]),
 	[MALLOC_ZERO_RETURNS_NULL=$enableval],
 	[MALLOC_ZERO_RETURNS_NULL=auto])
@@ -9468,7 +8478,8 @@ main() {
     exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
 }],
 		[MALLOC_ZERO_RETURNS_NULL=yes],
-		[MALLOC_ZERO_RETURNS_NULL=no])
+		[MALLOC_ZERO_RETURNS_NULL=no],
+		[MALLOC_ZERO_RETURNS_NULL=yes])
 fi
 AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
 
@@ -9500,7 +8511,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
 AC_DEFUN([XORG_WITH_LINT],[
 
 # Allow checking code with lint, sparse, etc.
-AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
+AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
 		[Use a lint-style source code checker (default: disabled)])],
 		[use_lint=$withval], [use_lint=no])
 if test "x$use_lint" = "xyes" ; then
@@ -9541,7 +8552,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno
 AC_DEFUN([XORG_LINT_LIBRARY],[
 AC_REQUIRE([XORG_WITH_LINT])
 # Build lint "library" for more indepth checks of programs calling this library
-AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
+AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
 	[Create lint library (default: disabled)])],
 	[make_lint_lib=$enableval], [make_lint_lib=no])
 if test "x$make_lint_lib" != "xno" ; then
@@ -9570,8 +8581,8 @@ AC_REQUIRE([AC_PROG_CC])
 if  test "x$GCC" = xyes ; then
     CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
 -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
--Wbad-function-cast"
-    case `gcc -dumpversion` in
+-Wbad-function-cast -Wformat=2"
+    case `$CC -dumpversion` in
     3.4.* | 4.*)
 	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
 	;;
@@ -9584,6 +8595,69 @@ else
 fi
 AC_SUBST(CWARNFLAGS)
 ]) # XORG_CWARNFLAGS
+
+# XORG_STRICT_OPTION
+# -----------------------
+# Minimum version: 1.3.0
+#
+# Add configure option to enable strict compilation
+AC_DEFUN([XORG_STRICT_OPTION], [
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_CWARNFLAGS])
+
+AC_ARG_ENABLE(strict-compilation,
+			  AS_HELP_STRING([--enable-strict-compilation],
+			  [Enable all warnings from compiler and make them errors (default: disabled)]),
+			  [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$STRICT_COMPILE" = "xyes"; then
+	AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+	AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
+	if test "x$GCC" = xyes ; then
+		STRICT_CFLAGS="-pedantic -Werror"
+	elif test "x$SUNCC" = "xyes"; then
+		STRICT_CFLAGS="-errwarn"
+    elif test "x$INTELCC" = "xyes"; then
+		STRICT_CFLAGS="-Werror"
+	fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+AC_SUBST([CWARNFLAGS])
+]) # XORG_STRICT_OPTION
+
+# XORG_DEFAULT_OPTIONS
+# --------------------
+# Minimum version: 1.3.0
+#
+# Defines default options for X.Org modules.
+#
+AC_DEFUN([XORG_DEFAULT_OPTIONS], [
+XORG_CWARNFLAGS
+XORG_STRICT_OPTION
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_INSTALL
+XORG_MANPAGE_SECTIONS
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+    [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+]) # XORG_DEFAULT_OPTIONS
+
+# XORG_INSTALL()
+# ----------------
+# Minimum version: 1.4.0
+#
+# Defines the variable INSTALL_CMD as the command to copy
+# INSTALL from $prefix/share/util-macros.
+#
+AC_DEFUN([XORG_INSTALL], [
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
+INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
+mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
+echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+AC_SUBST([INSTALL_CMD])
+]) # XORG_INSTALL
 dnl Copyright 2005 Red Hat, Inc
 dnl
 dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -9618,7 +8692,7 @@ dnl
  
 AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_ARG_WITH(release-version,
-			AC_HELP_STRING([--with-release-version=STRING],
+			AS_HELP_STRING([--with-release-version=STRING],
 				[Use release version string in package name]),
 			[RELEASE_VERSION="$withval"],
 			[RELEASE_VERSION=""])
@@ -9653,14 +8727,61 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 # Defines the variable CHANGELOG_CMD as the command to generate
 # ChangeLog from git.
 #
-# Arrange that distcleancheck ignores ChangeLog left over by distclean.
 #
 AC_DEFUN([XORG_CHANGELOG], [
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
-mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
+mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
+|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
 echo 'git directory not found: installing possibly empty changelog.' >&2)"
 AC_SUBST([CHANGELOG_CMD])
-AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
 ]) # XORG_CHANGELOG
 
-m4_include([acinclude.m4])
+dnl Copyright 2005 Red Hat, Inc
+dnl 
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl 
+
+# XORG_DRIVER_CHECK_EXT()
+# --------------------------
+# Checks for the $1 define in xorg-server.h (from the sdk).  If it
+# is defined, then add $1 to $REQUIRED_MODULES.
+
+AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include "xorg-server.h"
+#if !defined $1
+#error $1 not defined
+#endif
+		]])],
+		[_EXT_CHECK=yes],
+		[_EXT_CHECK=no])
+	CFLAGS="$SAVE_CFLAGS"
+	AC_MSG_CHECKING([if $1 is defined])
+	AC_MSG_RESULT([$_EXT_CHECK])
+	if test "$_EXT_CHECK" != no; then
+		REQUIRED_MODULES="$REQUIRED_MODULES $2"
+	fi
+])
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/AUTHORS new/xsrc/external/mit/xf86-video-intel/dist/AUTHORS
--- old/xsrc/external/mit/xf86-video-intel/dist/AUTHORS	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/AUTHORS	2011-02-08 11:14:00.000000000 +0100
@@ -22,6 +22,7 @@ Julien Cristau
 Ma Ling
 Bryce Harrington
 Daniel Stone
+Robert Lowery
 Kaleb Keithley
 Paulo Cesar Pereira de Andrade
 Eamon Walsh
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/autogen.sh new/xsrc/external/mit/xf86-video-intel/dist/autogen.sh
--- old/xsrc/external/mit/xf86-video-intel/dist/autogen.sh	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/autogen.sh	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/config.guess new/xsrc/external/mit/xf86-video-intel/dist/config.guess
--- old/xsrc/external/mit/xf86-video-intel/dist/config.guess	2008-08-02 07:12:26.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/config.guess	2011-02-08 11:14:00.000000000 +0100
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2005-07-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +55,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,7 +106,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -161,7 +160,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -208,11 +206,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -330,7 +325,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+    i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -532,7 +527,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -769,19 +764,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW*:*)
+    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -791,18 +779,9 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -815,7 +794,7 @@ EOF
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -836,16 +815,6 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
@@ -882,11 +851,7 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -905,16 +870,9 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@@ -958,15 +916,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1009,7 +961,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	#ifdef __INTEL_COMPILER
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -1019,11 +971,7 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1225,15 +1173,6 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1243,6 +1182,7 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1321,9 +1261,6 @@ EOF
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1484,9 +1421,9 @@ This script, last modified $timestamp, h
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/config.h.in new/xsrc/external/mit/xf86-video-intel/dist/config.h.in
--- old/xsrc/external/mit/xf86-video-intel/dist/config.h.in	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/config.h.in	2011-02-08 11:14:00.000000000 +0100
@@ -8,9 +8,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* have new FreeShadow API */
-#undef HAVE_FREE_SHADOW
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -44,9 +41,11 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
+/* xextproto 7.1 available */
+#undef HAVE_XEXTPROTO_71
+
+/* Assume KMS support */
+#undef KMS_ONLY
 
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
@@ -78,9 +77,6 @@
 /* Patch version of this package */
 #undef PACKAGE_VERSION_PATCHLEVEL
 
-/* Building against server 1.5 */
-#undef SERVER_1_5
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
@@ -95,9 +91,3 @@
 
 /* Enable developmental DRI driver support */
 #undef XF86DRI_DEVEL
-
-/* DRM kernel modesetting */
-#undef XF86DRM_MODE
-
-/* X server has built-in mode code */
-#undef XMODES
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/config.sub new/xsrc/external/mit/xf86-video-intel/dist/config.sub
--- old/xsrc/external/mit/xf86-video-intel/dist/config.sub	2008-08-02 07:12:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/config.sub	2011-02-08 11:14:00.000000000 +0100
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +71,8 @@ Report bugs and patches to <config-patch
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,9 +119,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -173,10 +171,6 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -193,10 +187,6 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241,16 +231,15 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -268,27 +257,28 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| mt \
+	| ms1 \
 	| msp430 \
-	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
+	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -296,9 +286,6 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -318,18 +305,18 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
+	| avr-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -349,33 +336,30 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| mt-* \
+	| ms1-* \
 	| msp430-* \
-	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
+	m32c-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -447,14 +431,6 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -487,8 +463,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
-		basic_machine=cr16-unknown
+	cr16c)
+		basic_machine=cr16c-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -680,14 +656,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -703,10 +671,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -732,9 +696,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -833,14 +794,6 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -850,12 +803,6 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -912,10 +859,6 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -942,10 +885,6 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -957,9 +896,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1049,10 +985,6 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1169,7 +1101,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1242,23 +1174,21 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1410,12 +1340,6 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1425,9 +1349,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1453,9 +1377,6 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
-		os=-elf
-		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/configure new/xsrc/external/mit/xf86-video-intel/dist/configure
--- old/xsrc/external/mit/xf86-video-intel/dist/configure	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/configure	2011-02-08 11:14:00.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xf86-video-intel 2.7.1.
+# Generated by GNU Autoconf 2.62 for xf86-video-intel 2.9.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -577,22 +577,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
+case X$ECHO in
 X*--fallback-echo)
   # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
   ;;
 esac
 
-ECHO=${lt_ECHO-echo}
+echo=${ECHO-echo}
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X$1" = X--fallback-echo; then
   # Avoid inline document here, it may be left over
   :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
   :
 else
   # Restart under the correct shell.
@@ -602,9 +602,9 @@ fi
 if test "X$1" = X--fallback-echo; then
   # used as fallback echo
   shift
-  cat <<_LT_EOF
+  cat <<EOF
 $*
-_LT_EOF
+EOF
   exit 0
 fi
 
@@ -612,116 +612,121 @@ fi
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
 
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
 
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
     IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
 
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
 	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
 
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
 	  fi
-        fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "$0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
       fi
     fi
   fi
 fi
+fi
 
 # Copy echo and quote the copy suitably for passing to libtool from
 # the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
 
 
 
 
+tagnames=${tagnames+${tagnames},}CXX
+
+tagnames=${tagnames+${tagnames},}F77
+
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -745,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-intel'
 PACKAGE_TARNAME='xf86-video-intel'
-PACKAGE_VERSION='2.7.1'
-PACKAGE_STRING='xf86-video-intel 2.7.1'
+PACKAGE_VERSION='2.9.1'
+PACKAGE_STRING='xf86-video-intel 2.9.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -786,220 +791,219 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-MAKE_HTML
-MAKE_PDF
-MAKE_PS
-MAKE_TEXT
-BUILD_PDFDOC_FALSE
-BUILD_PDFDOC_TRUE
-BUILD_LINUXDOC_FALSE
-BUILD_LINUXDOC_TRUE
-PS2PDF
-LINUXDOC
-ADMIN_MAN_DIR
-DRIVER_MAN_DIR
-MISC_MAN_DIR
-FILE_MAN_DIR
-LIB_MAN_DIR
-APP_MAN_DIR
-ADMIN_MAN_SUFFIX
-DRIVER_MAN_SUFFIX
-MISC_MAN_SUFFIX
-FILE_MAN_SUFFIX
-LIB_MAN_SUFFIX
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+CPP
+GREP
+EGREP
+CWARNFLAGS
+CHANGELOG_CMD
+PKG_CONFIG
+INSTALL_CMD
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
 APP_MAN_SUFFIX
-DRIVER_NAME
-moduledir
-WARN_CFLAGS
-XVMC_FALSE
-XVMC_TRUE
-XEXT_LIBS
+LIB_MAN_SUFFIX
+FILE_MAN_SUFFIX
+MISC_MAN_SUFFIX
+DRIVER_MAN_SUFFIX
+ADMIN_MAN_SUFFIX
+APP_MAN_DIR
+LIB_MAN_DIR
+FILE_MAN_DIR
+MISC_MAN_DIR
+DRIVER_MAN_DIR
+ADMIN_MAN_DIR
+AM_DEFAULT_VERBOSITY
+SED
+LN_S
+ECHO
+AR
+RANLIB
+DSYMUTIL
+NMEDIT
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXDEPMODE
+am__fastdepCXX_TRUE
+am__fastdepCXX_FALSE
+CXXCPP
+F77
+FFLAGS
+ac_ct_F77
+LIBTOOL
+GEN4ASM_CFLAGS
+GEN4ASM_LIBS
+HAVE_GEN4ASM_TRUE
+HAVE_GEN4ASM_FALSE
+XORG_CFLAGS
+XORG_LIBS
+DRM_CFLAGS
+DRM_LIBS
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS
 XEXT_CFLAGS
-XVMCLIB_LIBS
-XVMCLIB_CFLAGS
-VIDEO_DEBUG_FALSE
-VIDEO_DEBUG_TRUE
-DRM_MODE_LIBS
-DRM_MODE_CFLAGS
-DRI_LIBS
-DRI_CFLAGS
-DRI_FALSE
+XEXT_LIBS
+HAVE_XEXTPROTO_71_TRUE
+HAVE_XEXTPROTO_71_FALSE
 DRI_TRUE
-DRM_LIBS
+DRI_FALSE
+DRI_CFLAGS
+DRI_LIBS
+VIDEO_DEBUG_TRUE
+VIDEO_DEBUG_FALSE
+XVMCLIB_CFLAGS
+XVMCLIB_LIBS
+XVMC_TRUE
+XVMC_FALSE
+KMS_ONLY_TRUE
+KMS_ONLY_FALSE
+DRIVER_NAME
+moduledir
+LINUXDOC
+PS2PDF
+BUILD_LINUXDOC_TRUE
+BUILD_LINUXDOC_FALSE
+BUILD_PDFDOC_TRUE
+BUILD_PDFDOC_FALSE
+MAKE_TEXT
+MAKE_PS
+MAKE_PDF
+MAKE_HTML
+LIBOBJS
+LTLIBOBJS'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+enable_dependency_tracking
+enable_strict_compilation
+with_release_version
+enable_static
+enable_shared
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+with_xorg_module_dir
+enable_dri
+enable_video_debug
+enable_xvmc
+enable_kms_only
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+PKG_CONFIG
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+F77
+FFLAGS
+GEN4ASM_CFLAGS
+GEN4ASM_LIBS
+XORG_CFLAGS
+XORG_LIBS
 DRM_CFLAGS
-XMODES_CFLAGS
-XMODES_FALSE
-XMODES_TRUE
-LIBPCIACCESS_FALSE
-LIBPCIACCESS_TRUE
-XSERVER_LIBPCIACCESS_FALSE
-XSERVER_LIBPCIACCESS_TRUE
-PCIACCESS_LIBS
-PCIACCESS_CFLAGS
-SERVER_1_5_LIBS
-SERVER_1_5_CFLAGS
-XORG_LIBS
-XORG_CFLAGS
-PKG_CONFIG
-HAVE_GEN4ASM_FALSE
-HAVE_GEN4ASM_TRUE
-gen4asm
-LTCXXCOMPILE
-LTCOMPILE
-DOLT_BASH
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-lt_ECHO
-RANLIB
-AR
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_maintainer_mode
-enable_static
-enable_shared
-with_pic
-enable_fast_install
-enable_dependency_tracking
-with_gnu_ld
-enable_libtool_lock
-with_xorg_module_dir
-enable_dri
-enable_video_debug
-with_xserver_source
-enable_xvmc
-with_release_version
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-PKG_CONFIG
-XORG_CFLAGS
-XORG_LIBS
-SERVER_1_5_CFLAGS
-SERVER_1_5_LIBS
+DRM_LIBS
 PCIACCESS_CFLAGS
 PCIACCESS_LIBS
-DRM_CFLAGS
-DRM_LIBS
+XEXT_CFLAGS
+XEXT_LIBS
 DRI_CFLAGS
 DRI_LIBS
-DRM_MODE_CFLAGS
-DRM_MODE_LIBS
 XVMCLIB_CFLAGS
-XVMCLIB_LIBS
-XEXT_CFLAGS
-XEXT_LIBS'
+XVMCLIB_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1422,9 +1426,9 @@ fi
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
    { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1477,7 +1481,7 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
@@ -1552,7 +1556,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-intel 2.7.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-intel 2.9.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1623,7 +1627,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-intel 2.7.1:";;
+     short | recursive ) echo "Configuration of xf86-video-intel 2.9.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1633,30 +1637,33 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-strict-compilation
+                          Enable all warnings from compiler and make them
+                          errors (default: disabled)
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-dri           Disable DRI support [default=auto]
   --enable-video-debug    Enable video debugging support [default=no]
-  --disable-xvmc          Disable XvMC support [default=auto]
+  --disable-xvmc          Disable XvMC support [default=yes]
+  --enable-kms-only       Assume KMS support [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-release-version=STRING
+                          Use release version string in package name
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-tags[=TAGS]      include additional configurations [automatic]
   --with-xorg-module-dir=DIR
                           Default xorg module directory
                           [default=$libdir/xorg/modules]
-  --with-xserver-source=XSERVER_SOURCE
-                          Path to X server source tree
-  --with-release-version=STRING
-                          Use release version string in package name
 
 Some influential environment variables:
   CC          C compiler command
@@ -1668,30 +1675,31 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+  F77         Fortran 77 compiler command
+  FFLAGS      Fortran 77 compiler flags
+  GEN4ASM_CFLAGS
+              C compiler flags for GEN4ASM, overriding pkg-config
+  GEN4ASM_LIBS
+              linker flags for GEN4ASM, overriding pkg-config
   XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
   XORG_LIBS   linker flags for XORG, overriding pkg-config
-  SERVER_1_5_CFLAGS
-              C compiler flags for SERVER_1_5, overriding pkg-config
-  SERVER_1_5_LIBS
-              linker flags for SERVER_1_5, overriding pkg-config
+  DRM_CFLAGS  C compiler flags for DRM, overriding pkg-config
+  DRM_LIBS    linker flags for DRM, overriding pkg-config
   PCIACCESS_CFLAGS
               C compiler flags for PCIACCESS, overriding pkg-config
   PCIACCESS_LIBS
               linker flags for PCIACCESS, overriding pkg-config
-  DRM_CFLAGS  C compiler flags for DRM, overriding pkg-config
-  DRM_LIBS    linker flags for DRM, overriding pkg-config
+  XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
+  XEXT_LIBS   linker flags for XEXT, overriding pkg-config
   DRI_CFLAGS  C compiler flags for DRI, overriding pkg-config
   DRI_LIBS    linker flags for DRI, overriding pkg-config
-  DRM_MODE_CFLAGS
-              C compiler flags for DRM_MODE, overriding pkg-config
-  DRM_MODE_LIBS
-              linker flags for DRM_MODE, overriding pkg-config
   XVMCLIB_CFLAGS
               C compiler flags for XVMCLIB, overriding pkg-config
   XVMCLIB_LIBS
               linker flags for XVMCLIB, overriding pkg-config
-  XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
-  XEXT_LIBS   linker flags for XEXT, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1759,8 +1767,8 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-intel configure 2.7.1
-generated by GNU Autoconf 2.63
+xf86-video-intel configure 2.9.1
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1773,8 +1781,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-intel $as_me 2.7.1, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by xf86-video-intel $as_me 2.9.1, which was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1897,8 +1905,8 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2101,8 +2109,6 @@ $as_echo "$as_me:   current value: \`$ac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
   { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
@@ -2177,8 +2183,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
 
 
 
-am__api_version='1.10'
-
+am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2272,51 +2277,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2340,53 +2300,38 @@ else
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
   else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
+    mkdir_p='$(SHELL) $(install_sh) -d'
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2470,16 +2415,12 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 $as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
-  fi
 fi
 
 # test whether we have cygpath
@@ -2494,7 +2435,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-intel'
- VERSION='2.7.1'
+ VERSION='2.9.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2522,7 +2463,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2611,8 +2552,12 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2622,7 +2567,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2648,7 +2593,9 @@ fi
 
   { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
+
+
+if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -2660,200 +2607,74 @@ fi
 
 
 
-# Checks for programs.
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=no
-fi
-
-
-
-
-
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
 
 
 
 
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
 
 
 
 
+DEPDIR="${am__leading_dot}deps"
 
+ac_config_commands="$ac_config_commands depfiles"
 
 
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
 
 
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
 
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking;
+fi
 
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
 if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2862,6 +2683,7 @@ else
 fi
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2949,8 +2771,12 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3149,8 +2975,12 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3160,13 +2990,11 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -3296,13 +3124,11 @@ if test -z "$ac_file"; then
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
@@ -3330,15 +3156,13 @@ $as_echo "$ac_try_echo") >&5
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
     fi
   fi
 fi
@@ -3381,13 +3205,11 @@ for ac_file in conftest.exe conftest con
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
@@ -3441,13 +3263,11 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -3862,7 +3682,6 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3892,7 +3711,9 @@ fi
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
- if
+
+
+if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3903,94 +3724,246 @@ else
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
-  ac_cv_path_SED=$SED
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  # Broken: fails on valid input.
+continue
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
 
+rm -f conftest.err conftest.$ac_ext
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
   ac_path_GREP_found=false
@@ -4121,201 +4094,185 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
-      $ac_path_FGREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
 else
-  ac_cv_path_FGREP=$FGREP
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-   fi
+	ac_cv_header_stdc=no
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
+fi
 
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
 
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
 else
-  with_gnu_ld=no
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then
-  $as_echo_n "(cached) " >&6
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
 else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
 
+fi
 
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 
 
@@ -4323,82 +4280,296 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
 fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+   { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c99=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4406,43 +4577,42 @@ done
 done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-    test -n "$DUMPBIN" && break
-  done
 fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4450,399 +4620,467 @@ done
 done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
-    DUMPBIN=$ac_ct_DUMPBIN
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
 fi
-test -z "$NM" && NM=nm
-
-
-
-
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
 
+fi
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4500: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:4503: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:4506: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
 fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-    i=0
-  teststring="ABCD"
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
 
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
 
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
+if  test "x$GCC" = xyes ; then
+    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast -Wformat=2"
+    case `$CC -dumpversion` in
+    3.4.* | 4.*)
+	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+	;;
+    esac
+else
+    { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+  (void) __SUNPRO_C;
+#endif
 
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl___SUNPRO_C=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_have_decl___SUNPRO_C=no
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+  SUNCC="yes"
 else
-  { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+  SUNCC="no"
 fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
 
+    if test "x$SUNCC" = "xyes"; then
+	CWARNFLAGS="-v"
+    fi
+fi
 
 
 
 
 
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
 
 
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
+# Check whether --enable-strict-compilation was given.
+if test "${enable_strict_compilation+set}" = set; then
+  enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
 else
-  lt_unset=false
+  STRICT_COMPILE=no
 fi
 
+if test "x$STRICT_COMPILE" = "xyes"; then
+	{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+  (void) __SUNPRO_C;
+#endif
 
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl___SUNPRO_C=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_have_decl___SUNPRO_C=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+  SUNCC="yes"
+else
+  SUNCC="no"
+fi
 
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5
+$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; }
+if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __INTEL_COMPILER
+  (void) __INTEL_COMPILER;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl___INTEL_COMPILER=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl___INTEL_COMPILER=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5
+$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; }
+if test $ac_cv_have_decl___INTEL_COMPILER = yes; then
+  INTELCC="yes"
+else
+  INTELCC="no"
+fi
+
+	if test "x$GCC" = xyes ; then
+		STRICT_CFLAGS="-pedantic -Werror"
+	elif test "x$SUNCC" = "xyes"; then
+		STRICT_CFLAGS="-errwarn"
+    elif test "x$INTELCC" = "xyes"; then
+		STRICT_CFLAGS="-Werror"
+	fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+
+
 
 
+# Check whether --with-release-version was given.
+if test "${with_release_version+set}" = set; then
+  withval=$with_release_version; RELEASE_VERSION="$withval"
+else
+  RELEASE_VERSION=""
+fi
 
+	if test "x$RELEASE_VERSION" != "x"; then
+		PACKAGE="$PACKAGE-$RELEASE_VERSION"
+		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+		{ $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
+$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
+	fi
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
 
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+	if test "x$PVM" = "x"; then
+		PVM="0"
+	fi
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
 
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+	if test "x$PVP" = "x"; then
+		PVP="0"
+	fi
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
+
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
+mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
+|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+
+
+
+
+macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
+INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
+mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
+echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+
+
+
+
+
+if test x$APP_MAN_SUFFIX = x    ; then
+    APP_MAN_SUFFIX=1
 fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+if test x$APP_MAN_DIR = x    ; then
+    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
 fi
 
+if test x$LIB_MAN_SUFFIX = x    ; then
+    LIB_MAN_SUFFIX=3
+fi
+if test x$LIB_MAN_DIR = x    ; then
+    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+fi
 
+if test x$FILE_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	FILE_MAN_SUFFIX=4  ;;
+	*)		FILE_MAN_SUFFIX=5  ;;
+    esac
+fi
+if test x$FILE_MAN_DIR = x    ; then
+    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
 fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
+if test x$MISC_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	MISC_MAN_SUFFIX=5  ;;
+	*)		MISC_MAN_SUFFIX=7  ;;
+    esac
 fi
+if test x$MISC_MAN_DIR = x    ; then
+    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
 fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+
+if test x$DRIVER_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+	*)		DRIVER_MAN_SUFFIX=4  ;;
+    esac
+fi
+if test x$DRIVER_MAN_DIR = x    ; then
+    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
 fi
 
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
+if test x$ADMIN_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
+	*)		ADMIN_MAN_SUFFIX=8  ;;
+    esac
+fi
+if test x$ADMIN_MAN_DIR = x    ; then
+    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
 fi
 
-test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
@@ -4852,568 +5090,535 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
 
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
 
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
 
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
 
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
 
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
+AM_DEFAULT_VERBOSITY=1
 
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
 
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
 
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+# Checks for programs.
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
       ;;
     esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
+else
+  enable_static=no
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
 
 
 
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
 
 
+# Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${lt_cv_path_SED+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
+  # Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
 done
 IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
 
 fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
+SED=$lt_cv_path_SED
 
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
 
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  with_gnu_ld=no
 fi
 
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  AR="$ac_cv_prog_AR"
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
 fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
   fi
-done
-done
-IFS=$as_save_IFS
-
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+NM="$lt_cv_path_NM"
+
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
 
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
 
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
   else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
+  ;;
 
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  ;;
 
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
 
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
 
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
 
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
 
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
 
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 
 
@@ -5427,257 +5632,6 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:$LINENO: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
   enableval=$enable_libtool_lock;
@@ -5697,101 +5651,101 @@ ia64-*-hpux*)
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5712 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
+  echo '#line 5666 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+    *32-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
     esac
   fi
   rm -rf conftest*
@@ -5886,7 +5840,7 @@ sparc*-*solaris*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
       *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
 	fi
 	;;
@@ -5896,23 +5850,184 @@ sparc*-*solaris*)
   fi
   rm -rf conftest*
   ;;
+
+
 esac
 
 need_locks="$enable_libtool_lock"
 
 
-  case $host_os in
-    rhapsody* | darwin*)
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
     if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5921,7 +6036,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5931,28 +6046,32 @@ IFS=$as_save_IFS
 
 fi
 fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+    test -n "$CXX" && break
+  done
 fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5961,7 +6080,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5971,463 +6090,227 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
+    CXX=$ac_ct_CXX
   fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
   fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
 fi
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
 else
-  NMEDIT="$ac_cv_prog_NMEDIT"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
+  GXX=
 fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+int
+main ()
+{
 
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat >conftest.$ac_ext <<_ACEOF
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6442,111 +6325,207 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  lt_cv_ld_exported_symbols_list=yes
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	lt_cv_ld_exported_symbols_list=no
+
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
@@ -6568,7 +6547,7 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
@@ -6606,7 +6585,7 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   # Broken: success on invalid input.
@@ -6630,17 +6609,17 @@ if $ac_preproc_ok; then
 fi
 
     done
-    ac_cv_prog_CPP=$CPP
+    ac_cv_prog_CXXCPP=$CXXCPP
 
 fi
-  CPP=$ac_cv_prog_CPP
+  CXXCPP=$ac_cv_prog_CXXCPP
 else
-  ac_cv_prog_CPP=$CPP
+  ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
@@ -6675,7 +6654,7 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
@@ -6713,7 +6692,7 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   # Broken: success on invalid input.
@@ -6735,228 +6714,186 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_F77+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
+  if test -n "$F77"; then
+  ac_cv_prog_F77="$F77" # Let the user override the test.
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-	ac_cv_header_stdc=no
+fi
+fi
+F77=$ac_cv_prog_F77
+if test -n "$F77"; then
+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
+    test -n "$F77" && break
+  done
+fi
+if test -z "$F77"; then
+  ac_ct_F77=$F77
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_F77"; then
+  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_F77="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+fi
+fi
+ac_ct_F77=$ac_cv_prog_ac_ct_F77
+if test -n "$ac_ct_F77"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
 else
-  ac_cv_header_stdc=no
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f conftest*
 
-fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+  test -n "$ac_ct_F77" && break
+done
 
+  if test "x$ac_ct_F77" = x; then
+    F77=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    F77=$ac_ct_F77
+  fi
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+rm -f a.out
 
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+# If we don't use `.F' as extension, the preprocessor is not run on the
+# input file.  (Note that this only needs to work for GNU compilers.)
+ac_save_ext=$ac_ext
+ac_ext=F
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
+      program main
+#ifndef __GNUC__
+       choke me
+#endif
 
-#include <$ac_header>
+      end
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -6973,53 +6910,37 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
+  ac_compiler_gnu=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_Header=no"
+	ac_compiler_gnu=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
+ac_ext=$ac_save_ext
+ac_test_FFLAGS=${FFLAGS+set}
+ac_save_FFLAGS=$FFLAGS
+FFLAGS=
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
+if test "${ac_cv_prog_f77_g+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
+  FFLAGS=-g
+cat >conftest.$ac_ext <<_ACEOF
+      program main
 
-#include <$ac_header>
+      end
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -7036,176 +6957,388 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
+  ac_cv_prog_f77_g=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_Header=no"
+	ac_cv_prog_f77_g=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
 fi
-
-done
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
+if test "$ac_test_FFLAGS" = set; then
+  FFLAGS=$ac_save_FFLAGS
+elif test $ac_cv_prog_f77_g = yes; then
+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+    FFLAGS="-g -O2"
+  else
+    FFLAGS="-g"
+  fi
 else
-  enable_shared=yes
+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+    FFLAGS="-O2"
+  else
+    FFLAGS=
+  fi
 fi
 
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
-  withval=$with_pic; pic_mode="$withval"
+if test $ac_compiler_gnu = yes; then
+  G77=yes
 else
-  pic_mode=default
+  G77=
 fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
 
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
 
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
 
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
 
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
 
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
 
+fi
 
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
+fi
 
 
 
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
 
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDGIRSTW]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
 
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
 
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
 
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
+  # Check to see that the pipe works correctly.
+  pipe_works=no
 
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
 
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
 
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
 
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
 
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
 
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
 
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
 
+fi
 
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
 
 { $as_echo "$as_me:$LINENO: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
@@ -7230,26 +7363,6 @@ objdir=$lt_cv_objdir
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -7264,2151 +7377,2431 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+Xsed='sed -e 1s/^X//'
+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
 
 # Sed substitution to delay expansion of an escaped shell variable in a
 # double_quote_subst'ed string.
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
 # Sed substitution to avoid accidental globbing in evaled expressions
 no_glob_subst='s/\*/\\\*/g'
 
+# Constants:
+rm="rm -f"
+
 # Global variables:
-ofile=libtool
+default_ofile=libtool
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
-
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
 with_gnu_ld="$lt_cv_prog_gnu_ld"
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
 fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:$LINENO: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
 fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
   else
-    MAGIC_CMD=:
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
   fi
+else
+  AR="$ac_cv_prog_AR"
 fi
 
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
 
-if test -n "$compiler"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-lt_prog_compiler_no_builtin_flag=
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7535: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7539: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-    :
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
 fi
 
 
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
 
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
 
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
 
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
 
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
 
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
 
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
+EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
 
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
 
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
+EOF
+	  fi ;;
+	esac
       fi
-      ;;
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
 
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
+  else
+    MAGIC_CMD=:
+  fi
+fi
 
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
+  fi
+  ;;
+esac
 
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
 
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7874: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7878: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
 fi
-
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-    lt_prog_compiler_static=
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
 
-
-
-
-
-
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7979: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:7983: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8034: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:8038: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
   fi
 else
-  need_locks=no
+  NMEDIT="$ac_cv_prog_NMEDIT"
 fi
 
 
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	lt_cv_ld_exported_symbols_list=no
+fi
 
-  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$save_LDFLAGS"
 
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[0123])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[012]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
     ;;
-  linux* | k*bsd*-gnu)
-    link_all_deplibs=no
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
     ;;
   esac
 
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
 
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
+enable_dlopen=no
+enable_win32_dll=no
 
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval=$enable_libtool_lock;
+fi
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-_LT_EOF
-      fi
-      ;;
 
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+  withval=$with_pic; pic_mode="$withval"
+else
+  pic_mode=default
+fi
 
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
+test -z "$pic_mode" && pic_mode=default
 
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+# Use C for the default configuration in the libtool script
+tagname=
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
 
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
+# Source file extension for C test sources.
+ac_ext=c
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
 
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
 
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
 
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
 
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
 
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
 
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
 
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
 
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
+lt_prog_compiler_no_builtin_flag=
 
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
 
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+  ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:8289: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:8293: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $rm conftest*
 
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
 
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	link_all_deplibs=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
+fi
 
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
 
-int
-main ()
-{
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
 
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+      ;;
 
-fi
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
 
-fi
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
       fi
       ;;
 
-    amigaos*)
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
       case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
       esac
       ;;
 
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
+    *)
+      lt_prog_compiler_pic='-fPIC'
       ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic='-qnocommon'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+       esac
+       ;;
 
-    darwin* | rhapsody*)
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
 
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
 
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
 
-  else
-  ld_shlibs=no
-  fi
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
+      esac
       ;;
 
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
       ;;
 
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
       ;;
 
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
       ;;
 
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
       ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
       fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
       ;;
 
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
       ;;
 
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
 
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
+    *)
+      lt_prog_compiler_can_build_shared=no
       ;;
+    esac
+  fi
 
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat >conftest.$ac_ext <<_ACEOF
-int foo(void) {}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
 
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+  ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:8579: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:8583: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $rm conftest*
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
 
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
 
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
 
-    *nto* | *qnx*)
-      ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
 
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
 
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:8683: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:8687: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
 
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  enable_shared_with_static_runtimes=no
+  archive_cmds=
+  archive_expsym_cmds=
+  old_archive_From_new_cmds=
+  old_archive_from_expsyms_cmds=
+  export_dynamic_flag_spec=
+  whole_archive_flag_spec=
+  thread_safe_flag_spec=
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_direct=no
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  link_all_deplibs=unknown
+  hardcode_automatic=no
+  module_cmds=
+  module_expsym_cmds=
+  always_export_symbols=no
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
       else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
+  	whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
       fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
       ;;
 
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
+    amigaos*)
+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
       hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
       hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
 
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs=no
       ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	ld_shlibs=no
       fi
       ;;
 
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
+    interix[3-9]*)
+      hardcode_direct=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	ld_shlibs=no
       fi
       ;;
 
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
       ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
 
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<EOF 1>&2
 
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
 
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
       ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
-        cat conftest.err 1>&5
+	ld_shlibs=no
       fi
-      $RM conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
 
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
 
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
 
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
 
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  hardcode_direct=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L=yes
+  	  hardcode_libdir_flag_spec='-L$libdir'
+  	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
 
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
+       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec='$convenience'
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
 
+    amigaos*)
+      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
 
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
 
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
 
+    darwin* | rhapsody*)
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      archive_cmds_need_lc=no
+      hardcode_direct=no
+      hardcode_automatic=yes
+      hardcode_shlibpath_var=unsupported
+      whole_archive_flag_spec=''
+      link_all_deplibs=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs=no
+          ;;
+      esac
+    fi
+      ;;
 
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
 
+    freebsd1*)
+      ld_shlibs=no
+      ;;
 
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
 
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
 
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
 
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
 
+	hardcode_direct=yes
+	export_dynamic_flag_spec='${wl}-E'
 
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
 
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
 
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_libdir_flag_spec_ld='+b $libdir'
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  export_dynamic_flag_spec='${wl}-E'
 
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
 
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      link_all_deplibs=yes
+      ;;
 
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
 
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
 
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
 
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
 
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
 
+    solaris*)
+      no_undefined_flag=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
 
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
 
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
 
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
 
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
 
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
 
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
 
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
 
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+  fi
 
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
 
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
 
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
 
-  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
 if test "$GCC" = yes; then
   case $host_os in
@@ -9416,14 +9809,14 @@ if test "$GCC" = yes; then
     *) lt_awk_arg="/^libraries:/" ;;
   esac
   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
@@ -9437,7 +9830,7 @@ if test "$GCC" = yes; then
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -9457,23 +9850,10 @@ BEGIN {RS=" "; FS="/|\n";} {
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -9510,7 +9890,7 @@ aix[4-9]*)
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
 	:
       else
 	can_build_shared=no
@@ -9536,18 +9916,9 @@ aix[4-9]*)
   ;;
 
 amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -9570,28 +9941,25 @@ bsdi[45]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | mingw* | pw32*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  yes,cygwin* | yes,mingw* | yes,pw32*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $RM \$dlpath'
+       $rm \$dlpath'
     shlibpath_overrides_runpath=yes
 
     case $host_os in
@@ -9600,20 +9968,20 @@ cygwin* | mingw* | pw32* | cegcc*)
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    mingw* | cegcc*)
+    mingw*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
         # path with ; separators, and with drive letters. We can handle the
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
@@ -9637,7 +10005,7 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
@@ -9736,18 +10104,18 @@ hpux9* | hpux10* | hpux11*)
     fi
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
     shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
@@ -9824,64 +10192,6 @@ linux* | k*bsd*-gnu)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-  shlibpath_overrides_runpath=yes
-fi
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
@@ -9889,7 +10199,7 @@ rm -f core conftest.err conftest.$ac_obj
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -9902,23 +10212,11 @@ rm -f core conftest.err conftest.$ac_obj
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
@@ -9939,16 +10237,14 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-*nto* | *qnx*)
-  version_type=qnx
+nto-qnx*)
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
+  shlibpath_overrides_runpath=yes
   ;;
 
 openbsd*)
@@ -9957,13 +10253,13 @@ openbsd*)
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
       openbsd2.[89] | openbsd2.[89].*)
 	shlibpath_overrides_runpath=no
@@ -10035,6 +10331,7 @@ sysv4 | sysv4.3*)
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -10065,12 +10362,13 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   if test "$with_gnu_ld" = yes; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
@@ -10080,17 +10378,6 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
   sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10106,117 +10393,39 @@ esac
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+   test -n "$runpath_var" || \
+   test "X$hardcode_automatic" = "Xyes" ; then
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
+  # We can hardcode non-existant directories.
   if test "$hardcode_direct" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
      test "$hardcode_minus_L" != no; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
@@ -10232,8 +10441,7 @@ fi
 { $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
+if test "$hardcode_action" = relink; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
@@ -10242,12 +10450,37 @@ elif test "$shlibpath_overrides_runpath"
   enable_fast_install=needless
 fi
 
+striplib=
+old_striplib=
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+       ;;
+   *)
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
 
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
+if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -10262,15 +10495,15 @@ else
     lt_cv_dlopen_self=yes
     ;;
 
-  mingw* | pw32* | cegcc*)
+  mingw* | pw32*)
     lt_cv_dlopen="LoadLibrary"
     lt_cv_dlopen_libs=
-    ;;
+   ;;
 
   cygwin*)
     lt_cv_dlopen="dlopen"
     lt_cv_dlopen_libs=
-    ;;
+   ;;
 
   darwin*)
   # if libdl is installed we need to link against it
@@ -10339,7 +10572,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -10349,7 +10582,7 @@ else
 
 fi
 
-    ;;
+   ;;
 
   *)
     { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -10437,7 +10670,7 @@ rm -f core conftest.err conftest.$ac_obj
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 $as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
+if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
@@ -10505,7 +10738,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
@@ -10593,7 +10826,7 @@ rm -f core conftest.err conftest.$ac_obj
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 $as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
+if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -10661,7 +10894,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
@@ -10729,7 +10962,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
@@ -10797,7 +11030,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -10846,8 +11079,8 @@ else
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10850 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 11083 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10888,6 +11121,10 @@ else
 #  endif
 #endif
 
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
 void fnord() { int i=42;}
 int main ()
 {
@@ -10903,9 +11140,9 @@ int main ()
   else
     puts (dlerror ());
 
-  return status;
+    exit (status);
 }
-_LT_EOF
+EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
@@ -10942,8 +11179,8 @@ else
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10946 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 11183 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10984,6 +11221,10 @@ else
 #  endif
 #endif
 
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
 void fnord() { int i=42;}
 int main ()
 {
@@ -10999,9 +11240,9 @@ int main ()
   else
     puts (dlerror ());
 
-  return status;
+    exit (status);
 }
-_LT_EOF
+EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
@@ -11045,1469 +11286,1048 @@ $as_echo "$lt_cv_dlopen_self_static" >&6
 fi
 
 
+# Report which library types will actually be built
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+test "$can_build_shared" = "no" && enable_shared=no
 
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
 
+aix[4-9]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler \
+    CC \
+    LD \
+    lt_prog_compiler_wl \
+    lt_prog_compiler_pic \
+    lt_prog_compiler_static \
+    lt_prog_compiler_no_builtin_flag \
+    export_dynamic_flag_spec \
+    thread_safe_flag_spec \
+    whole_archive_flag_spec \
+    enable_shared_with_static_runtimes \
+    old_archive_cmds \
+    old_archive_from_new_cmds \
+    predep_objects \
+    postdep_objects \
+    predeps \
+    postdeps \
+    compiler_lib_search_path \
+    compiler_lib_search_dirs \
+    archive_cmds \
+    archive_expsym_cmds \
+    postinstall_cmds \
+    postuninstall_cmds \
+    old_archive_from_expsyms_cmds \
+    allow_undefined_flag \
+    no_undefined_flag \
+    export_symbols_cmds \
+    hardcode_libdir_flag_spec \
+    hardcode_libdir_flag_spec_ld \
+    hardcode_libdir_separator \
+    hardcode_automatic \
+    module_cmds \
+    module_expsym_cmds \
+    lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
+    exclude_expsyms \
+    include_expsyms; do
+
+    case $var in
+    old_archive_cmds | \
+    old_archive_from_new_cmds | \
+    archive_cmds | \
+    archive_expsym_cmds | \
+    module_cmds | \
+    module_expsym_cmds | \
+    old_archive_from_expsyms_cmds | \
+    export_symbols_cmds | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
 
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
 
+cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+$as_echo "$as_me: creating $ofile" >&6;}
 
+  cat <<__EOF__ >> "$cfgfile"
+#! $SHELL
 
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
+# A sed program that does not truncate output.
+SED=$lt_SED
 
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
 
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# The names of the tagged configurations supported by this script.
+available_tags=
 
+# ### BEGIN LIBTOOL CONFIG
 
-striplib=
-old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
 
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
 
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
 
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
 
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
 
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
+# A C compiler.
+LTCC=$lt_LTCC
 
-  # Report which library types will actually be built
-  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
 
-  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
+# A language-specific compiler.
+CC=$lt_compiler
 
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC
 
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+# An ERE matcher.
+EGREP=$lt_EGREP
 
-  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+# The linker used to build libraries.
+LD=$lt_LD
 
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
 
+# A BSD-compatible nm program.
+NM=$lt_NM
 
+# A symbol stripping program
+STRIP=$lt_STRIP
 
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
 
-CC="$lt_save_CC"
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
 
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
 
+# Used on cygwin: assembler.
+AS="$AS"
 
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
 
+# Object file suffix (normally "o").
+objext="$ac_objext"
 
+# Old archive suffix (normally "a").
+libext="$libext"
 
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
 
+# Executable file suffix (normally "").
+exeext="$exeext"
 
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+pic_mode=$pic_mode
 
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
-        ac_config_commands="$ac_config_commands libtool"
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
 
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
 
+# Do we need a version for libraries?
+need_version=$need_version
 
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
-# Only expand once:
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
 
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# dolt, a replacement for libtool
-# Josh Triplett <josh@freedesktop.org>
-# Extract the first word of "bash", so it can be a program name with args.
-set dummy bash; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DOLT_BASH+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $DOLT_BASH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DOLT_BASH="$DOLT_BASH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
 
-  ;;
-esac
-fi
-DOLT_BASH=$ac_cv_path_DOLT_BASH
-if test -n "$DOLT_BASH"; then
-  { $as_echo "$as_me:$LINENO: result: $DOLT_BASH" >&5
-$as_echo "$DOLT_BASH" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
 
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec
 
-{ $as_echo "$as_me:$LINENO: checking if libtool sucks" >&5
-$as_echo_n "checking if libtool sucks... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: yup, it does" >&5
-$as_echo "yup, it does" >&6; }
-{ $as_echo "$as_me:$LINENO: checking if dolt supports this host" >&5
-$as_echo_n "checking if dolt supports this host... " >&6; }
-dolt_supported=yes
-if test x$DOLT_BASH = x; then
-    dolt_supported=no
-fi
-if test x$GCC != xyes; then
-    dolt_supported=no
-fi
-case $host in
-i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*) ;;
-amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) ;;
-*) dolt_supported=no ;;
-esac
-if test x$dolt_supported = xno ; then
-    { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5
-$as_echo "no, falling back to libtool" >&6; }
-    LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
-    LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
-else
-    { $as_echo "$as_me:$LINENO: result: yes, replacing libtool" >&5
-$as_echo "yes, replacing libtool" >&6; }
-
-    cat <<__DOLTCOMPILE__EOF__ >doltcompile
-#!$DOLT_BASH
-__DOLTCOMPILE__EOF__
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-args=("$@")
-for ((arg=0; arg<${#args[@]}; arg++)) ; do
-    if test x"${args[$arg]}" = x-o ; then
-        objarg=$((arg+1))
-        break
-    fi
-done
-if test x$objarg = x ; then
-    echo 'Error: no -o on compiler command line' 1>&2
-    exit 1
-fi
-lo="${args[$objarg]}"
-obj="${lo%.lo}"
-if test x"$lo" = x"$obj" ; then
-    echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
-    exit 1
-fi
-objbase="${obj##*/}"
-__DOLTCOMPILE__EOF__
-
-    if test x$enable_shared = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-libobjdir="${obj%$objbase}.libs"
-if test ! -d "$libobjdir" ; then
-    mkdir_out="$(mkdir "$libobjdir" 2>&1)"
-    mkdir_ret=$?
-    if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
-	echo "$mkdir_out" 1>&2
-        exit $mkdir_ret
-    fi
-fi
-pic_object="$libobjdir/$objbase.o"
-args[$objarg]="$pic_object"
-"${args[@]}" -fPIC -DPIC || exit $?
-__DOLTCOMPILE__EOF__
-    fi
-
-    if test x$enable_static = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-non_pic_object="$obj.o"
-args[$objarg]="$non_pic_object"
-__DOLTCOMPILE__EOF__
-        if test x$enable_shared = xyes; then
-            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args[@]}" >/dev/null 2>&1 || exit $?
-__DOLTCOMPILE__EOF__
-        else
-            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args[@]}" || exit $?
-__DOLTCOMPILE__EOF__
-        fi
-    fi
+# Library versioning type.
+version_type=$version_type
 
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-{
-echo "# $lo - a libtool object file"
-echo "# Generated by doltcompile, not libtool"
-__DOLTCOMPILE__EOF__
-
-    if test x$enable_shared = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "pic_object='$pic_object'"
-__DOLTCOMPILE__EOF__
-    else
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo pic_object=none
-__DOLTCOMPILE__EOF__
-    fi
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-    if test x$enable_static = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "non_pic_object='$non_pic_object'"
-__DOLTCOMPILE__EOF__
-    else
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo non_pic_object=none
-__DOLTCOMPILE__EOF__
-    fi
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
 
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-} > "$lo"
-__DOLTCOMPILE__EOF__
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-    chmod +x doltcompile
-    LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
-    LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
-fi
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
-# end dolt
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
 
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
 
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
 
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
 
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
 
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
 
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
 
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
 
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
 
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
 
-  test -n "$ac_ct_CC" && break
-done
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
 
-fi
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L
 
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
 
-	ac_compiler_gnu=no
-fi
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
 
-int
-main ()
-{
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
 
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-int
-main ()
-{
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# ### END LIBTOOL CONFIG
 
-int
-main ()
-{
+__EOF__
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
 
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
 fi
+EOF
+    ;;
+  esac
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
 
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+CC="$lt_save_CC"
 
 
+# Check whether --with-tags was given.
+if test "${with_tags+set}" = set; then
+  withval=$with_tags; tagnames="$withval"
 fi
 
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
 
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+  fi
 
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+    else
+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+    fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
 
-depcc="$CC"   am_compiler_list=
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
+    "") ;;
+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+    esac
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
 
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
+	  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
 
+# Source file extension for C++ test sources.
+ac_ext=cpp
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
 
-int
-main ()
-{
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
 
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-fi
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
 
-# Extract the first word of "intel-gen4asm", so it can be a program name with args.
-set dummy intel-gen4asm; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_gen4asm+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$gen4asm"; then
-  ac_cv_prog_gen4asm="$gen4asm" # Let the user override the test.
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_gen4asm="yes"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+compiler_CXX=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
 done
-IFS=$as_save_IFS
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
-  test -z "$ac_cv_prog_gen4asm" && ac_cv_prog_gen4asm="no"
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+else
+  lt_prog_compiler_no_builtin_flag_CXX=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
-gen4asm=$ac_cv_prog_gen4asm
-if test -n "$gen4asm"; then
-  { $as_echo "$as_me:$LINENO: result: $gen4asm" >&5
-$as_echo "$gen4asm" >&6; }
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
- if test x$gen4asm = xyes; then
-  HAVE_GEN4ASM_TRUE=
-  HAVE_GEN4ASM_FALSE='#'
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec_CXX=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
 else
-  HAVE_GEN4ASM_TRUE='#'
-  HAVE_GEN4ASM_FALSE=
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
 fi
 
+# PORTME: fill in a description of your system's C++ link characteristics
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ld_shlibs_CXX=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  aix[4-9]*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
 
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
 
-for ac_header in sys/mman.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    archive_cmds_CXX=''
+    hardcode_direct_CXX=yes
+    hardcode_libdir_separator_CXX=':'
+    link_all_deplibs_CXX=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[012]|aix4.[012].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  :
+	else
+	  # We have old collect2
+	  hardcode_direct_CXX=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L_CXX=yes
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  hardcode_libdir_separator_CXX=
+	fi
+	;;
+      esac
+      shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    always_export_symbols_CXX=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      allow_undefined_flag_CXX='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_header_compiler=no
+
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
+      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-for ac_func in mprotect
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	allow_undefined_flag_CXX="-z nodefs"
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
 
 int
 main ()
 {
-return $ac_func ();
+
   ;
   return 0;
 }
@@ -12527,4696 +12347,12498 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval "$as_ac_var=yes"
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
+
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-# Check whether --with-xorg-module-dir was given.
-if test "${with_xorg_module_dir+set}" = set; then
-  withval=$with_xorg_module_dir; moduledir="$withval"
-else
-  moduledir="$libdir/xorg/modules"
-fi
-
-
-# Check whether --enable-dri was given.
-if test "${enable_dri+set}" = set; then
-  enableval=$enable_dri; DRI="$enableval"
-else
-  DRI=auto
-fi
-
-
-# Check whether --enable-video-debug was given.
-if test "${enable_video_debug+set}" = set; then
-  enableval=$enable_video_debug; VIDEO_DEBUG="$enableval"
-else
-  VIDEO_DEBUG=no
-fi
-
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
+	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	no_undefined_flag_CXX=' ${wl}-bernotok'
+	allow_undefined_flag_CXX=' ${wl}-berok'
+	# Exported symbols can be pulled into shared objects from archives
+	whole_archive_flag_spec_CXX='$convenience'
+	archive_cmds_need_lc_CXX=yes
+	# This is similar to how AIX traditionally builds its shared libraries.
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
 
-# Check whether --with-xserver-source was given.
-if test "${with_xserver_source+set}" = set; then
-  withval=$with_xserver_source;  XSERVER_SOURCE="$withval"
-else
-   XSERVER_SOURCE=""
-fi
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      allow_undefined_flag_CXX=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      ld_shlibs_CXX=no
+    fi
+    ;;
 
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
 
-# Check whether --enable-xvmc was given.
-if test "${enable_xvmc+set}" = set; then
-  enableval=$enable_xvmc; XVMC="$enableval"
-else
-  XVMC=auto
-fi
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+    # as there is no search path for DLLs.
+    hardcode_libdir_flag_spec_CXX='-L$libdir'
+    allow_undefined_flag_CXX=unsupported
+    always_export_symbols_CXX=no
+    enable_shared_with_static_runtimes_CXX=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      ld_shlibs_CXX=no
+    fi
+  ;;
+      darwin* | rhapsody*)
+      archive_cmds_need_lc_CXX=no
+      hardcode_direct_CXX=no
+      hardcode_automatic_CXX=yes
+      hardcode_shlibpath_var_CXX=unsupported
+      whole_archive_flag_spec_CXX=''
+      link_all_deplibs_CXX=yes
+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
+      output_verbose_link_cmd='echo'
+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+      fi
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_CXX=no
+          ;;
+      esac
+      fi
+        ;;
 
+  dgux*)
+    case $cc_basename in
+      ec++*)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      ghcx*)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  freebsd[12]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    ld_shlibs_CXX=no
+    ;;
+  freebsd-elf*)
+    archive_cmds_need_lc_CXX=no
+    ;;
+  freebsd* | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    ld_shlibs_CXX=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator_CXX=:
+    export_dynamic_flag_spec_CXX='${wl}-E'
+    hardcode_direct_CXX=yes
+    hardcode_minus_L_CXX=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      ld_shlibs_CXX=no
+      ;;
+    aCC*)
+      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_CXX=:
 
-# Checks for extensions
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
+      *)
+	export_dynamic_flag_spec_CXX='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      hardcode_direct_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      ;;
+    *)
+      hardcode_direct_CXX=yes
+      hardcode_minus_L_CXX=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
 
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    case $cc_basename in
+      CC*)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case $host_cpu in
+	    hppa*64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    *)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  interix[3-9]*)
+    hardcode_direct_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    export_dynamic_flag_spec_CXX='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC*)
+	# SGI C++
+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	  else
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
+	fi
+	link_all_deplibs_CXX=yes
+	;;
+    esac
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator_CXX=:
+    ;;
+  linux* | k*bsd*-gnu)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc*)
+	# Intel C++
+	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
+	archive_cmds_need_lc_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      pgCC* | pgcpp*)
+        # Portland Group C++ compiler
+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
+	# Compaq C++
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
-#include "xorg-server.h"
-#if !defined XINERAMA
-#error XINERAMA not defined
-#endif
+	runpath_var=LD_RUN_PATH
+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	hardcode_libdir_separator_CXX=:
 
-int
-main ()
-{
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      hardcode_libdir_flag_spec_CXX='-R$libdir'
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    ld_shlibs_CXX=no
+    ;;
+  openbsd*)
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
+    fi
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  _EXT_CHECK=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      cxx*)
+	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-	_EXT_CHECK=no
-fi
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      cxx*)
+	allow_undefined_flag_CXX=' -expect_unresolved \*'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	hardcode_libdir_separator_CXX=:
+
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$SAVE_CFLAGS"
-	{ $as_echo "$as_me:$LINENO: checking if XINERAMA is defined" >&5
-$as_echo_n "checking if XINERAMA is defined... " >&6; }
-	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
-$as_echo "$_EXT_CHECK" >&6; }
-	if test "$_EXT_CHECK" != no; then
-		REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto"
+	else
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
 	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      lcc*)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.2, 5.x and Centerline C++
+        archive_cmds_need_lc_CXX=yes
+	no_undefined_flag_CXX=' -zdefs'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	hardcode_libdir_flag_spec_CXX='-R$libdir'
+	hardcode_shlibpath_var_CXX=no
+	case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	    ;;
+	esac
+	link_all_deplibs_CXX=yes
 
+	output_verbose_link_cmd='echo'
 
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx*)
+	# Green Hills C++ Compiler
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
-#include "xorg-server.h"
-#if !defined RANDR
-#error RANDR not defined
-#endif
+	# The C++ compiler must be used to create the archive.
+	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
 
-int
-main ()
+	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
+	fi
+	;;
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+    no_undefined_flag_CXX='${wl}-z,text'
+    archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    no_undefined_flag_CXX='${wl}-z,text'
+    allow_undefined_flag_CXX='${wl}-z,nodefs'
+    archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    hardcode_libdir_separator_CXX=':'
+    link_all_deplibs_CXX=yes
+    export_dynamic_flag_spec_CXX='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    ld_shlibs_CXX=no
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+GCC_CXX="$GXX"
+LD_CXX="$LD"
+
+cat > conftest.$ac_ext <<EOF
+class Foo
 {
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  _EXT_CHECK=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  (exit $ac_status); }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
 
-	_EXT_CHECK=no
-fi
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$SAVE_CFLAGS"
-	{ $as_echo "$as_me:$LINENO: checking if RANDR is defined" >&5
-$as_echo_n "checking if RANDR is defined... " >&6; }
-	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
-$as_echo "$_EXT_CHECK" >&6; }
-	if test "$_EXT_CHECK" != no; then
-		REQUIRED_MODULES="$REQUIRED_MODULES randrproto"
-	fi
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       ;;
 
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
 
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
 
-#include "xorg-server.h"
-#if !defined RENDER
-#error RENDER not defined
-#endif
+    *) ;; # Ignore the rest.
 
-int
-main ()
-{
+    esac
+  done
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  _EXT_CHECK=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	_EXT_CHECK=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$SAVE_CFLAGS"
-	{ $as_echo "$as_me:$LINENO: checking if RENDER is defined" >&5
-$as_echo_n "checking if RENDER is defined... " >&6; }
-	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
-$as_echo "$_EXT_CHECK" >&6; }
-	if test "$_EXT_CHECK" != no; then
-		REQUIRED_MODULES="$REQUIRED_MODULES renderproto"
-	fi
-
-
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include "xorg-server.h"
-#if !defined XF86DRI
-#error XF86DRI not defined
-#endif
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  _EXT_CHECK=yes
+  # Clean up.
+  rm -f a.out a.exe
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	_EXT_CHECK=no
+  echo "libtool.m4: error: problem compiling CXX test program"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$SAVE_CFLAGS"
-	{ $as_echo "$as_me:$LINENO: checking if XF86DRI is defined" >&5
-$as_echo_n "checking if XF86DRI is defined... " >&6; }
-	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
-$as_echo "$_EXT_CHECK" >&6; }
-	if test "$_EXT_CHECK" != no; then
-		REQUIRED_MODULES="$REQUIRED_MODULES xextproto x11"
-	fi
-
-
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include "xorg-server.h"
-#if !defined DPMSExtension
-#error DPMSExtension not defined
-#endif
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  _EXT_CHECK=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$rm -f confest.$objext
 
-	_EXT_CHECK=no
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$SAVE_CFLAGS"
-	{ $as_echo "$as_me:$LINENO: checking if DPMSExtension is defined" >&5
-$as_echo_n "checking if DPMSExtension is defined... " >&6; }
-	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
-$as_echo "$_EXT_CHECK" >&6; }
-	if test "$_EXT_CHECK" != no; then
-		REQUIRED_MODULES="$REQUIRED_MODULES xextproto"
-	fi
-
-
-# Checks for pkg-config packages
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
   ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
   ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
 
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
 
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
   ;;
 esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
 
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
+lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
 
-fi
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XORG" >&5
-$as_echo_n "checking for XORG... " >&6; }
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XORG_CFLAGS"; then
-        pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XORG_LIBS"; then
-        pkg_cv_XORG_LIBS="$XORG_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           lt_prog_compiler_pic_CXX='-qnocommon'
+           lt_prog_compiler_wl_CXX='-Wl,'
+           ;;
+         esac
+       ;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  icpc* | ecpc*)
+	    # Intel C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  pkg_failed=yes
+  lt_cv_prog_compiler_pic_works_CXX=no
+  ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13592: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:13596: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $rm conftest*
+
 fi
-    fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
 else
-	pkg_failed=untried
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
 fi
 
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
 
-if test $pkg_failed = yes; then
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
 else
-        _pkg_short_errors_supported=no
+    lt_prog_compiler_static_CXX=
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
-        else
-	        XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XORG_PKG_ERRORS" >&5
-
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
-
-$XORG_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables XORG_CFLAGS
-and XORG_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
 
-$XORG_PKG_ERRORS
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XORG_CFLAGS
-and XORG_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XORG_CFLAGS
-and XORG_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:13700: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
-Alternatively, you may set the environment variables XORG_CFLAGS
-and XORG_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
 else
-	XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
-	XORG_LIBS=$pkg_cv_XORG_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
+  need_locks=no
 fi
 
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SERVER_1_5" >&5
-$as_echo_n "checking for SERVER_1_5... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SERVER_1_5_CFLAGS"; then
-        pkg_cv_SERVER_1_5_CFLAGS="$SERVER_1_5_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.5\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SERVER_1_5_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.5" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SERVER_1_5_LIBS"; then
-        pkg_cv_SERVER_1_5_LIBS="$SERVER_1_5_LIBS"
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
     else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.5\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SERVER_1_5_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.5" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
     fi
-else
-	pkg_failed=untried
-fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
 
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
 
-if test $pkg_failed = yes; then
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SERVER_1_5_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.5"`
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_CXX=no
         else
-	        SERVER_1_5_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.5"`
+	  archive_cmds_need_lc_CXX=yes
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SERVER_1_5_PKG_ERRORS" >&5
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-                SERVER_1_5=no
-elif test $pkg_failed = untried; then
-	SERVER_1_5=no
-else
-	SERVER_1_5_CFLAGS=$pkg_cv_SERVER_1_5_CFLAGS
-	SERVER_1_5_LIBS=$pkg_cv_SERVER_1_5_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	SERVER_1_5=yes
-fi
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
-if test "$SERVER_1_5" = yes; then
+need_lib_prefix=unknown
+hardcode_into_libs=no
 
-cat >>confdefs.h <<\_ACEOF
-#define SERVER_1_5 1
-_ACEOF
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
 
-fi
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
 
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-drm_cflags=$(pkg-config --cflags libdrm)
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
 
-# Checks for libraries.
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
 
-# Checks for header files.
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
 
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
 
-	ac_cv_header_stdc=no
-fi
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
 
-fi
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
 
-fi
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+freebsd1*)
+  dynamic_linker=no
+  ;;
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
 
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
 
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
 
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
 
-fi
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
 
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
 
-save_CFLAGS="$CFLAGS"
-CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
-CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
-{ $as_echo "$as_me:$LINENO: checking whether to include DRI support" >&5
-$as_echo_n "checking whether to include DRI support... " >&6; }
-if test x$DRI != xno; then
-        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
-$as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "${sdkdir}/dri.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  have_dri_h="yes"
-else
-  have_dri_h="no"
-fi
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
 
-        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/sarea.h" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for ${sdkdir}/sarea.h" >&5
-$as_echo_n "checking for ${sdkdir}/sarea.h... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "${sdkdir}/sarea.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  have_sarea_h="yes"
-else
-  have_sarea_h="no"
-fi
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
 
-        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dristruct.h" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for ${sdkdir}/dristruct.h" >&5
-$as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "${sdkdir}/dristruct.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  have_dristruct_h="yes"
-else
-  have_dristruct_h="no"
-fi
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
 
-fi
-{ $as_echo "$as_me:$LINENO: checking whether to include DRI support" >&5
-$as_echo_n "checking whether to include DRI support... " >&6; }
-if test x$DRI = xauto; then
-        if test "$have_dri_h" = yes -a \
-                "$have_sarea_h" = yes -a \
-                "$have_dristruct_h" = yes; then
-                DRI="yes"
-        else
-                DRI="no"
-        fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $DRI" >&5
-$as_echo "$DRI" >&6; }
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-{ $as_echo "$as_me:$LINENO: checking for xf86Modes.h" >&5
-$as_echo_n "checking for xf86Modes.h... " >&6; }
-if test "${ac_cv_header_xf86Modes_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "xorg-server.h"
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-#include <xf86Modes.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_xf86Modes_h=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
 
-	ac_cv_header_xf86Modes_h=no
-fi
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xf86Modes_h" >&5
-$as_echo "$ac_cv_header_xf86Modes_h" >&6; }
-if test "x$ac_cv_header_xf86Modes_h" = x""yes; then
-  XMODES=yes
-else
-  XMODES=no
-fi
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
 
-{ $as_echo "$as_me:$LINENO: checking whether XSERVER_LIBPCIACCESS is declared" >&5
-$as_echo_n "checking whether XSERVER_LIBPCIACCESS is declared... " >&6; }
-if test "${ac_cv_have_decl_XSERVER_LIBPCIACCESS+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "xorg-server.h"
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
 
-int
-main ()
-{
-#ifndef XSERVER_LIBPCIACCESS
-  (void) XSERVER_LIBPCIACCESS;
-#endif
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_XSERVER_LIBPCIACCESS=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
 
-	ac_cv_have_decl_XSERVER_LIBPCIACCESS=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&5
-$as_echo "$ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&6; }
-if test "x$ac_cv_have_decl_XSERVER_LIBPCIACCESS" = x""yes; then
-  XSERVER_LIBPCIACCESS=yes
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  XSERVER_LIBPCIACCESS=no
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
-CFLAGS="$save_CFLAGS"
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 
-if test x$XSERVER_LIBPCIACCESS = xyes; then
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5
-$as_echo_n "checking for PCIACCESS... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" || \
+   test -n "$runpath_var_CXX" || \
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PCIACCESS_CFLAGS"; then
-        pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10" 2>/dev/null`
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
 else
-  pkg_failed=yes
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
 fi
-    fi
-else
-	pkg_failed=untried
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test "$hardcode_action_CXX" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PCIACCESS_LIBS"; then
-        pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
 
 
-if test $pkg_failed = yes; then
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_CXX \
+    CC_CXX \
+    LD_CXX \
+    lt_prog_compiler_wl_CXX \
+    lt_prog_compiler_pic_CXX \
+    lt_prog_compiler_static_CXX \
+    lt_prog_compiler_no_builtin_flag_CXX \
+    export_dynamic_flag_spec_CXX \
+    thread_safe_flag_spec_CXX \
+    whole_archive_flag_spec_CXX \
+    enable_shared_with_static_runtimes_CXX \
+    old_archive_cmds_CXX \
+    old_archive_from_new_cmds_CXX \
+    predep_objects_CXX \
+    postdep_objects_CXX \
+    predeps_CXX \
+    postdeps_CXX \
+    compiler_lib_search_path_CXX \
+    compiler_lib_search_dirs_CXX \
+    archive_cmds_CXX \
+    archive_expsym_cmds_CXX \
+    postinstall_cmds_CXX \
+    postuninstall_cmds_CXX \
+    old_archive_from_expsyms_cmds_CXX \
+    allow_undefined_flag_CXX \
+    no_undefined_flag_CXX \
+    export_symbols_cmds_CXX \
+    hardcode_libdir_flag_spec_CXX \
+    hardcode_libdir_flag_spec_ld_CXX \
+    hardcode_libdir_separator_CXX \
+    hardcode_automatic_CXX \
+    module_cmds_CXX \
+    module_expsym_cmds_CXX \
+    lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
+    exclude_expsyms_CXX \
+    include_expsyms_CXX; do
+
+    case $var in
+    old_archive_cmds_CXX | \
+    old_archive_from_new_cmds_CXX | \
+    archive_cmds_CXX | \
+    archive_expsym_cmds_CXX | \
+    module_cmds_CXX | \
+    module_expsym_cmds_CXX | \
+    old_archive_from_expsyms_cmds_CXX | \
+    export_symbols_cmds_CXX | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10"`
-        else
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PCIACCESS_PKG_ERRORS" >&5
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.10) were not met:
+cfgfile="$ofile"
 
-$PCIACCESS_PKG_ERRORS
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-Alternatively, you may set the environment variables PCIACCESS_CFLAGS
-and PCIACCESS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (pciaccess >= 0.10) were not met:
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
 
-$PCIACCESS_PKG_ERRORS
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
-Alternatively, you may set the environment variables PCIACCESS_CFLAGS
-and PCIACCESS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
 
-Alternatively, you may set the environment variables PCIACCESS_CFLAGS
-and PCIACCESS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
 
-Alternatively, you may set the environment variables PCIACCESS_CFLAGS
-and PCIACCESS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-else
-	PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
-	PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-else
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5
-$as_echo_n "checking for PCIACCESS... " >&6; }
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PCIACCESS_CFLAGS"; then
-        pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PCIACCESS_LIBS"; then
-        pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
+# A C compiler.
+LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
 
-if test $pkg_failed = yes; then
+# A language-specific compiler.
+CC=$lt_compiler_CXX
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10"`
-        else
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PCIACCESS_PKG_ERRORS" >&5
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_CXX
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-                have_libpciaccess=no
-elif test $pkg_failed = untried; then
-	have_libpciaccess=no
-else
-	PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
-	PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_libpciaccess=yes
-fi
-fi
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-  XSERVER_LIBPCIACCESS_TRUE=
-  XSERVER_LIBPCIACCESS_FALSE='#'
-else
-  XSERVER_LIBPCIACCESS_TRUE='#'
-  XSERVER_LIBPCIACCESS_FALSE=
-fi
+# An ERE matcher.
+EGREP=$lt_EGREP
 
- if test "x$XSERVER_LIBPCIACCESS" = xyes -o "x$have_libpciaccess" = xyes; then
-  LIBPCIACCESS_TRUE=
-  LIBPCIACCESS_FALSE='#'
-else
-  LIBPCIACCESS_TRUE='#'
-  LIBPCIACCESS_FALSE=
-fi
+# The linker used to build libraries.
+LD=$lt_LD_CXX
 
- if test "x$XMODES" = xno; then
-  XMODES_TRUE=
-  XMODES_FALSE='#'
-else
-  XMODES_TRUE='#'
-  XMODES_FALSE=
-fi
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
 
+# A BSD-compatible nm program.
+NM=$lt_NM
 
-if test "x$XSERVER_SOURCE" = x; then
-	if test -d ../../xserver; then
-		XSERVER_SOURCE="`cd ../../xserver && pwd`"
-	fi
-fi
+# A symbol stripping program
+STRIP=$lt_STRIP
 
-if test -d "$XSERVER_SOURCE"; then
-	case "$XSERVER_SOURCE" in
-	/*)
-		;;
-	*)
-		XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`"
-		;;
-	esac
-	if test -f $srcdir/src/modes/xf86Modes.h; then
-		:
-	else
-		ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes
-	fi
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
 
-	if test -f $srcdir/src/parser/xf86Parser.h; then
-		:
-	else
-		ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser
-	fi
-fi
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
 
-if test "x$XMODES" = xyes; then
-	{ $as_echo "$as_me:$LINENO: X server has new mode code" >&5
-$as_echo "$as_me: X server has new mode code" >&6;}
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
 
-cat >>confdefs.h <<\_ACEOF
-#define XMODES 1
-_ACEOF
+# Used on cygwin: assembler.
+AS="$AS"
 
-	XMODES_CFLAGS=
-else
-	if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then
-		{ $as_echo "$as_me:$LINENO: X server is missing new mode code, using local copy" >&5
-$as_echo "$as_me: X server is missing new mode code, using local copy" >&6;}
-	else
-		{ { $as_echo "$as_me:$LINENO: error: Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source" >&5
-$as_echo "$as_me: error: Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-	XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser'
-fi
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
 
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+# Object file suffix (normally "o").
+objext="$ac_objext"
 
-{ $as_echo "$as_me:$LINENO: checking whether xf86RotateFreeShadow is declared" >&5
-$as_echo_n "checking whether xf86RotateFreeShadow is declared... " >&6; }
-if test "${ac_cv_have_decl_xf86RotateFreeShadow+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <xorg-server.h>
-	       #include <windowstr.h>
-	       #include <xf86Crtc.h>
+# Old archive suffix (normally "a").
+libext="$libext"
 
-int
-main ()
-{
-#ifndef xf86RotateFreeShadow
-  (void) xf86RotateFreeShadow;
-#endif
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_xf86RotateFreeShadow=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Executable file suffix (normally "").
+exeext="$exeext"
 
-	ac_cv_have_decl_xf86RotateFreeShadow=no
-fi
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+pic_mode=$pic_mode
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_xf86RotateFreeShadow" >&5
-$as_echo "$ac_cv_have_decl_xf86RotateFreeShadow" >&6; }
-if test "x$ac_cv_have_decl_xf86RotateFreeShadow" = x""yes; then
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FREE_SHADOW 1
-_ACEOF
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 
-fi
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
 
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
 
-CPPFLAGS="$SAVE_CPPFLAGS"
+# Do we need a version for libraries?
+need_version=$need_version
 
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
-WARN_CFLAGS=""
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
-if test "x$GCC" = "xyes"; then
-	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing"
-fi
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DRM" >&5
-$as_echo_n "checking for DRM... " >&6; }
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DRM_CFLAGS"; then
-        pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.6\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.6" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DRM_LIBS"; then
-        pkg_cv_DRM_LIBS="$DRM_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.6\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.6" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
 
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
 
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
 
-if test $pkg_failed = yes; then
+# Library versioning type.
+version_type=$version_type
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.4.6"`
-        else
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.4.6"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DRM_PKG_ERRORS" >&5
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libdrm >= 2.4.6) were not met:
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
 
-$DRM_PKG_ERRORS
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_CXX
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-Alternatively, you may set the environment variables DRM_CFLAGS
-and DRM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libdrm >= 2.4.6) were not met:
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
 
-$DRM_PKG_ERRORS
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
 
-Alternatively, you may set the environment variables DRM_CFLAGS
-and DRM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
 
-Alternatively, you may set the environment variables DRM_CFLAGS
-and DRM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_CXX
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_CXX
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_CXX
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 
-Alternatively, you may set the environment variables DRM_CFLAGS
-and DRM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-else
-	DRM_CFLAGS=$pkg_cv_DRM_CFLAGS
-	DRM_LIBS=$pkg_cv_DRM_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
- if test x$DRI = xyes; then
-  DRI_TRUE=
-  DRI_FALSE='#'
-else
-  DRI_TRUE='#'
-  DRI_FALSE=
-fi
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
 
-if test "$DRI" = yes; then
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DRI" >&5
-$as_echo_n "checking for DRI... " >&6; }
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DRI_CFLAGS"; then
-        pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xf86driproto glproto\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xf86driproto glproto") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "xf86driproto glproto" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DRI_LIBS"; then
-        pkg_cv_DRI_LIBS="$DRI_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xf86driproto glproto\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xf86driproto glproto") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "xf86driproto glproto" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
 
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
 
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-if test $pkg_failed = yes; then
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xf86driproto glproto"`
-        else
-	        DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xf86driproto glproto"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DRI_PKG_ERRORS" >&5
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xf86driproto glproto) were not met:
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
 
-$DRI_PKG_ERRORS
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-Alternatively, you may set the environment variables DRI_CFLAGS
-and DRI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (xf86driproto glproto) were not met:
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
 
-$DRI_PKG_ERRORS
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-Alternatively, you may set the environment variables DRI_CFLAGS
-and DRI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_CXX
 
-Alternatively, you may set the environment variables DRI_CFLAGS
-and DRI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
 
-Alternatively, you may set the environment variables DRI_CFLAGS
-and DRI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-else
-	DRI_CFLAGS=$pkg_cv_DRI_CFLAGS
-	DRI_LIBS=$pkg_cv_DRI_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-cat >>confdefs.h <<\_ACEOF
-#define XF86DRI 1
-_ACEOF
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
 
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
 
-cat >>confdefs.h <<\_ACEOF
-#define XF86DRI_DEVEL 1
-_ACEOF
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
 
-fi
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DRM_MODE" >&5
-$as_echo_n "checking for DRM_MODE... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DRM_MODE_CFLAGS"; then
-        pkg_cv_DRM_MODE_CFLAGS="$DRM_MODE_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.5\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DRM_MODE_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.5" 2>/dev/null`
 else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DRM_MODE_LIBS"; then
-        pkg_cv_DRM_MODE_LIBS="$DRM_MODE_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.5\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DRM_MODE_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.5" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        DRM_MODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.5"`
-        else
-	        DRM_MODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.5"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DRM_MODE_PKG_ERRORS" >&5
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-                DRM_MODE=no
-elif test $pkg_failed = untried; then
-	DRM_MODE=no
-else
-	DRM_MODE_CFLAGS=$pkg_cv_DRM_MODE_CFLAGS
-	DRM_MODE_LIBS=$pkg_cv_DRM_MODE_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	DRM_MODE=yes
-fi
-if test "x$DRM_MODE" = xyes; then
+	else
+	  tagname=""
+	fi
+	;;
 
-cat >>confdefs.h <<\_ACEOF
-#define XF86DRM_MODE 1
-_ACEOF
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
 
-fi
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+
+
+archive_cmds_need_lc_F77=no
+allow_undefined_flag_F77=
+always_export_symbols_F77=no
+archive_expsym_cmds_F77=
+export_dynamic_flag_spec_F77=
+hardcode_direct_F77=no
+hardcode_libdir_flag_spec_F77=
+hardcode_libdir_flag_spec_ld_F77=
+hardcode_libdir_separator_F77=
+hardcode_minus_L_F77=no
+hardcode_automatic_F77=no
+module_cmds_F77=
+module_expsym_cmds_F77=
+link_all_deplibs_F77=unknown
+old_archive_cmds_F77=$old_archive_cmds
+no_undefined_flag_F77=
+whole_archive_flag_spec_F77=
+enable_shared_with_static_runtimes_F77=no
 
- if test x$VIDEO_DEBUG = xyes; then
-  VIDEO_DEBUG_TRUE=
-  VIDEO_DEBUG_FALSE='#'
-else
-  VIDEO_DEBUG_TRUE='#'
-  VIDEO_DEBUG_FALSE=
-fi
+# Source file extension for f77 test sources.
+ac_ext=f
 
-if test "$VIDEO_DEBUG" = yes; then
+# Object file extension for compiled f77 test sources.
+objext=o
+objext_F77=$objext
 
-cat >>confdefs.h <<\_ACEOF
-#define VIDEO_DEBUG 1
-_ACEOF
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
-fi
+# Code to be used in simple link tests
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
-if test "$XVMC" = auto; then
-	XVMC="$DRI"
-fi
-if test "$XVMC" = yes && test "$DRI" = no; then
-	{ { $as_echo "$as_me:$LINENO: error: XvMC can't be enabled without DRI" >&5
-$as_echo "$as_me: error: XvMC can't be enabled without DRI" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test "$XVMC" = yes; then
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XVMCLIB" >&5
-$as_echo_n "checking for XVMCLIB... " >&6; }
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XVMCLIB_CFLAGS"; then
-        pkg_cv_XVMCLIB_CFLAGS="$XVMCLIB_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xvmc\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xvmc") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XVMCLIB_CFLAGS=`$PKG_CONFIG --cflags "xvmc" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XVMCLIB_LIBS"; then
-        pkg_cv_XVMCLIB_LIBS="$XVMCLIB_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xvmc\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xvmc") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XVMCLIB_LIBS=`$PKG_CONFIG --libs "xvmc" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
 
-if test $pkg_failed = yes; then
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xvmc"`
-        else
-	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xvmc"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XVMCLIB_PKG_ERRORS" >&5
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-                XVMC=no
-elif test $pkg_failed = untried; then
-	XVMC=no
-else
-	XVMCLIB_CFLAGS=$pkg_cv_XVMCLIB_CFLAGS
-	XVMCLIB_LIBS=$pkg_cv_XVMCLIB_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	XVMC=yes
-fi
 
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XEXT" >&5
-$as_echo_n "checking for XEXT... " >&6; }
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+compiler_F77=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XEXT_CFLAGS"; then
-        pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xext") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XEXT_CFLAGS=`$PKG_CONFIG --cflags "xext" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XEXT_LIBS"; then
-        pkg_cv_XEXT_LIBS="$XEXT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xext") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XEXT_LIBS=`$PKG_CONFIG --libs "xext" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
 
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+test "$can_build_shared" = "no" && enable_shared=no
 
-if test $pkg_failed = yes; then
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix[4-9]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xext"`
-        else
-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XEXT_PKG_ERRORS" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xext) were not met:
+GCC_F77="$G77"
+LD_F77="$LD"
 
-$XEXT_PKG_ERRORS
+lt_prog_compiler_wl_F77=
+lt_prog_compiler_pic_F77=
+lt_prog_compiler_static_F77=
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-Alternatively, you may set the environment variables XEXT_CFLAGS
-and XEXT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (xext) were not met:
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl_F77='-Wl,'
+    lt_prog_compiler_static_F77='-static'
 
-$XEXT_PKG_ERRORS
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_F77='-Bstatic'
+      fi
+      ;;
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+      ;;
 
-Alternatively, you may set the environment variables XEXT_CFLAGS
-and XEXT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
 
-Alternatively, you may set the environment variables XEXT_CFLAGS
-and XEXT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      ;;
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_F77='-fno-common'
+      ;;
 
-Alternatively, you may set the environment variables XEXT_CFLAGS
-and XEXT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-else
-	XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
-	XEXT_LIBS=$pkg_cv_XEXT_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-fi
-{ $as_echo "$as_me:$LINENO: checking whether to include XvMC support" >&5
-$as_echo_n "checking whether to include XvMC support... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $XVMC" >&5
-$as_echo "$XVMC" >&6; }
- if test x$XVMC = xyes; then
-  XVMC_TRUE=
-  XVMC_FALSE='#'
-else
-  XVMC_TRUE='#'
-  XVMC_FALSE=
-fi
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_F77=no
+      enable_shared=no
+      ;;
 
-if test "$XVMC" = yes; then
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_F77=-Kconform_pic
+      fi
+      ;;
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_XVMC 1
-_ACEOF
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_F77='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      lt_prog_compiler_pic_F77='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_F77='-Bstatic'
+      else
+	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_F77='-qnocommon'
+         lt_prog_compiler_wl_F77='-Wl,'
+         ;;
+       esac
+       ;;
 
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+      ;;
 
-fi
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_F77='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+      ;;
 
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
 
+    newsos6)
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
 
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-KPIC'
+	lt_prog_compiler_static_F77='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-fpic'
+	lt_prog_compiler_static_F77='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl_F77='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static_F77='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
 
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
 
-DRIVER_NAME=intel
+    solaris*)
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_F77='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_F77='-Wl,';;
+      esac
+      ;;
 
+    sunos4*)
+      lt_prog_compiler_wl_F77='-Qoption ld '
+      lt_prog_compiler_pic_F77='-PIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
 
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
 
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic_F77='-Kconform_pic'
+	lt_prog_compiler_static_F77='-Bstatic'
+      fi
+      ;;
 
-	XORG_MACROS_needed_version=1.1.3
-	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
-	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
-	{ $as_echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5
-$as_echo_n "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... " >&6; }
-	XORG_MACROS_version=1.2.1
-	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
-	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
-	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
-		{ { $as_echo "$as_me:$LINENO: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_needed_major}.x" >&5
-$as_echo "$as_me: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_needed_major}.x" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-	if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
-		{ { $as_echo "$as_me:$LINENO: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}.0 or newer" >&5
-$as_echo "$as_me: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}.0 or newer" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-	{ $as_echo "$as_me:$LINENO: result: yes, $XORG_MACROS_version" >&5
-$as_echo "yes, $XORG_MACROS_version" >&6; }
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
 
+    unicos*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
 
+    uts4*)
+      lt_prog_compiler_pic_F77='-pic'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
 
+    *)
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
+    esac
+  fi
 
-if test x$APP_MAN_SUFFIX = x    ; then
-    APP_MAN_SUFFIX=1
-fi
-if test x$APP_MAN_DIR = x    ; then
-    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
-fi
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
 
-if test x$LIB_MAN_SUFFIX = x    ; then
-    LIB_MAN_SUFFIX=3
-fi
-if test x$LIB_MAN_DIR = x    ; then
-    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
-fi
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_F77"; then
 
-if test x$FILE_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	FILE_MAN_SUFFIX=4  ;;
-	*)		FILE_MAN_SUFFIX=5  ;;
-    esac
-fi
-if test x$FILE_MAN_DIR = x    ; then
-    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
-fi
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_F77=no
+  ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_F77"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15279: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:15283: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_F77=yes
+     fi
+   fi
+   $rm conftest*
 
-if test x$MISC_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	MISC_MAN_SUFFIX=5  ;;
-	*)		MISC_MAN_SUFFIX=7  ;;
-    esac
-fi
-if test x$MISC_MAN_DIR = x    ; then
-    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x$DRIVER_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
-	*)		DRIVER_MAN_SUFFIX=4  ;;
-    esac
-fi
-if test x$DRIVER_MAN_DIR = x    ; then
-    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+    case $lt_prog_compiler_pic_F77 in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+     esac
+else
+    lt_prog_compiler_pic_F77=
+     lt_prog_compiler_can_build_shared_F77=no
 fi
 
-if test x$ADMIN_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
-	*)		ADMIN_MAN_SUFFIX=8  ;;
-    esac
-fi
-if test x$ADMIN_MAN_DIR = x    ; then
-    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
 fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_F77=
+    ;;
+  *)
+    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+    ;;
+esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_F77=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_F77=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_F77=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-release-version was given.
-if test "${with_release_version+set}" = set; then
-  withval=$with_release_version; RELEASE_VERSION="$withval"
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+    :
 else
-  RELEASE_VERSION=""
+    lt_prog_compiler_static_F77=
 fi
 
-	if test "x$RELEASE_VERSION" != "x"; then
-		PACKAGE="$PACKAGE-$RELEASE_VERSION"
-		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
-		{ $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
-$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
-_ACEOF
-
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
-	if test "x$PVM" = "x"; then
-		PVM="0"
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MINOR $PVM
-_ACEOF
-
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
-	if test "x$PVP" = "x"; then
-		PVP="0"
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_PATCHLEVEL $PVP
-_ACEOF
-
-
-
-
-if test x$XORG_SGML_PATH = x ; then
-    XORG_SGML_PATH=$prefix/share/sgml
-fi
-HAVE_DEFS_ENT=
 
-if test x"$cross_compiling" = x"yes" ; then
-  HAVE_DEFS_ENT=no
-else
-  as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
-$as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  HAVE_DEFS_ENT=yes
-fi
-
-fi
+  lt_cv_prog_compiler_c_o_F77=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-# Extract the first word of "linuxdoc", so it can be a program name with args.
-set dummy linuxdoc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LINUXDOC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $LINUXDOC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LINUXDOC="$LINUXDOC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_LINUXDOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15383: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:15387: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_F77=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
 
-  ;;
-esac
-fi
-LINUXDOC=$ac_cv_path_LINUXDOC
-if test -n "$LINUXDOC"; then
-  { $as_echo "$as_me:$LINENO: result: $LINUXDOC" >&5
-$as_echo "$LINUXDOC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
-# Extract the first word of "ps2pdf", so it can be a program name with args.
-set dummy ps2pdf; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PS2PDF+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $PS2PDF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
   fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PS2PDF=$ac_cv_path_PS2PDF
-if test -n "$PS2PDF"; then
-  { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5
-$as_echo "$PS2PDF" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  need_locks=no
 fi
 
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
+  runpath_var=
+  allow_undefined_flag_F77=
+  enable_shared_with_static_runtimes_F77=no
+  archive_cmds_F77=
+  archive_expsym_cmds_F77=
+  old_archive_From_new_cmds_F77=
+  old_archive_from_expsyms_cmds_F77=
+  export_dynamic_flag_spec_F77=
+  whole_archive_flag_spec_F77=
+  thread_safe_flag_spec_F77=
+  hardcode_libdir_flag_spec_F77=
+  hardcode_libdir_flag_spec_ld_F77=
+  hardcode_libdir_separator_F77=
+  hardcode_direct_F77=no
+  hardcode_minus_L_F77=no
+  hardcode_shlibpath_var_F77=unsupported
+  link_all_deplibs_F77=unknown
+  hardcode_automatic_F77=no
+  module_cmds_F77=
+  module_expsym_cmds_F77=
+  always_export_symbols_F77=no
+  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms_F77=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-{ $as_echo "$as_me:$LINENO: checking Whether to build documentation" >&5
-$as_echo_n "checking Whether to build documentation... " >&6; }
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
 
-if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
-   BUILDDOC=yes
-else
-   BUILDDOC=no
-fi
+  ld_shlibs_F77=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
 
- if test x$BUILDDOC = xyes; then
-  BUILD_LINUXDOC_TRUE=
-  BUILD_LINUXDOC_FALSE='#'
-else
-  BUILD_LINUXDOC_TRUE='#'
-  BUILD_LINUXDOC_FALSE=
-fi
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_F77=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
 
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs_F77=no
+	cat <<EOF 1>&2
 
-{ $as_echo "$as_me:$LINENO: result: $BUILDDOC" >&5
-$as_echo "$BUILDDOC" >&6; }
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
-{ $as_echo "$as_me:$LINENO: checking Whether to build pdf documentation" >&5
-$as_echo_n "checking Whether to build pdf documentation... " >&6; }
-
-if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
-   BUILDPDFDOC=yes
-else
-   BUILDPDFDOC=no
-fi
+EOF
+      fi
+      ;;
 
- if test x$BUILDPDFDOC = xyes; then
-  BUILD_PDFDOC_TRUE=
-  BUILD_PDFDOC_FALSE='#'
-else
-  BUILD_PDFDOC_TRUE='#'
-  BUILD_PDFDOC_FALSE=
-fi
+    amigaos*)
+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs_F77=no
+      ;;
 
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag_F77=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
 
-{ $as_echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5
-$as_echo "$BUILDPDFDOC" >&6; }
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      allow_undefined_flag_F77=unsupported
+      always_export_symbols_F77=no
+      enable_shared_with_static_runtimes_F77=yes
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
-MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
-MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
-MAKE_PDF="$PS2PDF"
-MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC  -B html --split=0"
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
 
+    interix[3-9]*)
+      hardcode_direct_F77=no
+      hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_F77='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
 
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
 
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
 
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs_F77=no
+	cat <<EOF 1>&2
 
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
-ac_config_files="$ac_config_files Makefile uxa/Makefile src/Makefile src/xvmc/Makefile src/bios_reader/Makefile src/ch7017/Makefile src/ch7xxx/Makefile src/ivch/Makefile src/reg_dumper/Makefile src/sil164/Makefile src/tfp410/Makefile man/Makefile"
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
 
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_F77=no
+	cat <<_LT_EOF 1>&2
 
-_ACEOF
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_F77=no
+	  fi
+	;;
       esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
+      ;;
+
+    sunos4*)
+      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
 
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
     *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_F77=no
+      fi
       ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+    esac
+
+    if test "$ld_shlibs_F77" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_F77=
+      export_dynamic_flag_spec_F77=
+      whole_archive_flag_spec_F77=
+    fi
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag_F77=unsupported
+      always_export_symbols_F77=yes
+      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L_F77=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct_F77=unsupported
+      fi
+      ;;
 
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
 
-DEFS=-DHAVE_CONFIG_H
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
 
-LTLIBOBJS=$ac_ltlibobjs
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
+      archive_cmds_F77=''
+      hardcode_direct_F77=yes
+      hardcode_libdir_separator_F77=':'
+      link_all_deplibs_F77=yes
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_GEN4ASM_TRUE}" && test -z "${HAVE_GEN4ASM_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GEN4ASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GEN4ASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XSERVER_LIBPCIACCESS_TRUE}" && test -z "${XSERVER_LIBPCIACCESS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${LIBPCIACCESS_TRUE}" && test -z "${LIBPCIACCESS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"LIBPCIACCESS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"LIBPCIACCESS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMODES_TRUE}" && test -z "${XMODES_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XMODES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XMODES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${DRI_TRUE}" && test -z "${DRI_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DRI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DRI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${VIDEO_DEBUG_TRUE}" && test -z "${VIDEO_DEBUG_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"VIDEO_DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XVMC_TRUE}" && test -z "${XVMC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XVMC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XVMC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_LINUXDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_PDFDOC_TRUE}" && test -z "${BUILD_PDFDOC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PDFDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_PDFDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  hardcode_direct_F77=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L_F77=yes
+  	  hardcode_libdir_flag_spec_F77='-L$libdir'
+  	  hardcode_libdir_separator_F77=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
 
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_F77=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag_F77='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+      program main
 
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
+      end
 _ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag_F77="-z nodefs"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+      program main
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+      end
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
 else
-  as_unset=false
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
+	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag_F77=' ${wl}-bernotok'
+	  allow_undefined_flag_F77=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec_F77='$convenience'
+	  archive_cmds_need_lc_F77=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
 
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
+    amigaos*)
+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs_F77=no
+      ;;
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
+    bsdi[45]*)
+      export_dynamic_flag_spec_F77=-rdynamic
+      ;;
 
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec_F77=' '
+      allow_undefined_flag_F77=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds_F77='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes_F77=yes
+      ;;
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
+    darwin* | rhapsody*)
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      archive_cmds_need_lc_F77=no
+      hardcode_direct_F77=no
+      hardcode_automatic_F77=yes
+      hardcode_shlibpath_var_F77=unsupported
+      whole_archive_flag_spec_F77=''
+      link_all_deplibs_F77=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_F77=no
+          ;;
+      esac
+    fi
+      ;;
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
+    dgux*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_shlibpath_var_F77=no
+      ;;
 
+    freebsd1*)
+      ld_shlibs_F77=no
+      ;;
 
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
 
-# CDPATH.
-$as_unset CDPATH
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
 
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
 
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      hardcode_direct_F77=yes
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L_F77=yes
+      export_dynamic_flag_spec_F77='${wl}-E'
+      ;;
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_F77=:
 
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
+	hardcode_direct_F77=yes
+	export_dynamic_flag_spec_F77='${wl}-E'
 
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_F77=yes
+      fi
+      ;;
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_F77=:
 
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+	  hardcode_direct_F77=no
+	  hardcode_shlibpath_var_F77=no
+	  ;;
+	*)
+	  hardcode_direct_F77=yes
+	  export_dynamic_flag_spec_F77='${wl}-E'
 
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_F77=yes
+	  ;;
+	esac
+      fi
+      ;;
 
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      link_all_deplibs_F77=yes
+      ;;
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
 
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+    newsos6)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_F77=yes
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      hardcode_shlibpath_var_F77=no
+      ;;
 
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
 
+    os2*)
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_minus_L_F77=yes
+      allow_undefined_flag_F77=unsupported
+      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
 
-exec 6>&1
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag_F77=' -expect_unresolved \*'
+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_F77=:
+      ;;
 
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by xf86-video-intel $as_me 2.7.1, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag_F77=' -expect_unresolved \*'
+	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+      fi
+      hardcode_libdir_separator_F77=:
+      ;;
 
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
+    solaris*)
+      no_undefined_flag_F77=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_shlibpath_var_F77=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs_F77=yes
+      ;;
 
-_ACEOF
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_direct_F77=yes
+      hardcode_minus_L_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
 
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_F77=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds_F77='$CC -r -o $output$reload_objs'
+	  hardcode_direct_F77=no
+        ;;
+	motorola)
+	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_F77=no
+      ;;
 
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
+    sysv4.3*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_F77=no
+      export_dynamic_flag_spec_F77='-Bexport'
+      ;;
 
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var_F77=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs_F77=yes
+      fi
+      ;;
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_F77='${wl}-z,text'
+      archive_cmds_need_lc_F77=no
+      hardcode_shlibpath_var_F77=no
+      runpath_var='LD_RUN_PATH'
 
-_ACEOF
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_F77='${wl}-z,text'
+      allow_undefined_flag_F77='${wl}-z,nodefs'
+      archive_cmds_need_lc_F77=no
+      hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_F77=':'
+      link_all_deplibs_F77=yes
+      export_dynamic_flag_spec_F77='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
 
-Usage: $0 [OPTION]... [FILE]...
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+    uts4*)
+      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_F77='-L$libdir'
+      hardcode_shlibpath_var_F77=no
+      ;;
 
-Configuration files:
-$config_files
+    *)
+      ld_shlibs_F77=no
+      ;;
+    esac
+  fi
 
-Configuration headers:
-$config_headers
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+$as_echo "$ld_shlibs_F77" >&6; }
+test "$ld_shlibs_F77" = no && can_build_shared=no
 
-Configuration commands:
-$config_commands
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_F77" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_F77=yes
 
-Report bugs to <bug-autoconf@gnu.org>."
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_F77 in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-xf86-video-intel config.status 2.7.1
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_F77
+	pic_flag=$lt_prog_compiler_pic_F77
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
+        allow_undefined_flag_F77=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_F77=no
+        else
+	  archive_cmds_need_lc_F77=yes
+        fi
+        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
 
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
+need_lib_prefix=unknown
+hardcode_into_libs=no
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
 
-  esac
-  shift
-done
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
 
-ac_configure_extra_args=
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
 
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
 
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
 
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
 
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-AR \
-AR_FLAGS \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
-lt_prog_compiler_pic \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
-hardcode_libdir_separator \
-fix_srcfile_path \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
       ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
-done
+    ;;
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
   ;;
-esac
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
 
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 
-_ACEOF
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "uxa/Makefile") CONFIG_FILES="$CONFIG_FILES uxa/Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/xvmc/Makefile") CONFIG_FILES="$CONFIG_FILES src/xvmc/Makefile" ;;
-    "src/bios_reader/Makefile") CONFIG_FILES="$CONFIG_FILES src/bios_reader/Makefile" ;;
-    "src/ch7017/Makefile") CONFIG_FILES="$CONFIG_FILES src/ch7017/Makefile" ;;
-    "src/ch7xxx/Makefile") CONFIG_FILES="$CONFIG_FILES src/ch7xxx/Makefile" ;;
-    "src/ivch/Makefile") CONFIG_FILES="$CONFIG_FILES src/ivch/Makefile" ;;
-    "src/reg_dumper/Makefile") CONFIG_FILES="$CONFIG_FILES src/reg_dumper/Makefile" ;;
-    "src/sil164/Makefile") CONFIG_FILES="$CONFIG_FILES src/sil164/Makefile" ;;
-    "src/tfp410/Makefile") CONFIG_FILES="$CONFIG_FILES src/tfp410/Makefile" ;;
-    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+freebsd1*)
+  dynamic_linker=no
+  ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
 
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
 
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
 
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
 
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
 
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
 
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
   else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
   fi
-done
-rm -f conf$$subs.sh
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-  print line
-}
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
 
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-_ACEOF
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
+rdos*)
+  dynamic_linker=no
+  ;;
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
 
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
   fi
-done
+  ;;
 
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
 
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
 
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
 
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_F77=
+if test -n "$hardcode_libdir_flag_spec_F77" || \
+   test -n "$runpath_var_F77" || \
+   test "X$hardcode_automatic_F77" = "Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_F77" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+     test "$hardcode_minus_L_F77" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_F77=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_F77=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_F77=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
+
+if test "$hardcode_action_F77" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_F77 \
+    CC_F77 \
+    LD_F77 \
+    lt_prog_compiler_wl_F77 \
+    lt_prog_compiler_pic_F77 \
+    lt_prog_compiler_static_F77 \
+    lt_prog_compiler_no_builtin_flag_F77 \
+    export_dynamic_flag_spec_F77 \
+    thread_safe_flag_spec_F77 \
+    whole_archive_flag_spec_F77 \
+    enable_shared_with_static_runtimes_F77 \
+    old_archive_cmds_F77 \
+    old_archive_from_new_cmds_F77 \
+    predep_objects_F77 \
+    postdep_objects_F77 \
+    predeps_F77 \
+    postdeps_F77 \
+    compiler_lib_search_path_F77 \
+    compiler_lib_search_dirs_F77 \
+    archive_cmds_F77 \
+    archive_expsym_cmds_F77 \
+    postinstall_cmds_F77 \
+    postuninstall_cmds_F77 \
+    old_archive_from_expsyms_cmds_F77 \
+    allow_undefined_flag_F77 \
+    no_undefined_flag_F77 \
+    export_symbols_cmds_F77 \
+    hardcode_libdir_flag_spec_F77 \
+    hardcode_libdir_flag_spec_ld_F77 \
+    hardcode_libdir_separator_F77 \
+    hardcode_automatic_F77 \
+    module_cmds_F77 \
+    module_expsym_cmds_F77 \
+    lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
+    exclude_expsyms_F77 \
+    include_expsyms_F77; do
+
+    case $var in
+    old_archive_cmds_F77 | \
+    old_archive_from_new_cmds_F77 | \
+    archive_cmds_F77 | \
+    archive_expsym_cmds_F77 | \
+    module_cmds_F77 | \
+    module_expsym_cmds_F77 | \
+    old_archive_from_expsyms_cmds_F77 | \
+    export_symbols_cmds_F77 | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
     esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
     ;;
   esac
 
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
+cfgfile="$ofile"
 
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
 
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_F77
 
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
 
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
 
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
 
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
+# A C compiler.
+LTCC=$lt_LTCC
 
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
 
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
+# A language-specific compiler.
+CC=$lt_compiler_F77
 
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_F77
 
+# An ERE matcher.
+EGREP=$lt_EGREP
 
-# The names of the tagged configurations supported by this script.
-available_tags=""
+# The linker used to build libraries.
+LD=$lt_LD_F77
 
-# ### BEGIN LIBTOOL CONFIG
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+# A BSD-compatible nm program.
+NM=$lt_NM
 
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
+# A symbol stripping program
+STRIP=$lt_STRIP
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
 
-# What type of objects to build.
-pic_mode=$pic_mode
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
+# Used on cygwin: assembler.
+AS="$AS"
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
-# A sed program that does not truncate output.
-SED=$lt_SED
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_F77
 
-# A grep program that handles long lines.
-GREP=$lt_GREP
+# Object file suffix (normally "o").
+objext="$ac_objext"
 
-# An ERE matcher.
-EGREP=$lt_EGREP
+# Old archive suffix (normally "a").
+libext="$libext"
 
-# A literal string matcher.
-FGREP=$lt_FGREP
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
 
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
+# Executable file suffix (normally "").
+exeext="$exeext"
 
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_F77
+pic_mode=$pic_mode
 
 # What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
 
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
+# Do we need a version for libraries?
+need_version=$need_version
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
-# Command to use when deplibs_check_method == "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
-# A symbol stripping program.
-STRIP=$lt_STRIP
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_F77
 
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
 
-# A C compiler.
-LTCC=$lt_CC
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
 
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Library versioning type.
+version_type=$version_type
 
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_F77
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
 
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
 
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_F77
+archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
 
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_F77
+module_expsym_cmds=$lt_module_expsym_cmds_F77
 
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_F77
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_F77
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_F77
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_F77
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
 
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
 
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
 
-# Old archive suffix (normally "a").
-libext=$libext
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_F77
 
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_F77
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
 
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-# Do we need a version for libraries?
-need_version=$need_version
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-# Library versioning type.
-version_type=$version_type
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-# Shared library runtime path variable.
+# This is the shared library runtime path variable.
 runpath_var=$runpath_var
 
-# Shared library path variable.
+# This is the shared library path variable.
 shlibpath_var=$shlibpath_var
 
 # Is shlibpath searched before the hard-coded library search path?
 shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_F77
 
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
 
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_F77
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_F77
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_F77
 
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_F77
 
-# Compile-time system search path for libraries.
+# Compile-time system search path for libraries
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
+# Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_F77
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_F77
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_F77
 
-# The linker used to build libraries.
-LD=$lt_LD
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_F77
 
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
+# ### END LIBTOOL TAG CONFIG: $tagname
 
-# A language specific compiler.
-CC=$lt_compiler
+__EOF__
 
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
 
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+CC="$lt_save_CC"
 
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
+	else
+	  tagname=""
+	fi
+	;;
 
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
 
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
+# Source file extension for Java test sources.
+ac_ext=java
 
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
+# Object file extension for compiled Java test sources.
+objext=o
+objext_GCJ=$objext
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
 
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
 
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+compiler_GCJ=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+archive_cmds_need_lc_GCJ=no
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
+old_archive_cmds_GCJ=$old_archive_cmds
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
 
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
+lt_prog_compiler_no_builtin_flag_GCJ=
 
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
 
-# ### END LIBTOOL CONFIG
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+  ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:17598: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:17602: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $rm conftest*
 
-_LT_EOF
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+else
+    :
 fi
-_LT_EOF
-    ;;
-  esac
 
+fi
 
-ltmain="$ac_aux_dir/ltmain.sh"
+lt_prog_compiler_wl_GCJ=
+lt_prog_compiler_pic_GCJ=
+lt_prog_compiler_static_GCJ=
 
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl_GCJ='-Wl,'
+    lt_prog_compiler_static_GCJ='-static'
 
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      fi
+      ;;
 
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+      ;;
 
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
+      ;;
 
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_GCJ='-fno-common'
+      ;;
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_GCJ=no
+      enable_shared=no
+      ;;
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_GCJ=-Kconform_pic
+      fi
+      ;;
 
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_GCJ='-fPIC'
+	;;
+      esac
+      ;;
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
+    *)
+      lt_prog_compiler_pic_GCJ='-fPIC'
+      ;;
+    esac
   else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      else
+	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_GCJ='-qnocommon'
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         ;;
+       esac
+       ;;
 
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
+      ;;
 
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic_GCJ='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+      ;;
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
 
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
+    newsos6)
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-KPIC'
+	lt_prog_compiler_static_GCJ='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-fpic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl_GCJ='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static_GCJ='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
 
-_LT_EOF
-esac
+    solaris*)
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_GCJ='-Wl,';;
+      esac
+      ;;
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
+    sunos4*)
+      lt_prog_compiler_wl_GCJ='-Qoption ld '
+      lt_prog_compiler_pic_GCJ='-PIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic_GCJ='-Kconform_pic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic_GCJ='-pic'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+    esac
+  fi
+
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_GCJ"; then
+
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_GCJ=no
+  ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:17888: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:17892: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_GCJ=yes
+     fi
+   fi
+   $rm conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+    case $lt_prog_compiler_pic_GCJ in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+     esac
+else
+    lt_prog_compiler_pic_GCJ=
+     lt_prog_compiler_can_build_shared_GCJ=no
+fi
+
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_GCJ=
     ;;
   *)
-    cat << \_LT_EOF >> "$cfgfile"
+    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
+    ;;
+esac
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_GCJ=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_GCJ=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_GCJ=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
 
-_LT_EOF
-    ;;
-  esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+    :
+else
+    lt_prog_compiler_static_GCJ=
+fi
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
 
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_GCJ=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:17992: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:17996: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_GCJ=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag_GCJ=
+  enable_shared_with_static_runtimes_GCJ=no
+  archive_cmds_GCJ=
+  archive_expsym_cmds_GCJ=
+  old_archive_From_new_cmds_GCJ=
+  old_archive_from_expsyms_cmds_GCJ=
+  export_dynamic_flag_spec_GCJ=
+  whole_archive_flag_spec_GCJ=
+  thread_safe_flag_spec_GCJ=
+  hardcode_libdir_flag_spec_GCJ=
+  hardcode_libdir_flag_spec_ld_GCJ=
+  hardcode_libdir_separator_GCJ=
+  hardcode_direct_GCJ=no
+  hardcode_minus_L_GCJ=no
+  hardcode_shlibpath_var_GCJ=unsupported
+  link_all_deplibs_GCJ=unknown
+  hardcode_automatic_GCJ=no
+  module_cmds_GCJ=
+  module_expsym_cmds_GCJ=
+  always_export_symbols_GCJ=no
+  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms_GCJ=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs_GCJ=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_GCJ=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs_GCJ=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      ld_shlibs_GCJ=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag_GCJ=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      allow_undefined_flag_GCJ=unsupported
+      always_export_symbols_GCJ=no
+      enable_shared_with_static_runtimes_GCJ=yes
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_GCJ='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	ld_shlibs_GCJ=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_GCJ=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_GCJ=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs_GCJ" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_GCJ=
+      export_dynamic_flag_spec_GCJ=
+      whole_archive_flag_spec_GCJ=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag_GCJ=unsupported
+      always_export_symbols_GCJ=yes
+      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L_GCJ=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct_GCJ=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds_GCJ=''
+      hardcode_direct_GCJ=yes
+      hardcode_libdir_separator_GCJ=':'
+      link_all_deplibs_GCJ=yes
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  hardcode_direct_GCJ=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  hardcode_minus_L_GCJ=yes
+  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+  	  hardcode_libdir_separator_GCJ=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_GCJ=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag_GCJ='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag_GCJ="-z nodefs"
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag_GCJ=' ${wl}-bernotok'
+	  allow_undefined_flag_GCJ=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec_GCJ='$convenience'
+	  archive_cmds_need_lc_GCJ=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs_GCJ=no
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec_GCJ=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec_GCJ=' '
+      allow_undefined_flag_GCJ=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_From_new_cmds_GCJ='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes_GCJ=yes
+      ;;
+
+    darwin* | rhapsody*)
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      archive_cmds_need_lc_GCJ=no
+      hardcode_direct_GCJ=no
+      hardcode_automatic_GCJ=yes
+      hardcode_shlibpath_var_GCJ=unsupported
+      whole_archive_flag_spec_GCJ=''
+      link_all_deplibs_GCJ=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_GCJ=no
+          ;;
+      esac
+    fi
+      ;;
+
+    dgux*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs_GCJ=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      hardcode_direct_GCJ=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L_GCJ=yes
+      export_dynamic_flag_spec_GCJ='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
+	hardcode_direct_GCJ=yes
+	export_dynamic_flag_spec_GCJ='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_GCJ=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+	  hardcode_direct_GCJ=no
+	  hardcode_shlibpath_var_GCJ=no
+	  ;;
+	*)
+	  hardcode_direct_GCJ=yes
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L_GCJ=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      link_all_deplibs_GCJ=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    newsos6)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct_GCJ=yes
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_minus_L_GCJ=yes
+      allow_undefined_flag_GCJ=unsupported
+      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator_GCJ=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+      fi
+      hardcode_libdir_separator_GCJ=:
+      ;;
+
+    solaris*)
+      no_undefined_flag_GCJ=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs_GCJ=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_minus_L_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_GCJ=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
+	  hardcode_direct_GCJ=no
+        ;;
+	motorola)
+	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var_GCJ=no
+      export_dynamic_flag_spec_GCJ='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var_GCJ=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs_GCJ=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_GCJ='${wl}-z,text'
+      archive_cmds_need_lc_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_GCJ='${wl}-z,text'
+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
+      archive_cmds_need_lc_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_GCJ=':'
+      link_all_deplibs_GCJ=yes
+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    *)
+      ld_shlibs_GCJ=no
+      ;;
+    esac
+  fi
+
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+$as_echo "$ld_shlibs_GCJ" >&6; }
+test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_GCJ" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_GCJ=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_GCJ in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_GCJ
+	pic_flag=$lt_prog_compiler_pic_GCJ
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
+        allow_undefined_flag_GCJ=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        then
+	  archive_cmds_need_lc_GCJ=no
+        else
+	  archive_cmds_need_lc_GCJ=yes
+        fi
+        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+   test -n "$runpath_var_GCJ" || \
+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_GCJ" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+     test "$hardcode_minus_L_GCJ" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_GCJ=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_GCJ=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_GCJ=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+$as_echo "$hardcode_action_GCJ" >&6; }
+
+if test "$hardcode_action_GCJ" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_GCJ \
+    CC_GCJ \
+    LD_GCJ \
+    lt_prog_compiler_wl_GCJ \
+    lt_prog_compiler_pic_GCJ \
+    lt_prog_compiler_static_GCJ \
+    lt_prog_compiler_no_builtin_flag_GCJ \
+    export_dynamic_flag_spec_GCJ \
+    thread_safe_flag_spec_GCJ \
+    whole_archive_flag_spec_GCJ \
+    enable_shared_with_static_runtimes_GCJ \
+    old_archive_cmds_GCJ \
+    old_archive_from_new_cmds_GCJ \
+    predep_objects_GCJ \
+    postdep_objects_GCJ \
+    predeps_GCJ \
+    postdeps_GCJ \
+    compiler_lib_search_path_GCJ \
+    compiler_lib_search_dirs_GCJ \
+    archive_cmds_GCJ \
+    archive_expsym_cmds_GCJ \
+    postinstall_cmds_GCJ \
+    postuninstall_cmds_GCJ \
+    old_archive_from_expsyms_cmds_GCJ \
+    allow_undefined_flag_GCJ \
+    no_undefined_flag_GCJ \
+    export_symbols_cmds_GCJ \
+    hardcode_libdir_flag_spec_GCJ \
+    hardcode_libdir_flag_spec_ld_GCJ \
+    hardcode_libdir_separator_GCJ \
+    hardcode_automatic_GCJ \
+    module_cmds_GCJ \
+    module_expsym_cmds_GCJ \
+    lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
+    exclude_expsyms_GCJ \
+    include_expsyms_GCJ; do
+
+    case $var in
+    old_archive_cmds_GCJ | \
+    old_archive_from_new_cmds_GCJ | \
+    archive_cmds_GCJ | \
+    archive_expsym_cmds_GCJ | \
+    module_cmds_GCJ | \
+    module_expsym_cmds_GCJ | \
+    old_archive_from_expsyms_cmds_GCJ | \
+    export_symbols_cmds_GCJ | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_compiler_GCJ
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_GCJ
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_GCJ
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_GCJ
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_GCJ
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_GCJ
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_GCJ
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_GCJ
+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_GCJ
+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_GCJ
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_GCJ
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_GCJ
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_GCJ
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_GCJ
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_GCJ
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_GCJ
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_GCJ
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_GCJ
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_GCJ
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_GCJ
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_GCJ
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_GCJ
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_GCJ
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+objext_RC=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+compiler_RC=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+lt_cv_prog_compiler_c_o_RC=yes
+
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    compiler_RC \
+    CC_RC \
+    LD_RC \
+    lt_prog_compiler_wl_RC \
+    lt_prog_compiler_pic_RC \
+    lt_prog_compiler_static_RC \
+    lt_prog_compiler_no_builtin_flag_RC \
+    export_dynamic_flag_spec_RC \
+    thread_safe_flag_spec_RC \
+    whole_archive_flag_spec_RC \
+    enable_shared_with_static_runtimes_RC \
+    old_archive_cmds_RC \
+    old_archive_from_new_cmds_RC \
+    predep_objects_RC \
+    postdep_objects_RC \
+    predeps_RC \
+    postdeps_RC \
+    compiler_lib_search_path_RC \
+    compiler_lib_search_dirs_RC \
+    archive_cmds_RC \
+    archive_expsym_cmds_RC \
+    postinstall_cmds_RC \
+    postuninstall_cmds_RC \
+    old_archive_from_expsyms_cmds_RC \
+    allow_undefined_flag_RC \
+    no_undefined_flag_RC \
+    export_symbols_cmds_RC \
+    hardcode_libdir_flag_spec_RC \
+    hardcode_libdir_flag_spec_ld_RC \
+    hardcode_libdir_separator_RC \
+    hardcode_automatic_RC \
+    module_cmds_RC \
+    module_expsym_cmds_RC \
+    lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
+    exclude_expsyms_RC \
+    include_expsyms_RC; do
+
+    case $var in
+    old_archive_cmds_RC | \
+    old_archive_from_new_cmds_RC | \
+    archive_cmds_RC | \
+    archive_expsym_cmds_RC | \
+    module_cmds_RC | \
+    module_expsym_cmds_RC | \
+    old_archive_from_expsyms_cmds_RC | \
+    export_symbols_cmds_RC | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\$0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+cfgfile="$ofile"
+
+  cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_RC
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_compiler_RC
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_RC
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_LD_RC
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_RC
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_RC
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_RC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_RC
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_RC
+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_module_cmds_RC
+module_expsym_cmds=$lt_module_expsym_cmds_RC
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_predep_objects_RC
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_postdep_objects_RC
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_RC
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_postdeps_RC
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_RC
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_RC
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_RC
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_RC
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_RC
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_RC
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_RC
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_RC
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_RC
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_RC
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_RC
+
+# ### END LIBTOOL TAG CONFIG: $tagname
+
+__EOF__
+
+
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+	;;
+
+      *)
+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+# Prevent multiple expansion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for GEN4ASM" >&5
+$as_echo_n "checking for GEN4ASM... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GEN4ASM_CFLAGS"; then
+        pkg_cv_GEN4ASM_CFLAGS="$GEN4ASM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GEN4ASM_CFLAGS=`$PKG_CONFIG --cflags "intel-gen4asm >= 1.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GEN4ASM_LIBS"; then
+        pkg_cv_GEN4ASM_LIBS="$GEN4ASM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GEN4ASM_LIBS=`$PKG_CONFIG --libs "intel-gen4asm >= 1.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"`
+        else
+	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GEN4ASM_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                gen4asm=no
+elif test $pkg_failed = untried; then
+	gen4asm=no
+else
+	GEN4ASM_CFLAGS=$pkg_cv_GEN4ASM_CFLAGS
+	GEN4ASM_LIBS=$pkg_cv_GEN4ASM_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	gen4asm=yes
+fi
+
+
+if test x$gen4asm = xyes; then
+  HAVE_GEN4ASM_TRUE=
+  HAVE_GEN4ASM_FALSE='#'
+else
+  HAVE_GEN4ASM_TRUE='#'
+  HAVE_GEN4ASM_FALSE=
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+
+for ac_header in sys/mman.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_func in mprotect
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+
+
+# Check whether --with-xorg-module-dir was given.
+if test "${with_xorg_module_dir+set}" = set; then
+  withval=$with_xorg_module_dir; moduledir="$withval"
+else
+  moduledir="$libdir/xorg/modules"
+fi
+
+
+# Check whether --enable-dri was given.
+if test "${enable_dri+set}" = set; then
+  enableval=$enable_dri; DRI="$enableval"
+else
+  DRI=auto
+fi
+
+
+# Check whether --enable-video-debug was given.
+if test "${enable_video_debug+set}" = set; then
+  enableval=$enable_video_debug; VIDEO_DEBUG="$enableval"
+else
+  VIDEO_DEBUG=no
+fi
+
+
+# Check whether --enable-xvmc was given.
+if test "${enable_xvmc+set}" = set; then
+  enableval=$enable_xvmc; XVMC="$enableval"
+else
+  XVMC=yes
+fi
+
+
+# Check whether --enable-kms-only was given.
+if test "${enable_kms_only+set}" = set; then
+  enableval=$enable_kms_only; KMS_ONLY="$enableval"
+else
+  KMS_ONLY=no
+fi
+
+
+# Checks for extensions
+
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include "xorg-server.h"
+#if !defined RANDR
+#error RANDR not defined
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  _EXT_CHECK=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	_EXT_CHECK=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CFLAGS="$SAVE_CFLAGS"
+	{ $as_echo "$as_me:$LINENO: checking if RANDR is defined" >&5
+$as_echo_n "checking if RANDR is defined... " >&6; }
+	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
+$as_echo "$_EXT_CHECK" >&6; }
+	if test "$_EXT_CHECK" != no; then
+		REQUIRED_MODULES="$REQUIRED_MODULES randrproto"
+	fi
+
+
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include "xorg-server.h"
+#if !defined RENDER
+#error RENDER not defined
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  _EXT_CHECK=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	_EXT_CHECK=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CFLAGS="$SAVE_CFLAGS"
+	{ $as_echo "$as_me:$LINENO: checking if RENDER is defined" >&5
+$as_echo_n "checking if RENDER is defined... " >&6; }
+	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
+$as_echo "$_EXT_CHECK" >&6; }
+	if test "$_EXT_CHECK" != no; then
+		REQUIRED_MODULES="$REQUIRED_MODULES renderproto"
+	fi
+
+
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include "xorg-server.h"
+#if !defined XF86DRI
+#error XF86DRI not defined
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  _EXT_CHECK=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	_EXT_CHECK=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CFLAGS="$SAVE_CFLAGS"
+	{ $as_echo "$as_me:$LINENO: checking if XF86DRI is defined" >&5
+$as_echo_n "checking if XF86DRI is defined... " >&6; }
+	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
+$as_echo "$_EXT_CHECK" >&6; }
+	if test "$_EXT_CHECK" != no; then
+		REQUIRED_MODULES="$REQUIRED_MODULES xextproto x11"
+	fi
+
+
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include "xorg-server.h"
+#if !defined DPMSExtension
+#error DPMSExtension not defined
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  _EXT_CHECK=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	_EXT_CHECK=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CFLAGS="$SAVE_CFLAGS"
+	{ $as_echo "$as_me:$LINENO: checking if DPMSExtension is defined" >&5
+$as_echo_n "checking if DPMSExtension is defined... " >&6; }
+	{ $as_echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5
+$as_echo "$_EXT_CHECK" >&6; }
+	if test "$_EXT_CHECK" != no; then
+		REQUIRED_MODULES="$REQUIRED_MODULES xextproto"
+	fi
+
+
+# Checks for pkg-config packages
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for XORG" >&5
+$as_echo_n "checking for XORG... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XORG_CFLAGS"; then
+        pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.6 xproto fontsproto \$REQUIRED_MODULES\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XORG_LIBS"; then
+        pkg_cv_XORG_LIBS="$XORG_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.6 xproto fontsproto \$REQUIRED_MODULES\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES"`
+        else
+	        XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XORG_PKG_ERRORS" >&5
+
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES) were not met:
+
+$XORG_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES) were not met:
+
+$XORG_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
+	XORG_LIBS=$pkg_cv_XORG_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for DRM" >&5
+$as_echo_n "checking for DRM... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRM_CFLAGS"; then
+        pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.11\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.11" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRM_LIBS"; then
+        pkg_cv_DRM_LIBS="$DRM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.11\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.11" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.4.11"`
+        else
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.4.11"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$DRM_PKG_ERRORS" >&5
+
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libdrm >= 2.4.11) were not met:
+
+$DRM_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DRM_CFLAGS
+and DRM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (libdrm >= 2.4.11) were not met:
+
+$DRM_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DRM_CFLAGS
+and DRM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DRM_CFLAGS
+and DRM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DRM_CFLAGS
+and DRM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	DRM_CFLAGS=$pkg_cv_DRM_CFLAGS
+	DRM_LIBS=$pkg_cv_DRM_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5
+$as_echo_n "checking for PCIACCESS... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$PCIACCESS_CFLAGS"; then
+        pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$PCIACCESS_LIBS"; then
+        pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10"`
+        else
+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PCIACCESS_PKG_ERRORS" >&5
+
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.10) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (pciaccess >= 0.10) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
+	PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for XEXT" >&5
+$as_echo_n "checking for XEXT... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XEXT_CFLAGS"; then
+        pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xextproto >= 7.0.99.1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xextproto >= 7.0.99.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XEXT_CFLAGS=`$PKG_CONFIG --cflags "xextproto >= 7.0.99.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XEXT_LIBS"; then
+        pkg_cv_XEXT_LIBS="$XEXT_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xextproto >= 7.0.99.1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xextproto >= 7.0.99.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XEXT_LIBS=`$PKG_CONFIG --libs "xextproto >= 7.0.99.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xextproto >= 7.0.99.1"`
+        else
+	        XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xextproto >= 7.0.99.1"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XEXT_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                HAVE_XEXTPROTO_71="no"
+elif test $pkg_failed = untried; then
+	HAVE_XEXTPROTO_71="no"
+else
+	XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
+	XEXT_LIBS=$pkg_cv_XEXT_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_XEXTPROTO_71="yes";
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XEXTPROTO_71 1
+_ACEOF
+
+fi
+
+
+if  test "$HAVE_XEXTPROTO_71" = "yes" ; then
+  HAVE_XEXTPROTO_71_TRUE=
+  HAVE_XEXTPROTO_71_FALSE='#'
+else
+  HAVE_XEXTPROTO_71_TRUE='#'
+  HAVE_XEXTPROTO_71_FALSE=
+fi
+
+
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+{ $as_echo "$as_me:$LINENO: checking whether to include DRI support" >&5
+$as_echo_n "checking whether to include DRI support... " >&6; }
+if test x$DRI != xno; then
+        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
+$as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "${sdkdir}/dri.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'` = yes; then
+  have_dri_h="yes"
+else
+  have_dri_h="no"
+fi
+
+        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/sarea.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${sdkdir}/sarea.h" >&5
+$as_echo_n "checking for ${sdkdir}/sarea.h... " >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "${sdkdir}/sarea.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'` = yes; then
+  have_sarea_h="yes"
+else
+  have_sarea_h="no"
+fi
+
+        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dristruct.h" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ${sdkdir}/dristruct.h" >&5
+$as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "${sdkdir}/dristruct.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'` = yes; then
+  have_dristruct_h="yes"
+else
+  have_dristruct_h="no"
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: checking whether to include DRI support" >&5
+$as_echo_n "checking whether to include DRI support... " >&6; }
+if test x$DRI = xauto; then
+        if test "$have_dri_h" = yes -a \
+                "$have_sarea_h" = yes -a \
+                "$have_dristruct_h" = yes; then
+                DRI="yes"
+        else
+                DRI="no"
+        fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $DRI" >&5
+$as_echo "$DRI" >&6; }
+CFLAGS="$save_CFLAGS $DEBUGFLAGS"
+
+
+
+if test x$DRI = xyes; then
+  DRI_TRUE=
+  DRI_FALSE='#'
+else
+  DRI_TRUE='#'
+  DRI_FALSE=
+fi
+
+if test "$DRI" = yes; then
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for DRI" >&5
+$as_echo_n "checking for DRI... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRI_CFLAGS"; then
+        pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xf86driproto glproto\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xf86driproto glproto") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "xf86driproto glproto" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRI_LIBS"; then
+        pkg_cv_DRI_LIBS="$DRI_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xf86driproto glproto\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xf86driproto glproto") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "xf86driproto glproto" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xf86driproto glproto"`
+        else
+	        DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xf86driproto glproto"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$DRI_PKG_ERRORS" >&5
+
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xf86driproto glproto) were not met:
+
+$DRI_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DRI_CFLAGS
+and DRI_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (xf86driproto glproto) were not met:
+
+$DRI_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DRI_CFLAGS
+and DRI_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DRI_CFLAGS
+and DRI_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DRI_CFLAGS
+and DRI_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	DRI_CFLAGS=$pkg_cv_DRI_CFLAGS
+	DRI_LIBS=$pkg_cv_DRI_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+
+cat >>confdefs.h <<\_ACEOF
+#define XF86DRI 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define XF86DRI_DEVEL 1
+_ACEOF
+
+fi
+
+
+
+if test x$VIDEO_DEBUG = xyes; then
+  VIDEO_DEBUG_TRUE=
+  VIDEO_DEBUG_FALSE='#'
+else
+  VIDEO_DEBUG_TRUE='#'
+  VIDEO_DEBUG_FALSE=
+fi
+
+if test "$VIDEO_DEBUG" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define VIDEO_DEBUG 1
+_ACEOF
+
+fi
+
+if test "$XVMC" = yes; then
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for XVMCLIB" >&5
+$as_echo_n "checking for XVMCLIB... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XVMCLIB_CFLAGS"; then
+        pkg_cv_XVMCLIB_CFLAGS="$XVMCLIB_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XVMCLIB_CFLAGS=`$PKG_CONFIG --cflags "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XVMCLIB_LIBS"; then
+        pkg_cv_XVMCLIB_LIBS="$XVMCLIB_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XVMCLIB_LIBS=`$PKG_CONFIG --libs "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux"`
+        else
+	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XVMCLIB_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                XVMC=no
+elif test $pkg_failed = untried; then
+	XVMC=no
+else
+	XVMCLIB_CFLAGS=$pkg_cv_XVMCLIB_CFLAGS
+	XVMCLIB_LIBS=$pkg_cv_XVMCLIB_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	XVMC=yes
+fi
+fi
+{ $as_echo "$as_me:$LINENO: checking whether to include XvMC support" >&5
+$as_echo_n "checking whether to include XvMC support... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $XVMC" >&5
+$as_echo "$XVMC" >&6; }
+
+
+if test x$XVMC = xyes; then
+  XVMC_TRUE=
+  XVMC_FALSE='#'
+else
+  XVMC_TRUE='#'
+  XVMC_FALSE=
+fi
+
+if test "$XVMC" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_XVMC 1
+_ACEOF
+
+fi
+
+
+
+if test x$KMS_ONLY = xyes; then
+  KMS_ONLY_TRUE=
+  KMS_ONLY_FALSE='#'
+else
+  KMS_ONLY_TRUE='#'
+  KMS_ONLY_FALSE=
+fi
+
+if test "$KMS_ONLY" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define KMS_ONLY 1
+_ACEOF
+
+fi
+
+
+
+DRIVER_NAME=intel
+
+
+
+
+if test x$XORG_SGML_PATH = x ; then
+    XORG_SGML_PATH=$prefix/share/sgml
+fi
+HAVE_DEFS_ENT=
+
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
+$as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'` = yes; then
+  HAVE_DEFS_ENT=yes
+fi
+
+fi
+
+# Extract the first word of "linuxdoc", so it can be a program name with args.
+set dummy linuxdoc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LINUXDOC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $LINUXDOC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LINUXDOC="$LINUXDOC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_LINUXDOC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LINUXDOC=$ac_cv_path_LINUXDOC
+if test -n "$LINUXDOC"; then
+  { $as_echo "$as_me:$LINENO: result: $LINUXDOC" >&5
+$as_echo "$LINUXDOC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "ps2pdf", so it can be a program name with args.
+set dummy ps2pdf; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PS2PDF+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PS2PDF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PS2PDF=$ac_cv_path_PS2PDF
+if test -n "$PS2PDF"; then
+  { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5
+$as_echo "$PS2PDF" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether to build documentation" >&5
+$as_echo_n "checking whether to build documentation... " >&6; }
+
+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
+   BUILDDOC=yes
+else
+   BUILDDOC=no
+fi
+
+
+
+if test x$BUILDDOC = xyes; then
+  BUILD_LINUXDOC_TRUE=
+  BUILD_LINUXDOC_FALSE='#'
+else
+  BUILD_LINUXDOC_TRUE='#'
+  BUILD_LINUXDOC_FALSE=
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $BUILDDOC" >&5
+$as_echo "$BUILDDOC" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether to build pdf documentation" >&5
+$as_echo_n "checking whether to build pdf documentation... " >&6; }
+
+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
+   BUILDPDFDOC=yes
+else
+   BUILDPDFDOC=no
+fi
+
+
+
+if test x$BUILDPDFDOC = xyes; then
+  BUILD_PDFDOC_TRUE=
+  BUILD_PDFDOC_FALSE='#'
+else
+  BUILD_PDFDOC_TRUE='#'
+  BUILD_PDFDOC_FALSE=
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5
+$as_echo "$BUILDPDFDOC" >&6; }
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_PDF="$PS2PDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC  -B html --split=0"
+
+
+
+
+
+
+
+ac_config_files="$ac_config_files Makefile uxa/Makefile src/Makefile src/xvmc/Makefile src/xvmc/shader/Makefile src/xvmc/shader/mc/Makefile src/xvmc/shader/vld/Makefile src/bios_reader/Makefile src/ch7017/Makefile src/ch7xxx/Makefile src/ivch/Makefile src/reg_dumper/Makefile src/sil164/Makefile src/tfp410/Makefile man/Makefile src/render_program/Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_GEN4ASM_TRUE}" && test -z "${HAVE_GEN4ASM_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GEN4ASM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_GEN4ASM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_XEXTPROTO_71_TRUE}" && test -z "${HAVE_XEXTPROTO_71_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XEXTPROTO_71\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_XEXTPROTO_71\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${DRI_TRUE}" && test -z "${DRI_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"DRI\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"DRI\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${VIDEO_DEBUG_TRUE}" && test -z "${VIDEO_DEBUG_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"VIDEO_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${XVMC_TRUE}" && test -z "${XVMC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"XVMC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"XVMC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${KMS_ONLY_TRUE}" && test -z "${KMS_ONLY_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"KMS_ONLY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"KMS_ONLY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_LINUXDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_PDFDOC_TRUE}" && test -z "${BUILD_PDFDOC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PDFDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_PDFDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by xf86-video-intel $as_me 2.9.1, which was
+generated by GNU Autoconf 2.62.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet      do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+xf86-video-intel config.status 2.9.1
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "uxa/Makefile") CONFIG_FILES="$CONFIG_FILES uxa/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/xvmc/Makefile") CONFIG_FILES="$CONFIG_FILES src/xvmc/Makefile" ;;
+    "src/xvmc/shader/Makefile") CONFIG_FILES="$CONFIG_FILES src/xvmc/shader/Makefile" ;;
+    "src/xvmc/shader/mc/Makefile") CONFIG_FILES="$CONFIG_FILES src/xvmc/shader/mc/Makefile" ;;
+    "src/xvmc/shader/vld/Makefile") CONFIG_FILES="$CONFIG_FILES src/xvmc/shader/vld/Makefile" ;;
+    "src/bios_reader/Makefile") CONFIG_FILES="$CONFIG_FILES src/bios_reader/Makefile" ;;
+    "src/ch7017/Makefile") CONFIG_FILES="$CONFIG_FILES src/ch7017/Makefile" ;;
+    "src/ch7xxx/Makefile") CONFIG_FILES="$CONFIG_FILES src/ch7xxx/Makefile" ;;
+    "src/ivch/Makefile") CONFIG_FILES="$CONFIG_FILES src/ivch/Makefile" ;;
+    "src/reg_dumper/Makefile") CONFIG_FILES="$CONFIG_FILES src/reg_dumper/Makefile" ;;
+    "src/sil164/Makefile") CONFIG_FILES="$CONFIG_FILES src/sil164/Makefile" ;;
+    "src/tfp410/Makefile") CONFIG_FILES="$CONFIG_FILES src/tfp410/Makefile" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "src/render_program/Makefile") CONFIG_FILES="$CONFIG_FILES src/render_program/Makefile" ;;
+
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    "$ac_file" | "$ac_file":* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
  ;;
 
   esac
@@ -17255,7 +24877,7 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/configure.ac new/xsrc/external/mit/xf86-video-intel/dist/configure.ac
--- old/xsrc/external/mit/xf86-video-intel/dist/configure.ac	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/configure.ac	2011-02-08 11:14:00.000000000 +0100
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.7.1,
+        2.9.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
 
@@ -30,20 +30,26 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], 
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-DOLT
 AC_PROG_CC
 AM_PROG_CC_C_O
 
-AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no)
+PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
 
+AC_HEADER_STDC
 AC_CHECK_HEADERS(sys/mman.h)
 AC_CHECK_FUNCS(mprotect)
 
@@ -65,44 +71,36 @@ AC_ARG_ENABLE(video-debug, AC_HELP_STRIN
               [VIDEO_DEBUG="$enableval"],
               [VIDEO_DEBUG=no])
 
-AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE],
-					  [Path to X server source tree]),
-			   [ XSERVER_SOURCE="$withval" ],
-			   [ XSERVER_SOURCE="" ])
-
 AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
-                                  [Disable XvMC support [[default=auto]]]),
+                                  [Disable XvMC support [[default=yes]]]),
               [XVMC="$enableval"],
-              [XVMC=auto])
+              [XVMC=yes])
+
+AC_ARG_ENABLE(kms-only, AC_HELP_STRING([--enable-kms-only],
+                                  [Assume KMS support [[default=no]]]),
+              [KMS_ONLY="$enableval"],
+              [KMS_ONLY=no])
 
 # Checks for extensions
-XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
-
-PKG_CHECK_MODULES(SERVER_1_5, [xorg-server >= 1.5],
-			      [SERVER_1_5=yes], [SERVER_1_5=no])
-
-if test "$SERVER_1_5" = yes; then
-   AC_DEFINE(SERVER_1_5, 1, [Building against server 1.5])
-fi
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.11])
+PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+                  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-drm_cflags=$(pkg-config --cflags libdrm)
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_HEADER_STDC
 
 save_CFLAGS="$CFLAGS"
-CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
-CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
+CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
 AC_MSG_CHECKING([whether to include DRI support])
 if test x$DRI != xno; then
         AC_CHECK_FILE([${sdkdir}/dri.h],
@@ -123,90 +121,8 @@ if test x$DRI = xauto; then
         fi
 fi
 AC_MSG_RESULT([$DRI])
+CFLAGS="$save_CFLAGS $DEBUGFLAGS"
 
-AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
-AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-	      [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
-	      [#include "xorg-server.h"])
-CFLAGS="$save_CFLAGS"
-
-if test x$XSERVER_LIBPCIACCESS = xyes; then
-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
-else
-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
-				       have_libpciaccess=yes,
-				       have_libpciaccess=no)
-fi
-AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AM_CONDITIONAL(LIBPCIACCESS,
-	test "x$XSERVER_LIBPCIACCESS" = xyes -o "x$have_libpciaccess" = xyes)
-AM_CONDITIONAL(XMODES, test "x$XMODES" = xno)
-
-if test "x$XSERVER_SOURCE" = x; then
-	if test -d ../../xserver; then
-		XSERVER_SOURCE="`cd ../../xserver && pwd`"
-	fi
-fi
-	
-if test -d "$XSERVER_SOURCE"; then
-	case "$XSERVER_SOURCE" in
-	/*)
-		;;
-	*)
-		XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`"
-		;;
-	esac
-	if test -f $srcdir/src/modes/xf86Modes.h; then
-		:
-	else
-		ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes
-	fi
-	
-	if test -f $srcdir/src/parser/xf86Parser.h; then
-		:
-	else
-		ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser
-	fi
-fi
-
-if test "x$XMODES" = xyes; then
-	AC_MSG_NOTICE([X server has new mode code])
-	AC_DEFINE(XMODES, 1,[X server has built-in mode code])
-	XMODES_CFLAGS=
-else
-	if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then
-		AC_MSG_NOTICE([X server is missing new mode code, using local copy])
-	else
-		AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source])
-	fi
-	XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser'
-fi
-
-AC_SUBST([XMODES_CFLAGS])
-
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-
-AC_CHECK_DECL(xf86RotateFreeShadow,
-	      [AC_DEFINE(HAVE_FREE_SHADOW, 1, [have new FreeShadow API])],
-	      [],
-	      [#include <xorg-server.h>
-	       #include <windowstr.h>
-	       #include <xf86Crtc.h>])
-	     
-CPPFLAGS="$SAVE_CPPFLAGS"
-
-dnl Use lots of warning flags with GCC
-
-WARN_CFLAGS=""
-
-if test "x$GCC" = "xyes"; then
-	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing"
-fi
-
-PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.6])
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
         PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
@@ -214,48 +130,33 @@ if test "$DRI" = yes; then
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
 fi
 
-dnl Server 1.5's set_mode_major required for DRM_MODE.
-PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5],
-		 [DRM_MODE=yes], [DRM_MODE=no])
-if test "x$DRM_MODE" = xyes; then
-	AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
-fi
-
 AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
 if test "$VIDEO_DEBUG" = yes; then
 	AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
 fi
 
-if test "$XVMC" = auto; then
-	XVMC="$DRI"
-fi
-if test "$XVMC" = yes && test "$DRI" = no; then
-	AC_MSG_ERROR([XvMC can't be enabled without DRI])
-fi
 if test "$XVMC" = yes; then
-	PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no])
-	PKG_CHECK_MODULES(XEXT, [xext])
+	PKG_CHECK_MODULES(XVMCLIB,
+			  [xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux],
+			  [XVMC=yes], [XVMC=no])
 fi
 AC_MSG_CHECKING([whether to include XvMC support])
 AC_MSG_RESULT([$XVMC])
 AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
 if test "$XVMC" = yes; then
 	AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
-    	AC_SUBST([XVMCLIB_CFLAGS])
+fi
+
+AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes)
+if test "$KMS_ONLY" = yes; then
+	AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
 fi
 
 AC_SUBST([DRI_CFLAGS])
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([WARN_CFLAGS])
-AC_SUBST([moduledir])
 
 DRIVER_NAME=intel
 AC_SUBST([DRIVER_NAME])
-
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1.3)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
+AC_SUBST([moduledir])
 
 XORG_CHECK_LINUXDOC
 
@@ -264,6 +165,9 @@ AC_OUTPUT([
 	uxa/Makefile
 	src/Makefile
 	src/xvmc/Makefile
+	src/xvmc/shader/Makefile
+	src/xvmc/shader/mc/Makefile
+	src/xvmc/shader/vld/Makefile
 	src/bios_reader/Makefile
 	src/ch7017/Makefile
 	src/ch7xxx/Makefile
@@ -272,4 +176,5 @@ AC_OUTPUT([
 	src/sil164/Makefile
 	src/tfp410/Makefile
 	man/Makefile
+	src/render_program/Makefile
 ])
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/COPYING new/xsrc/external/mit/xf86-video-intel/dist/COPYING
--- old/xsrc/external/mit/xf86-video-intel/dist/COPYING	2008-08-02 07:12:26.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/COPYING	2011-02-08 11:14:00.000000000 +0100
@@ -1,12 +1,165 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas.
+All Rights Reserved.
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Copyright (c) 2005 Jesse Barnes <jbarnes@virtuousgeek.org>
+Copyright © 2002 David Dawes
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Copyright © 2006 Intel Corporation
+Copyright © 2006,2010 Intel Corporation
+Copyright © 2007 Intel Corporation
+Copyright © 2008 Intel Corporation
+Copyright © 2009 Intel Corporation
+Copyright © 2007 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Alan Hourihane makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2000 Intel Corporation.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Copyright 2001 VA Linux Systems Inc., Fremont, California.
+Copyright © 2002 by David Dawes
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Copyright © 1999 Keith Packard
+Copyright ® 2001 Keith Packard
+Copyright © 2000, 2008 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 
-http://lists.freedesktop.org/mailman/listinfo/xorg
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/depcomp new/xsrc/external/mit/xf86-video-intel/dist/depcomp
--- old/xsrc/external/mit/xf86-video-intel/dist/depcomp	2008-08-02 07:12:27.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/depcomp	2011-02-08 11:14:00.000000000 +0100
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2007-03-29.01
+scriptversion=2005-07-09.11
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -92,20 +91,7 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -215,39 +201,34 @@ aix)
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
   if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    rm -f "$tmpdepfile"
     exit $stat
   fi
 
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
   if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -295,46 +276,6 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -347,13 +288,13 @@ tru64)
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
+      # static library.  This mecanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
+      # compilations output dependencies in in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/install-sh new/xsrc/external/mit/xf86-video-intel/dist/install-sh
--- old/xsrc/external/mit/xf86-video-intel/dist/install-sh	2008-08-02 07:12:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/install-sh	2011-02-08 11:14:00.000000000 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,68 +39,38 @@ scriptversion=2006-12-25.00
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit="${DOITPROG-}"
 
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
+# put in absolute paths if you don't have them in your path; or use env. vars.
 
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
 
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
+chmodcmd="$chmodprog 0755"
 chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
+chgrpcmd=
 stripcmd=
-
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
 src=
 dst=
 dir_arg=
-dst_arg=
-
-copy_on_change=false
+dstarg=
 no_target_directory=
 
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -110,86 +80,81 @@ In the 2nd and 3rd, copy all SRCFILES to
 In the 4th, create DIRECTORIES.
 
 Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 
-while test $# -ne 0; do
+while test -n "$1"; do
   case $1 in
-    -c) ;;
+    -c) shift
+        continue;;
 
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
+    -d) dir_arg=true
+        shift
+        continue;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift
+        shift
+        continue;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
 	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
   esac
-  shift
 done
 
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
+if test -z "$1"; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -199,47 +164,24 @@ if test $# -eq 0; then
   exit 0
 fi
 
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src;;
+    -*) src=./$src ;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
+    src=
 
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -248,199 +190,71 @@ do
       exit 1
     fi
 
-    if test -z "$dst_arg"; then
+    if test -z "$dstarg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dst_arg
+    dst=$dstarg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst;;
+      -*) dst=./$dst ;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
+	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
       fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
+      dst=$dst/`basename "$src"`
     fi
   fi
 
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
+  # Make sure that the destination directory exists.
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
 
-      prefixes=
+    pathcomp=
 
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
       fi
-    fi
+      pathcomp=$pathcomp/
+    done
   fi
 
   if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
   else
+    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -448,9 +262,10 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+    $doit $cpprog "$src" "$dsttmp" &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -458,59 +273,48 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
 done
 
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/ltmain.sh new/xsrc/external/mit/xf86-video-intel/dist/ltmain.sh
--- old/xsrc/external/mit/xf86-video-intel/dist/ltmain.sh	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/ltmain.sh	2011-02-08 11:14:00.000000000 +0100
@@ -1,83 +1,52 @@
-# Generated from ltmain.m4sh.
-
-# ltmain.sh (GNU libtool) 2.2.6
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008  Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
+# This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
-#
-# MODE must be one of the following:
-#
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
-TIMESTAMP=""
-package_revision=1.3012
+VERSION=1.5.26
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
-# Be Bourne compatible
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -91,261 +60,104 @@ fi
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
-# NLS nuisances: We save the old values to restore during execute mode.
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell, and then maybe $echo will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  SP2NL='tr \040 \012'
+  NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  SP2NL='tr \100 \n'
+  NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+# NLS nuisances.
 # Only set LANG and LC_ALL to C if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-lt_user_locale=
-lt_safe_locale=
+# We save the old values to restore during execute mode.
+lt_env=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
+	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+	  $lt_var=C
 	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
 
-$lt_unset CDPATH
-
-
-
-
-
-: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SED="/bin/sed"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
+fi
 
 # Make sure IFS has a sensible default
 lt_nl='
 '
 IFS=" 	$lt_nl"
 
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-# Generated shell functions inserted here.
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=:
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname${mode+: }$mode: $*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  $echo "$modename: not configured to build any kind of library" 1>&2
+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit $EXIT_FAILURE
+fi
 
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+duplicate_deps=no
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
 
 # func_mktempdir [string]
 # Make a temporary directory that won't clash with other running
@@ -355,7 +167,7 @@ func_mktempdir ()
 {
     my_template="${TMPDIR-/tmp}/${1-$progname}"
 
-    if test "$opt_dry_run" = ":"; then
+    if test "$run" = ":"; then
       # Return a directory name, but don't create it in dry-run mode
       my_tmpdir="${my_template}-$$"
     else
@@ -364,784 +176,523 @@ func_mktempdir ()
       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
 
       if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
+	# Failing that, at least try and use $RANDOM to avoid a race
+	my_tmpdir="${my_template}-${RANDOM-0}$$"
 
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
+	save_mktempdir_umask=`umask`
+	umask 0077
+	$mkdir "$my_tmpdir"
+	umask $save_mktempdir_umask
       fi
 
       # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+      test -d "$my_tmpdir" || {
+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+	exit $EXIT_FAILURE
+      }
     fi
 
-    $ECHO "X$my_tmpdir" | $Xsed
+    $echo "X$my_tmpdir" | $Xsed
 }
 
 
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
 {
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 | \
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
     esac
+    ;;
+  esac
+  $echo $win32_libid_type
 }
 
 
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
 {
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	case $arg in
+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
       *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	    # Double-quote args containing other shell metacharacters.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    CC_quoted="$CC_quoted $arg"
+	  done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
 }
 
 
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+      exit $EXIT_FAILURE
     fi
 }
 
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+    my_status=""
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
+    $show "${rm}r $my_gentop"
+    $run ${rm}r "$my_gentop"
+    $show "$mkdir $my_gentop"
+    $run $mkdir "$my_gentop"
+    my_status=$?
+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+      exit $my_status
     fi
-}
-
-
 
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $SED -n '/^# Usage:/,/# -h/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    $ECHO
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help
-# Echo long help message to standard output and exit.
-func_help ()
-{
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
-     }' < "$progpath"
-    exit $?
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    func_error "missing argument for $1"
-    exit_cmd=exit
+      $show "${rm}r $my_xdir"
+      $run ${rm}r "$my_xdir"
+      $show "$mkdir $my_xdir"
+      $run $mkdir "$my_xdir"
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+	exit $exit_status
+      fi
+      case $host in
+      *-darwin*)
+	$show "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	if test -z "$run"; then
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+	  if test -n "$darwin_arches"; then 
+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      lipo -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    ${rm}r unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd "$darwin_orig_dir"
+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	fi # $run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+        ;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+    func_extract_archives_result="$my_oldobjs"
 }
+# End of Shell function definitions
+#####################################
 
-exit_cmd=:
-
-
-
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
 
+disable_libs=no
 
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
+# Parse our command line options once, thoroughly.
+while test "$#" -gt 0
+do
+  arg="$1"
   shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-# $mode is unset
-nonopt=
-execute_dlfiles=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
+  case $arg in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case $prev in
+    execute_dlfiles)
+      execute_dlfiles="$execute_dlfiles $arg"
+      ;;
+    tag)
+      tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
+
+      # Check whether tagname contains only valid characters
+      case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+	$echo "$progname: invalid tag name: $tagname" 1>&2
+	exit $EXIT_FAILURE
+	;;
+      esac
 
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
+      case $tagname in
+      CC)
+	# Don't test for the "default" C tag, as we know, it's there, but
+	# not specially marked.
+	;;
+      *)
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+	  taglist="$taglist $tagname"
+	  # Evaluate the configuration.
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+	else
+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+	fi
+	;;
+      esac
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
 
+    prev=
+    prevopt=
+    continue
+  fi
 
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
+  # Have we seen a non-optional argument yet?
+  case $arg in
+  --help)
+    show_help=yes
+    ;;
 
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+  --version)
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2008  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    exit $?
+    ;;
 
+  --config)
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
     done
-
     exit $?
-}
+    ;;
 
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    $ECHO "host: $host"
+  --debug)
+    $echo "$progname: enabling shell trace mode"
+    set -x
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    $echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
+      $echo "enable shared libraries"
     else
-      $ECHO "disable shared libraries"
+      $echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
+      $echo "enable static libraries"
     else
-      $ECHO "disable static libraries"
+      $echo "disable static libraries"
     fi
-
     exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
+    ;;
 
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
+  --finish) mode="finish" ;;
 
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
+  --preserve-dup-deps) duplicate_deps="yes" ;;
 
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
+  --quiet | --silent)
+    show=:
+    preserve_args="$preserve_args $arg"
     ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
+
+  --tag)
+    prevopt="--tag"
+    prev=tag
+    preserve_args="$preserve_args --tag"
     ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
+  --tag=*)
+    set tag "$optarg" ${1+"$@"}
+    shift
+    prev=tag
+    preserve_args="$preserve_args --tag"
     ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
     ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit $EXIT_FAILURE
     ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
+
+  *)
+    nonopt="$arg"
+    break
     ;;
   esac
+done
 
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+fi
 
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
+case $disable_libs in
+no) 
+  ;;
+shared)
+  build_libtool_libs=no
+  build_old_libs=yes
+  ;;
+static)
+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+  ;;
+esac
 
-      *)		nonopt="$opt"
-			break
-			;;
-    esac
-  done
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
 
+if test -z "$show_help"; then
 
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+    case $nonopt in
+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+      mode=link
+      for arg
+      do
+	case $arg in
+	-c)
+	   mode=compile
+	   break
+	   ;;
+	esac
+      done
       ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+    *db | *dbx | *strace | *truss)
+      mode=execute
       ;;
-  esac
-
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
 
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+	if test -n "$nonopt"; then
+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
       fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
+      ;;
+    esac
   fi
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-
-
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
-
-
   # Only execute mode is allowed to have -dlopen flags.
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
     exit $EXIT_FAILURE
   fi
 
   # Change the help message to a mode-specific one.
   generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
+  help="Try \`$modename --help --mode=$mode' for more information."
 
+  # These modes are in order of execution frequency so that they run quickly.
+  case $mode in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
 
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
 
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
 
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  if test -n "$libobj" ; then
+	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  arg_mode=target
+	  continue
+	  ;;
 
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
-	    done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
+	-static | -prefer-pic | -prefer-non-pic)
 	  later="$later $arg"
 	  continue
 	  ;;
@@ -1157,25 +708,31 @@ func_mode_compile ()
 	  ;;            #  replaced later.  I would guess that would be a bug.
 
 	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
+	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
 	  lastarg=
 	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
+ 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+
+	    # Double-quote args containing other shell metacharacters.
+	    # Many Bourne shells cannot handle close brackets correctly
+	    # in scan sets, so we specify it separately.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    lastarg="$lastarg $arg"
 	  done
 	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
+	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
 
 	  # Add the arguments to base_compile.
 	  base_compile="$base_compile $lastarg"
 	  continue
 	  ;;
 
-	*)
+	* )
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
@@ -1187,42 +744,66 @@ func_mode_compile ()
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      case $lastarg in
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
+      # in scan sets (worked around with variable expansion),
+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
+      # at all, so we specify them separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	lastarg="\"$lastarg\""
+	;;
+      esac
+
+      base_compile="$base_compile $lastarg"
     done # for arg
 
     case $arg_mode in
     arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
+      $echo "$modename: you must specify an argument for -Xcompile"
+      exit $EXIT_FAILURE
       ;;
     target)
-      func_fatal_error "you must specify a target with \`-o'"
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit $EXIT_FAILURE
       ;;
     *)
       # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
       ;;
     esac
 
     # Recognize several different file suffixes.
     # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSifmso]'
     case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.ii) xform=ii ;;
+    *.class) xform=class ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
+    *.for) xform=for ;;
+    *.java) xform=java ;;
+    *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
     case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
     *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit $EXIT_FAILURE
       ;;
     esac
 
@@ -1230,15 +811,7 @@ func_mode_compile ()
 
     for arg in $later; do
       case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
       -static)
-	build_libtool_libs=no
 	build_old_libs=yes
 	continue
 	;;
@@ -1255,17 +828,28 @@ func_mode_compile ()
       esac
     done
 
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+    case $qlibobj in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qlibobj="\"$qlibobj\"" ;;
+    esac
+    test "X$libobj" != "X$qlibobj" \
+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$xdir" = "X$obj"; then
+      xdir=
+    else
+      xdir=$xdir/
+    fi
     lobj=${xdir}$objdir/$objname
 
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
     # Delete any leftover library objects.
     if test "$build_old_libs" = yes; then
@@ -1274,9 +858,12 @@ func_mode_compile ()
       removelist="$lobj $libobj ${libobj}T"
     fi
 
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
+    cygwin* | mingw* | pw32* | os2*)
       pic_mode=default
       ;;
     esac
@@ -1288,8 +875,10 @@ func_mode_compile ()
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -1299,13 +888,13 @@ func_mode_compile ()
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+	$show "Waiting for $lockfile to be removed"
 	sleep 2
       done
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
-	$ECHO "\
+	$echo "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -1316,22 +905,34 @@ repeat this compilation, it may succeed,
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$opt_dry_run || $RM $removelist
+	$run $rm $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
+      $echo "$srcfile" > "$lockfile"
     fi
 
-    $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+    case $qsrcfile in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      qsrcfile="\"$qsrcfile\"" ;;
+    esac
+
+    $run $rm "$libobj" "${libobj}T"
+
+    # Create a libtool object file (analogous to a ".la" file),
+    # but don't create it if we're doing a dry run.
+    test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
 
     # Only build a PIC object if we are building libtool libraries.
     if test "$build_libtool_libs" = yes; then
@@ -1345,19 +946,32 @@ compiler."
 	command="$base_compile $qsrcfile"
       fi
 
-      func_mkdir_p "$xdir$objdir"
+      if test ! -d "${xdir}$objdir"; then
+	$show "$mkdir ${xdir}$objdir"
+	$run $mkdir ${xdir}$objdir
+	exit_status=$?
+	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+	  exit $exit_status
+	fi
+      fi
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
 	command="$command -o $lobj"
       fi
 
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+      $run $rm "$lobj" "$output_obj"
+
+      $show "$command"
+      if $run eval $lt_env "$command"; then :
+      else
+	test -n "$output_obj" && $run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
 
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
+	$echo "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -1371,27 +985,45 @@ repeat this compilation, it may succeed,
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$opt_dry_run || $RM $removelist
+	$run $rm $removelist
 	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+	$show "$mv $output_obj $lobj"
+	if $run $mv $output_obj $lobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
       fi
 
+      # Append the name of the PIC object to the libtool object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
+
+EOF
+
       # Allow error messages only from the first compilation.
       if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
+        suppress_output=' >/dev/null 2>&1'
       fi
+    else
+      # No PIC object so indicate it doesn't exist in the libtool
+      # object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
+
+EOF
     fi
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
+	command="$base_compile $qsrcfile"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
@@ -1401,12 +1033,17 @@ compiler."
 
       # Suppress compiler output if we already did a PIC compilation.
       command="$command$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+      $run $rm "$obj" "$output_obj"
+      $show "$command"
+      if $run eval $lt_env "$command"; then :
+      else
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
 
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
+	$echo "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -1420,6784 +1057,5463 @@ repeat this compilation, it may succeed,
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$opt_dry_run || $RM $removelist
+	$run $rm $removelist
 	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+	$show "$mv $output_obj $obj"
+	if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
       fi
+
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+    else
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
     fi
 
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+    $run $mv "${libobj}T" "${libobj}"
 
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $run $rm "$lockfile"
+    fi
 
     exit $EXIT_SUCCESS
-}
+    ;;
 
-$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
-}
+  # libtool link mode
+  link | relink)
+    modename="$modename: link"
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
 
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args="$nonopt"
+    base_compile="$nonopt $@"
+    compile_command="$nonopt"
+    finalize_command="$nonopt"
 
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
 
-Remove files from the build directory.
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    notinst_path= # paths that contain not-installed libtool libraries
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    single_module="${wl}-single_module"
 
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
+    func_infer_tag $base_compile
 
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
 
-Complete the installation of libtool libraries.
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
-Each LIBDIR is a directory that contains libtool libraries.
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+	;;
+      *) qarg=$arg ;;
+      esac
+      libtool_args="$libtool_args $qarg"
 
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  ;;
+	esac
 
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  if test ! -f "$arg"; then
+	    $echo "$modename: symbol file \`$arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat $save_arg`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
 
-Install executables or libraries.
+	      # Check to see that this really is a libtool object.
+	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		pic_object=
+		non_pic_object=
 
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
+		# Read the .lo file
+		# If there is no directory component, then add one.
+		case $arg in
+		*/* | *\\*) . $arg ;;
+		*) . ./$arg ;;
+		esac
 
-The following components of INSTALL-COMMAND are treated specially:
+		if test -z "$pic_object" || \
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none && \
+		   test "$non_pic_object" = none; then
+		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+		  exit $EXIT_FAILURE
+		fi
 
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+		# Extract subdirectory from the argument.
+		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		if test "X$xdir" = "X$arg"; then
+		  xdir=
+		else
+		  xdir="$xdir/"
+		fi
 
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
 
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
 
-Link object files or libraries together to form another library, or to
-create an executable program.
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
 
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
+		  # A PIC object.
+		  libobjs="$libobjs $pic_object"
+		  arg="$pic_object"
+		fi
 
-The following components of LINK-COMMAND are treated specially:
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
 
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
+		  # A standard non-PIC object
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if test -z "$run"; then
+		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+		  exit $EXIT_FAILURE
+		else
+		  # Dry-run case.
 
-All other options (arguments beginning with \`-') are ignored.
+		  # Extract subdirectory from the argument.
+		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		  if test "X$xdir" = "X$arg"; then
+		    xdir=
+		  else
+		    xdir="$xdir/"
+		  fi
 
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+		  libobjs="$libobjs $pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      fi
+	    done
+	  else
+	    $echo "$modename: link input file \`$save_arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  compile_command="$compile_command $wl$qarg"
+	  finalize_command="$finalize_command $wl$qarg"
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	shrext)
+  	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	darwin_framework|darwin_framework_skip)
+	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  prev=
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
 
-Remove libraries from an installation directory.
+      prevarg="$arg"
 
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
 
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
 
-      *)
-        func_fatal_help "invalid operation mode \`$mode'"
-        ;;
-    esac
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
 
-    $ECHO
-    $ECHO "Try \`$progname --help' for more information about other modes."
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
 
-    exit $?
-}
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
 
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
 
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+	  exit $EXIT_FAILURE
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
 
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
+      -framework|-arch|-isysroot)
+	case " $CC " in
+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
+		prev=darwin_framework_skip ;;
+	  *) compiler_flags="$compiler_flags $arg"
+	     prev=darwin_framework ;;
+	esac
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+	continue
+	;;
 
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
 
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  ;;
+	esac
+	continue
+	;;
 
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
+      -L*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  if test -z "$absdir"; then
+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+	    absdir="$dir"
+	    notinst_path="$notinst_path $dir"
+	  fi
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
 
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs -framework System"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
 	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
 
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      -model)
+	compile_command="$compile_command $arg"
+	compiler_flags="$compiler_flags $arg"
+	finalize_command="$finalize_command $arg"
+	prev=xcompiler
+	continue
 	;;
 
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+	deplibs="$deplibs $arg"
+	continue
 	;;
 
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+      -multi_module)
+	single_module="${wl}-multi_module"
 	continue
 	;;
-      esac
 
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
+      -module)
+	module=yes
+	continue
+	;;
 
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m* pass through architecture-specific compiler args for GCC
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+        compile_command="$compile_command $arg"
+        finalize_command="$finalize_command $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
 
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
+      -shrext)
+	prev=shrext
+	continue
 	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
 
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
 
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
 
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
 
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
+      -objectlist)
+	prev=objectlist
+	continue
 	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-}
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+      -o) prev=output ;;
 
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
 
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
+      -release)
+	prev=release
+	continue
+	;;
 
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+      -rpath)
+	prev=rpath
+	continue
+	;;
 
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
+      -R)
+	prev=xrpath
 	continue
-      fi
+	;;
 
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
+      -R*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
 	esac
+	continue
 	;;
-      -g | -m | -o)
-	prev=$arg
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
 	;;
-      -s)
-	stripme=" -s"
+
+      -thread-safe)
+	thread_safe=yes
 	continue
 	;;
-      -*)
+
+      -version-info)
+	prev=vinfo
+	continue
 	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
 	;;
-      esac
 
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
-    done
+      -Wc,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
 
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
+      -Wl,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $wl$flag"
+	  linker_flags="$linker_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
 
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
 
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
 
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
 
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
 	  ;;
 	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
+	;;
 
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
 	;;
 
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
+      *.lo)
+	# A libtool-controlled object.
 
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
+	# Check to see that this really is a libtool object.
+	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  pic_object=
+	  non_pic_object=
 
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  # Read the .lo file
+	  # If there is no directory component, then add one.
+	  case $arg in
+	  */* | *\\*) . $arg ;;
+	  *) . ./$arg ;;
 	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
 
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+	  if test -z "$pic_object" || \
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none && \
+	     test "$non_pic_object" = none; then
+	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	  # Extract subdirectory from the argument.
+	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$xdir" = "X$arg"; then
+	    xdir=
+ 	  else
+	    xdir="$xdir/"
 	  fi
 
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
 
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
 
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
 
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	    # A PIC object.
+	    libobjs="$libobjs $pic_object"
+	    arg="$pic_object"
 	  fi
 
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
 	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if test -z "$run"; then
+	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+	    exit $EXIT_FAILURE
+	  else
+	    # Dry-run case.
 
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
+	    # Extract subdirectory from the argument.
+	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	    if test "X$xdir" = "X$arg"; then
+	      xdir=
+	    else
+	      xdir="$xdir/"
+	    fi
 
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+	    libobjs="$libobjs $pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
+	fi
+	;;
 
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
 	;;
 
-      *.lo)
-	# Install (i.e. copy) a libtool object.
+      *.la)
+	# A libtool-controlled library.
 
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
 	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  deplibs="$deplibs $arg"
 	fi
+	continue
+	;;
 
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
 	  ;;
 	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
 	;;
+      esac # arg
 
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done # argument parsing loop
 
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
+    fi
 
-	  func_source "$wrapper"
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
 
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$output_objdir" = "X$output"; then
+      output_objdir="$objdir"
     else
-      exit $EXIT_SUCCESS
+      output_objdir="$output_objdir/$objdir"
     fi
-}
-
-test "$mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
+    # Create the object directory.
+    if test ! -d "$output_objdir"; then
+      $show "$mkdir $output_objdir"
+      $run $mkdir $output_objdir
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+	exit $exit_status
       fi
     fi
 
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
+    # Determine the type of output
+    case $output in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+    case $host in
+    *cygwin* | *mingw* | *pw32*)
+      # don't eliminate duplications in $postdeps and $predeps
+      duplicate_compiler_generated_deps=yes
+      ;;
+    *)
+      duplicate_compiler_generated_deps=$duplicate_deps
+      ;;
+    esac
+    specialdeplibs=
 
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
 	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
 
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    case $linkmode in
+    lib)
+	passes="conv link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
 	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
-	  esac
 	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
 	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
 	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
     esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
+    for pass in $passes; do
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
+	    compiler_flags="$compiler_flags $deplib"
+	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    continue
+	  fi
+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if (${SED} -e '2q' $lib |
+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		  library_names=
+		  old_library=
+		  case $lib in
+		  */* | *\\*) . $lib ;;
+		  *) . ./$lib ;;
+		  esac
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+		    test "X$ladir" = "X$lib" && ladir="."
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+	        ;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  *)
+	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    valid_a_lib=no
+	    case $deplibs_check_method in
+	      match_pattern*)
+		set dummy $deplibs_check_method
+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+		if eval $echo \"$deplib\" 2>/dev/null \
+		    | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		  valid_a_lib=yes
+		fi
+		;;
+	      pass_all)
+		valid_a_lib=yes
+		;;
+            esac
+	    if test "$valid_a_lib" != yes; then
+	      $echo
+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+	      $echo "*** I have the capability to make that library automatically link in when"
+	      $echo "*** you link to this library.  But I can only do this if you have a"
+	      $echo "*** shared version of the library, which you do not appear to have"
+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+	      $echo "*** that it is just a static archive that I should not used here."
+	    else
+	      $echo
+	      $echo "*** Warning: Linking the shared library $output against the"
+	      $echo "*** static library $deplib is not portable!"
+	      deplibs="$deplib $deplibs"
+	    fi
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
 
-    func_extract_archives_result="$my_oldobjs"
-}
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  exit $EXIT_FAILURE
+	fi
 
+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$ladir" = "X$lib" && ladir="."
 
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
 
-# func_emit_wrapper_part1 [arg=no]
-#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
-{
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
 
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
+	# Read the .la file
+	case $lib in
+	*/* | *\\*) . $lib ;;
+	*) . ./$lib ;;
+	esac
 
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	      exit $EXIT_FAILURE
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+	  continue
+	fi # $pass = conv
 
-relink_command=\"$relink_command\"
 
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$ECHO "\
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
 
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
 
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
 
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
+	fi # $installed = yes
+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-"
-}
-# end: func_emit_wrapper_part1
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
 
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part2_arg1=$1
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
 	fi
 
-	$ECHO "\
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
 
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
 
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
 
-    file=\"\$\$-\$program\"
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
 
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath " in
+	      *" $dir "*) ;;
+	      *" $absdir "*) ;;
+	      *) temp_rpath="$temp_rpath $absdir" ;;
+	      esac
+	    fi
 
-	  $ECHO "\
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
 
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
 	fi
 
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes ; then
+	  use_static_libs=no
 	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  if test "$installed" = no; then
+	    notinst_deplibs="$notinst_deplibs $lib"
+	    test -z "$DESTDIR" && need_relink=yes
+	  fi
+	  # This is a shared library
 
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
+	  # Warn about portability, can't link against -module's on
+	  # some systems (darwin)
+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+	    $echo
+	    if test "$linkmode" = prog; then
+	      $echo "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $echo "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
 
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    realname="$2"
+	    shift; shift
+	    libname=`eval \\$echo \"$libname_spec\"`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw*)
+		major=`expr $current - $age`
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
 
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
 
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      $show "extracting exported symbol list from \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$extract_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
 
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      $show "generating import library for \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$old_archive_from_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a module then we can not link against
+		    # it, someone is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null |
+                      $EGREP ": [^:]* bundle" >/dev/null ; then
+		      $echo "** Warning, lib $linklib is a module, not a shared library"
+		      if test -z "$old_library" ; then
+		        $echo
+		        $echo "** And there doesn't seem to be a static archive available"
+		        $echo "** The link will probably fail, sorry"
+		      else
+		        add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
 
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
+	    if test "$lib_linked" != yes; then
+	      $echo "$modename: configuration error: unsupported hardcode properties"
+	      exit $EXIT_FAILURE
+	    fi
 
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes && \
+		 test "$hardcode_minus_L" != yes && \
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
 
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat <<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-# define setmode _setmode
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
-#else
-# define LTWRAPPER_DEBUGPRINTF(args)
-#endif
-
-const char *program_name = NULL;
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-	    func_emit_wrapper_part1 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-	    cat <<EOF
-
-static const char *script_text_part2 =
-EOF
-	    func_emit_wrapper_part2 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-
-	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	        add="$inst_prefix_dir$libdir/$linklib"
+	      else
+	        add="$libdir/$linklib"
+	      fi
 	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
 	    fi
 
-	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
 
-	    if test "$fast_install" = yes; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    $echo
+	    $echo "*** Warning: This system can not link to static lib archive $lib."
+	    $echo "*** I have the capability to make that library automatically link in when"
+	    $echo "*** you link to this library.  But I can only do this if you have a"
+	    $echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      $echo "*** But as you try to build a module library, libtool will still create "
+	      $echo "*** a static module, that should work as long as the dlopening application"
+	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		$echo
+		$echo "*** However, this would only work if libtool was able to extract symbol"
+		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$echo "*** not find such a program.  So, this module is probably useless."
+		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
 	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
 
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
 
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
-
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
 
-  /* very simple arg parsing; don't want to rely on getopt */
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+		test "X$dir" = "X$deplib" && dir="."
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if grep "^installed=no" $deplib > /dev/null; then
+		  path="$absdir/$objdir"
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -z "$libdir"; then
+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		    exit $EXIT_FAILURE
+		  fi
+		  if test "$absdir" != "$libdir"; then
+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+		  fi
+		  path="$absdir"
+		fi
+		depdepl=
+		case $host in
+		*-*-darwin*)
+		  # we do not want to link against static libs,
+		  # but need to link against shared
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
+		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
+		    fi
+		    # do not add paths which are already there
+		    case " $newlib_search_path " in
+		    *" $path "*) ;;
+		    *) newlib_search_path="$newlib_search_path $path";;
+		    esac
+		  fi
+		  path=""
+		  ;;
+		*)
+		  path="-L$path"
+		  ;;
+		esac
+		;;
+	      -l*)
+		case $host in
+		*-*-darwin*)
+		  # Again, we only want to link against shared libraries
+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		  for tmp in $newlib_search_path ; do
+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
+		      break
+		    fi
+		  done
+		  path=""
+		  ;;
+		*) continue ;;
+		esac
 		;;
+	      *) continue ;;
 	      esac
-
-	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
-	  return 0;
-	}
-    }
-
-  newargz = XMALLOC (char *, argc + 1);
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	      case " $deplibs " in
+	      *" $depdepl "*) ;;
+	      *) deplibs="$depdepl $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
 	    esac
+	  done
+	  newlib_search_path=
+	fi
 
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argv[i][env_set_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argv[i][env_prepend_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argv[i][env_append_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-  for (i = 0; i < newargc; i++)
-    {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
 	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
 		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
 	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+      dlprefiles="$newdlprefiles"
+    fi
 
-	    cat <<"EOF"
-}
+    case $linkmode in
+    oldlib)
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
 
-  return p;
-}
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
 
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+      fi
 
-const char *
-base_name (const char *name)
-{
-  const char *base;
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+      fi
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
 
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
 
-int
-check_executable (const char *path)
-{
-  struct stat st;
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
 
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	if test "$module" = no; then
+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	fi
+	;;
+      esac
 
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+	  exit $EXIT_FAILURE
+	else
+	  $echo
+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+	  $echo "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
 
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
+      if test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+      fi
 
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
+      set dummy $rpath
+      if test "$#" -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
 
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
 
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+	fi
 
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
 
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
 
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
 
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
 
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
+	case $vinfo_number in
+	yes)
+	  number_major="$2"
+	  number_minor="$3"
+	  number_revision="$4"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows|none)
+	    current=`expr $number_major + $number_minor`
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    current=`expr $number_major + $number_minor`
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$2"
+	  revision="$3"
+	  age="$4"
+	  ;;
+	esac
 
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-	}
-    }
-  XFREE (tmp_pathspec);
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
 
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
 
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
 
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
+	if test "$age" -gt "$current"; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	fi
 
-  assert (str != NULL);
-  assert (pat != NULL);
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
 
-  len = strlen (str);
-  patlen = strlen (pat);
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  minor_current=`expr $current + 1`
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
 
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
 
-static void
-lt_error_core (int exit_status, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
 
-  if (exit_status >= 0)
-    exit (exit_status);
-}
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
 
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    iface=`expr $revision - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
 
-void
-lt_setenv (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
 
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
+	linux)
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  ;;
 
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
+	osf)
+	  major=.`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
 
-  p = strchr (arg, (int)'=');
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
 
-  if (!p)
-    return 1;
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
 
-  *value = xstrdup (++p);
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
 
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)[len - 1] = '\0';
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  major=`expr $current - $age`
+	  versuffix="-$major"
+	  ;;
 
-  return 0;
-}
+	*)
+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
 
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
 
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	else
+	  # XXX
+	  tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'`
+	  eval tmp2=\$${tmp}_ltversion
+	  if ! test -z "${SHARED_LIBS_LOG}"; then
+		  if ! test -f ${SHARED_LIBS_LOG}; then
+			  echo "# SHARED_LIBS+=	<libname>      <obsd version> # <orig version>" >${SHARED_LIBS_LOG}
+		  fi
+		  tmp4=`echo $libname|sed -e 's/^lib//'`
+		  printf "SHARED_LIBS +=\t%-20s %-8s # %s\n" "$tmp4" "$tmp2" "$versuffix" >>${SHARED_LIBS_LOG}
+	  fi
+	  if test -n "$versuffix" && test -n "$tmp2"; then
+	    versuffix=".$tmp2"
+	  fi
+	fi
 
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
-}
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+      fi
 
-void
-lt_opt_process_env_prepend (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-
-EOF
-}
-# end: func_emit_cwrapperexe_src
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$echo "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	         then
+		   continue
+		 fi
+	       fi
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	if test -n "$removelist"; then
+	  $show "${rm}r $removelist"
+	  $run ${rm}r $removelist
+	fi
+      fi
 
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
 
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
 
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
 
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
 	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
+      done
 
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
 	esac
+      done
 
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	    # these systems don't actually have a c library (as such)!
 	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs -framework System"
 	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+ 	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
 	    fi
-	    prev=
-	    continue
 	    ;;
 	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
+	fi
 
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $rm conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $rm conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      name=`expr $i : '-l\(.*\)'`
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+	        fi
+		if test -n "$i" ; then
+		  libname=`eval \\$echo \"$libname_spec\"`
+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		  set dummy $deplib_matches
+		  deplib_match=$2
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $echo
+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+		    $echo "*** I have the capability to make that library automatically link in when"
+		    $echo "*** you link to this library.  But I can only do this if you have a"
+		    $echo "*** shared version of the library, which I believe you do not have"
+		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
 		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      name=`expr $i : '-l\(.*\)'`
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
+		$rm conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval \\$echo \"$libname_spec\"`
+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		    set dummy $deplib_matches
+		    deplib_match=$2
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
 		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
+		      droppeddeps=yes
+		      $echo
+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+		      $echo "*** I have the capability to make that library automatically link in when"
+		      $echo "*** you link to this library.  But I can only do this if you have a"
+		      $echo "*** shared version of the library, which you do not appear to have"
+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
 		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
+		  droppeddeps=yes
+		  $echo
+		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $echo "*** make it link in!  You will probably need to install it or some"
+		  $echo "*** library that it depends on before this library will be fully"
+		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
 	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
+		newdeplibs="$newdeplibs $i"
 	      fi
 	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
 	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
 	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
+	file_magic*)
+	  set dummy $deplibs_check_method
+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name=`expr $a_deplib : '-l\(.*\)'`
+	    # If $name is empty we are operating on a -L argument.
+            if test "$name" != "" && test  "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null \
+			 | grep " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+			 | ${SED} 10q \
+			 | $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
 	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
+	match_pattern*)
+	  set dummy $deplibs_check_method
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name=`expr $a_deplib : '-l\(.*\)'`
+	    # If $name is empty we are operating on a -L argument.
+	    if test -n "$name" && test "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval $echo \"$potent_lib\" 2>/dev/null \
+		        | ${SED} 10q \
+		        | $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
 	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+	    -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	    done
+	  fi
+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+	    | grep . >/dev/null; then
+	    $echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    $echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
 	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  weak_libs="$weak_libs $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
 	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library is the System framework
+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
 	  ;;
 	esac
-      fi # test -n "$prev"
 
-      prevarg="$arg"
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    $echo
+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $echo "*** a static module, that should work as long as the dlopening"
+	    $echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      $echo
+	      $echo "*** However, this would only work if libtool was able to extract symbol"
+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $echo "*** not find such a program.  So, this module is probably useless."
+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    $echo "*** The inter-library dependencies that have been dropped here will be"
+	    $echo "*** automatically added whenever a program is linked with this library"
+	    $echo "*** or is declared to -dlopen it."
 
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
+	    if test "$allow_undefined" = no; then
+	      $echo
+	      $echo "*** Since this library must not contain undefined symbols,"
+	      $echo "*** because either the platform does not support them or"
+	      $echo "*** it was explicitly requested with -no-undefined,"
+	      $echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
 	fi
-	continue
-	;;
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
 
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
 
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
 
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
 
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
 
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
 
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
 	else
-	  prev=expsyms_regex
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
 	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
 
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  linknames="$linknames $link"
+	done
 
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 
-      -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      eval cmd=\"$cmd\"
+	      if len=`expr "X$cmd" : ".*"` &&
+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	        $show "$cmd"
+	        $run eval "$cmd" || exit $?
+	        skipped_export=false
+	      else
+	        # The command line is too long to execute in one step.
+	        $show "using reloadable object file for export list..."
+	        skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex"; then
+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    fi
 	  fi
 	fi
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
 
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
 	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
 
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+		case " $convenience " in
+		*" $test_deplib "*) ;;
+		*)
+			tmp_deplibs="$tmp_deplibs $test_deplib"
+			;;
+		esac
+	done
+	deplibs="$tmp_deplibs"
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-	esac
-	continue
-	;;
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
 
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
+	  fi
+	fi
+	
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
 
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	fi
 
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	  eval test_cmds=\"$archive_expsym_cmds\"
+	  cmds=$archive_expsym_cmds
+	else
+	  eval test_cmds=\"$archive_cmds\"
+	  cmds=$archive_cmds
+	  fi
+	fi
 
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
+	if test "X$skipped_export" != "X:" &&
+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise.
+	  $echo "creating reloadable object files..."
 
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
 
-      -o) prev=output ;;
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  delfiles=
+	  last_robj=
+	  k=1
+	  output=$output_objdir/$output_la-${k}.$objext
+	  # Loop over the list of objects to be linked.
+	  for obj in $save_libobjs
+	  do
+	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+	    if test "X$objlist" = X ||
+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+		 test "$len" -le "$max_cmd_len"; }; then
+	      objlist="$objlist $obj"
+	    else
+	      # The command $test_cmds is almost too long, add a
+	      # command to the queue.
+	      if test "$k" -eq 1 ; then
+		# The first file doesn't have a previous command to add.
+		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+	      else
+		# All subsequent reloadable object files will link in
+		# the last one created.
+		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+	      fi
+	      last_robj=$output_objdir/$output_la-${k}.$objext
+	      k=`expr $k + 1`
+	      output=$output_objdir/$output_la-${k}.$objext
+	      objlist=$obj
+	      len=1
+	    fi
+	  done
+	  # Handle the remaining objects by creating one last
+	  # reloadable object file.  All subsequent reloadable object
+	  # files will link in the last one created.
+	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
 
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
+	  if ${skipped_export-false}; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    libobjs=$output
+	    # Append the command to create the export file.
+	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+          fi
+
+	  # Set up a command to remove the reloadable object files
+	  # after they are used.
+	  i=0
+	  while test "$i" -lt "$k"
+	  do
+	    i=`expr $i + 1`
+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+	  done
 
-      -release)
-	prev=release
-	continue
-	;;
+	  $echo "creating a temporary reloadable object file: $output"
 
-      -rpath)
-	prev=rpath
-	continue
-	;;
+	  # Loop through the commands generated above and execute them.
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $concat_cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
 
-      -R)
-	prev=xrpath
-	continue
-	;;
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
 
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
 
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    cmds=$archive_expsym_cmds
+	  else
+	    cmds=$archive_cmds
+	    fi
+	  fi
 
-      -shrext)
-	prev=shrext
-	continue
-	;;
+	  # Append the command to remove the reloadable object files
+	  # to the just-reset $cmds.
+	  eval cmds=\"\$cmds~\$rm $delfiles\"
+	fi
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || {
+	    lt_exit=$?
 
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	    fi
 
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
 
-      -version-info)
-	prev=vinfo
-	continue
-	;;
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
 
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      $show "${rm}r $gentop"
+	      $run ${rm}r "$gentop"
+	    fi
+	  fi
 
-      -weak)
-        prev=weak
-	continue
-	;;
+	  exit $EXIT_SUCCESS
+	fi
 
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	  fi
 	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
 
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
 
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
+    obj)
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
 
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
 
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+      fi
 
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
 
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
 
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
+      case $output in
+      *.lo)
+	if test -n "$objs$old_deplibs"; then
+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	libobj="$output"
+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	;;
+      *)
+	libobj=
+	obj="$output"
 	;;
+      esac
 
-      *.lo)
-	# A libtool-controlled object.
+      # Delete the old objects.
+      $run $rm $obj $libobj
 
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
 
-	  # Read the .lo file
-	  func_source "$arg"
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  generated="$generated $gentop"
 
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
 
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
+      output="$obj"
+      cmds=$reload_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
 
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
 
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
+	exit $EXIT_SUCCESS
+      fi
 
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
 
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $run eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
 
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	cmds=$reload_cmds
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+      fi
 
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
+      if test -n "$gentop"; then
+	$show "${rm}r $gentop"
+	$run ${rm}r $gentop
+      fi
 
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
+      exit $EXIT_SUCCESS
+      ;;
 
-      *.la)
-	# A libtool-controlled library.
+    prog)
+      case $host in
+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+      esac
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
 
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test "$preload" = yes; then
+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+	   test "$dlopen_self_static" = unknown; then
+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
 	fi
-	continue
-	;;
+      fi
 
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
 	;;
-      esac # arg
+      esac
 
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
+      case $host in
+      *darwin*)
+        # Don't allow lazy linking, it breaks C++ global constructors
+        if test "$tagname" = CXX ; then
+        compile_command="$compile_command ${wl}-bind_at_load"
+        finalize_command="$finalize_command ${wl}-bind_at_load"
+        fi
+        ;;
+      esac
 
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
 
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
 	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
 
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
 
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
 
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
 	done
-	deplibs="$tmp_deplibs"
       fi
 
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
 	  ;;
 	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  case $lib in
-	  *.la)	func_source "$lib" ;;
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
 	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
 
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
       fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
+
+      dlsyms=
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	  dlsyms="${outputname}S.c"
+	else
+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+	fi
       fi
 
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
+      if test -n "$dlsyms"; then
+	case $dlsyms in
+	"") ;;
+	*.c)
+	  # Discover the nlist of each of the dlfiles.
+	  nlist="$output_objdir/${outputname}.nm"
+
+	  $show "$rm $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Parse the name list into a source file.
+	  $show "creating $output_objdir/$dlsyms"
+
+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+	  if test "$dlself" = yes; then
+	    $show "generating symbol list for \`$output'"
+
+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+	    # Add our own program objects to the symbol list.
+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	    for arg in $progfiles; do
+	      $show "extracting global C symbols from \`$arg'"
+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	    done
+
+	    if test -n "$exclude_expsyms"; then
+	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    if test -n "$export_symbols_regex"; then
+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    # Prepare the list of exported symbols
+	    if test -z "$export_symbols"; then
+	      export_symbols="$output_objdir/$outputname.exp"
+	      $run $rm $export_symbols
+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
+	    else
+	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      $run eval 'mv "$nlist"T "$nlist"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
 	    fi
 	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
+
+	  for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+	    $run eval '$echo ": $name " >> "$nlist"'
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
 	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
+
+	  if test -z "$run"; then
+	    # Make sure we have at least an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    if test -n "$exclude_expsyms"; then
+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $mv "$nlist"T "$nlist"
 	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
+
+	    # Try sorting and uniquifying the output.
+	    if grep -v "^: " < "$nlist" |
+		if sort -k 3 </dev/null >/dev/null 2>&1; then
+		  sort -k 3
+		else
+		  sort +2
+		fi |
+		uniq > "$nlist"S; then
+	      :
+	    else
+	      grep -v "^: " < "$nlist" > "$nlist"S
 	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
+
+	    if test -f "$nlist"S; then
+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
 	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
 	    fi
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		$ECHO
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
-	      else
-		$ECHO
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+"
+
+	    case $host in
+	    *cygwin* | *mingw* )
+	  $echo >> "$output_objdir/$dlsyms" "\
+/* DATA imports from DLLs on WIN32 can't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs */
+struct {
+"
+	      ;;
+	    * )
+	  $echo >> "$output_objdir/$dlsyms" "\
+const struct {
+"
 	      ;;
 	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
 
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
 
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+	  $echo >> "$output_objdir/$dlsyms" "\
+  const char *name;
+  lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
 
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
 
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (lt_ptr) 0}
+};
 
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_preloaded_symbols;
+}
+#endif
 
-	# Read the .la file
-	func_source "$lib"
+#ifdef __cplusplus
+}
+#endif\
+"
+	  fi
 
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	  pic_flag_for_symtable=
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+	    esac;;
+	  *-*-hpux*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag";;
 	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
+	  esac
 
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-		esac
-	      fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  continue
-	fi # $pass = conv
+	  # Now compile the dynamic symbol file.
+	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+	  # Clean up the generated files.
+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Transform the symbol file into the correct name.
+          case $host in
+          *cygwin* | *mingw* )
+            if test -f "$output_objdir/${outputname}.def" ; then
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            else
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             fi
+            ;;
+          * )
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            ;;
+          esac
+	  ;;
+	*)
+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+      else
+	# We keep going just in case the user didn't refer to
+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+	# really was required.
 
+	# Nullify the symbol file.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+      fi
 
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+	# Replace the output file specification.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$link_command"
+	$run eval "$link_command"
+	exit_status=$?
+
+	# Delete the generated files.
+	if test -n "$dlsyms"; then
+	  $show "$rm $output_objdir/${outputname}S.${objext}"
+	  $run $rm "$output_objdir/${outputname}S.${objext}"
 	fi
 
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
+	exit $exit_status
+      fi
 
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
+      if test -n "$shlibpath_var"; then
+	# We should set the shlibpath_var
+	rpath=
+	for dir in $temp_rpath; do
+	  case $dir in
+	  [\\/]* | [A-Za-z]:[\\/]*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
+	temp_rpath="$rpath"
+      fi
 
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
 
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
 
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$run $rm $output
+	# Link the executable and exit
+	$show "$link_command"
+	$run eval "$link_command" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
+	    # fast_install is set to needless
+	    relink_command=
 	  fi
-	  continue
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
 	fi
+      fi
 
+      # Replace the output file specification.
+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
+      # Delete the old output files.
+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
+      $show "$link_command"
+      $run eval "$link_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
 	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      fi
 
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
 
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
-	      esac
-	    fi
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+            output_name=`basename $output`
+            output_path=`dirname $output`
+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
+            cwrapper="$output_path/$output_name.exe"
+            $rm $cwrappersource $cwrapper
+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
+	    cat > $cwrappersource <<EOF
 
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
 
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
 
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
 
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
 
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
 
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
 
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
 
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
+/* -DDEBUG is fairly common in CFLAGS.  */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
 
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
+const char *program_name = NULL;
 
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $ECHO
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int    check_executable(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
 
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int i;
 
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  $ECHO
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
+  DEBUG("(main) program_name : %s\n",program_name);
+  newargz = XMALLOC(char *, argc+2);
+EOF
 
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+            cat >> $cwrappersource <<EOF
+  newargz[0] = (char *) xstrdup("$SHELL");
+EOF
 
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+            cat >> $cwrappersource <<"EOF"
+  newargz[1] = find_executable(argv[0]);
+  if (newargz[1] == NULL)
+    lt_fatal("Couldn't find %s", argv[0]);
+  DEBUG("(main) found exe at : %s\n",newargz[1]);
+  /* we know the script has the same name, without the .exe */
+  /* so make sure newargz[1] doesn't end in .exe */
+  strendzap(newargz[1],".exe");
+  for (i = 1; i < argc; i++)
+    newargz[i+1] = xstrdup(argv[i]);
+  newargz[argc+1] = NULL;
 
-      install_libdir="$1"
+  for (i=0; i<argc+1; i++)
+  {
+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+    ;
+  }
 
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
+EOF
 
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+            case $host_os in
+              mingw*)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",(char const **)newargz);
+EOF
+              ;;
+              *)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",newargz);
+EOF
+              ;;
+            esac
 
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
+            cat >> $cwrappersource <<"EOF"
+  return 127;
+}
 
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $ECHO
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $ECHO
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $ECHO
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-	    done
-	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
+void *
+xmalloc (size_t num)
+{
+  void * p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
 
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
+  return p;
+}
 
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
 
-	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
+const char *
+base_name (const char *name)
+{
+  const char *base;
 
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+    name += 2;
+#endif
 
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
 
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
+int
+check_executable(const char * path)
+{
+  struct stat st;
 
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+  if ((!path) || (!*path))
+    return 0;
 
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
+  if ((stat (path, &st) >= 0) &&
+      (
+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+       ((st.st_mode & S_IXUSR) == S_IXUSR))
+      )
+    return 1;
+  else
+    return 0;
+}
 
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise */
+char *
+find_executable (const char* wrapper)
+{
+  int has_slash = 0;
+  const char* p;
+  const char* p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char* concat_name;
 
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
 
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
 
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+  {
+    concat_name = xstrdup (wrapper);
+    if (check_executable(concat_name))
+      return concat_name;
+    XFREE(concat_name);
+  }
+  else
+  {
+#endif
+    if (IS_DIR_SEPARATOR (wrapper[0]))
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable(concat_name))
+        return concat_name;
+      XFREE(concat_name);
+    }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+    {
+      has_slash = 1;
+      break;
+    }
+  if (!has_slash)
+  {
+    /* no slashes; search PATH */
+    const char* path = getenv ("PATH");
+    if (path != NULL)
+    {
+      for (p = path; *p; p = p_next)
+      {
+        const char* q;
+        size_t p_len;
+        for (q = p; *q; q++)
+          if (IS_PATH_SEPARATOR(*q))
+            break;
+        p_len = q - p;
+        p_next = (*q == '\0' ? q : q + 1);
+        if (p_len == 0)
+        {
+          /* empty path: current directory */
+          if (getcwd (tmp, LT_PATHMAX) == NULL)
+            lt_fatal ("getcwd failed");
+          tmp_len = strlen(tmp);
+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, tmp, tmp_len);
+          concat_name[tmp_len] = '/';
+          strcpy (concat_name + tmp_len + 1, wrapper);
+        }
+        else
+        {
+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, p, p_len);
+          concat_name[p_len] = '/';
+          strcpy (concat_name + p_len + 1, wrapper);
+        }
+        if (check_executable(concat_name))
+          return concat_name;
+        XFREE(concat_name);
+      }
+    }
+    /* not found in PATH; assume curdir */
+  }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen(tmp);
+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable(concat_name))
+    return concat_name;
+  XFREE(concat_name);
+  return NULL;
+}
+
+char *
+strendzap(char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert(str != NULL);
+  assert(pat != NULL);
+
+  len = strlen(str);
+  patlen = strlen(pat);
+
+  if (patlen <= len)
+  {
+    str += len - patlen;
+    if (strcmp(str, pat) == 0)
+      *str = '\0';
+  }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode,
+          const char * message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+EOF
+          # we should really use a build-platform specific compiler
+          # here, but OTOH, the wrappers (shell script and this C one)
+          # are only useful if you want to execute the "real" binary.
+          # Since the "real" binary is built for $host, then this
+          # wrapper might as well be built for $host, too.
+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+          ;;
+        esac
+        $rm $output
+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
 
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
+	$echo > $output "\
+#! $SHELL
 
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
 
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
 
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
+relink_command=\"$relink_command\"
 
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variable:
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$echo >> $output "\
 
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
 
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
 
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      delfiles="$delfiles $output"
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
 
-	    else
-	      output=
-	    fi
+	if test "$fast_install" = yes; then
+	  $echo >> $output "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
 
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
+  if test ! -f \"\$progdir/\$program\" || \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
+    file=\"\$\$-\$program\"
 
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
+    if test ! -d \"\$progdir\"; then
+      $mkdir \"\$progdir\"
+    else
+      $rm \"\$progdir/\$file\"
+    fi"
 
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
+	  $echo >> $output "\
 
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$echo \"\$relink_command_output\" >&2
+	$rm \"\$progdir/\$file\"
+	exit $EXIT_FAILURE
+      fi
+    fi
 
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $rm \"\$progdir/\$program\";
+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $rm \"\$progdir/\$file\"
+  fi"
+	else
+	  $echo >> $output "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
 
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
+	$echo >> $output "\
 
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
+  if test -f \"\$progdir/\$program\"; then"
 
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
 	fi
 
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
 	fi
 
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	$echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2*)
+	  $echo >> $output "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $echo >> $output "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$echo >> $output "\
+      \$echo \"\$0: cannot exec \$program \$*\"
+      exit $EXIT_FAILURE
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi\
+"
+	chmod +x $output
+      fi
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
 
-	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
 	fi
+	addlibs="$old_convenience"
+      fi
 
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	generated="$generated $gentop"
 
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
+      fi
 
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+       cmds=$old_archive_from_new_cmds
+      else
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $echo "copying selected object files to avoid basename conflicts..."
 
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+	  if test -z "$gentop"; then
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
 
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    exit_status=$?
+	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+	      exit $exit_status
 	    fi
 	  fi
 
-	  exit $EXIT_SUCCESS
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		counter=`expr $counter + 1`
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      $run ln "$obj" "$gentop/$newobj" ||
+	      $run cp "$obj" "$gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
 	fi
 
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
+	eval cmds=\"$old_archive_cmds\"
 
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
+	if len=`expr "X$cmds" : ".*"` &&
+	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  $echo "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
 
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  for obj in $save_oldobjs
+	  do
+	    oldobjs="$objlist $obj"
+	    objlist="$objlist $obj"
+	    eval test_cmds=\"$old_archive_cmds\"
+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+	       test "$len" -le "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+	        RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
       fi
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+        eval cmd=\"$cmd\"
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
 
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
 
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
 
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
 	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
 	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
       fi
 
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		if test -z "$libdir"; then
+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		  exit $EXIT_FAILURE
+		fi
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlfiles="$newdlfiles $libdir/$name"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlprefiles="$newdlprefiles $libdir/$name"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles="$newdlfiles $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles="$newdlprefiles $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $rm $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
 
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
 
-	exit $EXIT_SUCCESS
-      fi
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
 
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
 
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
+# Is this an already installed library?
+installed=$installed
 
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
 
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $echo >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
       fi
 
-      exit $EXIT_SUCCESS
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
       ;;
+    esac
+    exit $EXIT_SUCCESS
+    ;;
 
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $echo "X$nonopt" | grep shtool > /dev/null; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	arg="\"$arg\""
+	;;
       esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
 
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case $arg in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
 
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
 
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+      case $arg in
+      -d) isdir=yes ;;
+      -f) 
+      	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o) prev=$arg ;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
 	;;
       esac
 
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	arg="\"$arg\""
 	;;
       esac
+      install_prog="$install_prog $arg"
+    done
+    case " $install_prog " in
+    *[\\\ /]cp\ *) extra_mode=;;
+    *) extra_mode='-m 644';;
+    esac
 
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	$echo "$modename: no file or destination specified" 1>&2
+      else
+	$echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
 
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
 
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test "$#" -gt 2; then
+	$echo "$modename: \`$dest' is not a directory" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
       done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
+      ;;
+    esac
 
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	library_names=
+	old_library=
+	relink_command=
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
 	  esac
 	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
 
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+	test "X$dir" = "X$file/" && dir=
+	dir="$dir$objdir"
 
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
 
-      wrappers_required=yes
-      case $host in
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+	  else
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+	  fi
 
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	  $echo "$modename: warning: relinking \`$file'" 1>&2
+	  $show "$relink_command"
+	  if $run eval "$relink_command"; then :
+	  else
+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 
-	exit $exit_status
-      fi
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
 
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
 
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+	  $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
+	  if test -n "$stripme" && test -n "$striplib"; then
+	    $show "$striplib $destdir/$realname"
+	    $run eval "$striplib $destdir/$realname" || exit $?
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      if test "$linkname" != "$realname"; then
+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+	      fi
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  cmds=$postinstall_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || {
+	      lt_exit=$?
+
+	      # Restore the uninstalled library and exit
+	      if test "$mode" = relink; then
+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      fi
+
+	      exit $lt_exit
+	    }
 	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	  IFS="$save_ifs"
 	fi
-      fi
 
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-	exit $EXIT_SUCCESS
-      fi
+	# Install the pseudo-library for information purposes.
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "$install_prog $extra_mode $instname $destdir/$name"
+	$run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
 
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
 
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
 	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
 	fi
-      fi
 
-      # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
 
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+	# Install the libtool object if requested.
+	if test -n "$destfile"; then
+	  $show "$install_prog $extra_mode $file $destfile"
+	  $run eval "$install_prog $extra_mode $file $destfile" || exit $?
+	fi
 
-      func_show_eval "$link_command" 'exit $?'
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
 
-      # Now create the wrapper script.
-      func_verbose "creating $output"
+	  $show "$install_prog $extra_mode $staticobj $staticdest"
+	  $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
+	fi
+	exit $EXIT_SUCCESS
+	;;
 
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
 
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      file=`$echo $file|${SED} 's,.exe$,,'`
+	      stripped_ext=".exe"
+	    fi
+	    ;;
 	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-      fi
 
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
+	# Do a test to see if this is really a libtool program.
 	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
+	*cygwin*|*mingw*)
+	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
 	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
+	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
+	  # If there is no directory component, then add one.
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
+	  esac
+
+	  # Check the variables that should have been set.
+	  if test -z "$notinst_deplibs"; then
+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case $lib in
+	      */* | *\\*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
+	  # If there is no directory component, then add one.
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
+	  esac
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    if test "$finalize" = yes && test -z "$run"; then
+	      tmpdir=`func_mktempdir`
+	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+	      outputname="$tmpdir/$file"
+	      # Replace the output file specification.
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      $show "$relink_command"
+	      if $run eval "$relink_command"; then :
 	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+		${rm}r "$tmpdir"
+		continue
 	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+	      file="$outputname"
+	    else
+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
 
-	    func_emit_wrapper no > $output
-	    chmod +x $output
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway 
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+	    ;;
+	  esac
 	  ;;
 	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
+	$show "$install_prog$stripme $file $destfile"
+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+	test -n "$outputname" && ${rm}r "$tmpdir"
+	;;
+      esac
+    done
 
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
 
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
 
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	$show "$old_striplib $oldlib"
+	$run eval "$old_striplib $oldlib" || exit $?
       fi
 
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
+      # Do each command in the postinstall commands.
+      cmds=$old_postinstall_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
 
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
 
-	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
-	fi
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+    ;;
 
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-	eval cmds=\"$old_archive_cmds\"
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
 
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  cmds=$finish_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
 	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
+	  IFS="$save_ifs"
 	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
 
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
+    # Exit here if they wanted silent mode.
+    test "$show" = : && exit $EXIT_SUCCESS
 
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
+    exit $EXIT_SUCCESS
+    ;;
 
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
 
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit $EXIT_FAILURE
+    fi
 
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
-		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
 
-# The name that we can dlopen(3).
-dlname='$tdlname'
+	# Read the libtool library.
+	dlname=
+	library_names=
 
-# Names of this library.
-library_names='$library_names'
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
 
-# The name of the static archive.
-old_library='$old_library'
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
 
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
 
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	fi
+	;;
 
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
 
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	continue
+	;;
+      esac
 
-# Is this an already installed library?
-installed=$installed
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
 
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
 
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
 
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
 
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
 
-{ test "$mode" = link || test "$mode" = relink; } &&
-    func_mode_link ${1+"$@"}
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+	$echo "export $shlibpath_var"
+      fi
+      $echo "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+    ;;
 
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
+  # libtool clean and uninstall mode
+  clean | uninstall)
+    modename="$modename: $mode"
+    rm="$nonopt"
     files=
     rmforce=
     exit_status=0
@@ -8209,28 +6525,30 @@ func_mode_uninstall ()
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
+      -f) rm="$rm $arg"; rmforce=yes ;;
+      -*) rm="$rm $arg" ;;
       *) files="$files $arg" ;;
       esac
     done
 
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
     rmdirs=
 
     origobjdir="$objdir"
     for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$dir" = "X$file"; then
+	dir=.
 	objdir="$origobjdir"
       else
 	objdir="$dir/$origobjdir"
       fi
-      func_basename "$file"
-      name="$func_basename_result"
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
       test "$mode" = uninstall && objdir="$dir"
 
       # Remember objdir for removal later, being careful to avoid duplicates
@@ -8242,9 +6560,9 @@ func_mode_uninstall ()
       fi
 
       # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
+      if (test -L "$file") >/dev/null 2>&1 \
+	|| (test -h "$file") >/dev/null 2>&1 \
+	|| test -f "$file"; then
 	:
       elif test -d "$file"; then
 	exit_status=1
@@ -8258,8 +6576,8 @@ func_mode_uninstall ()
       case $name in
       *.la)
 	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  . $dir/$name
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
@@ -8274,17 +6592,39 @@ func_mode_uninstall ()
 	    *" $dlname "*) ;;
 	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      cmds=$postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      cmds=$old_postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -8294,20 +6634,20 @@ func_mode_uninstall ()
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 
 	  # Read the .lo file
-	  func_source $dir/$name
+	  . $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$non_pic_object"
 	  fi
 	fi
@@ -8318,26 +6658,17 @@ func_mode_uninstall ()
 	  noexename=$name
 	  case $file in
 	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
 	    rmfiles="$rmfiles $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
@@ -8352,38 +6683,239 @@ func_mode_uninstall ()
 	fi
 	;;
       esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles || exit_status=1
     done
     objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
+	$show "rmdir $dir"
+	$run rmdir $dir >/dev/null 2>&1
       fi
     done
 
     exit $exit_status
-}
-
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
+    ;;
 
-test -z "$mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+    ;;
+  esac
 
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  if test -z "$exec_cmd"; then
+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
+  eval exec $exec_cmd
   exit $EXIT_FAILURE
 fi
 
-exit $exit_status
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --tag=TAG         use configuration variables from tag TAG
+    --version         print version information
+
+MODE must be one of the following:
+
+      clean           remove files from the build directory
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool@gnu.org>."
+  exit $EXIT_SUCCESS
+  ;;
+
+clean)
+  $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
 
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+  ;;
+esac
+
+$echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -8397,17 +6929,14 @@ exit $exit_status
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+disable_libs=static
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/Makefile.am	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -18,9 +18,16 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = uxa src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-EXTRA_DIST = README AUTHORS NEWS
-DISTCLEANFILES = doltcompile
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/Makefile.bsd-wrapper new/xsrc/external/mit/xf86-video-intel/dist/Makefile.bsd-wrapper
--- old/xsrc/external/mit/xf86-video-intel/dist/Makefile.bsd-wrapper	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/Makefile.bsd-wrapper	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,9 @@
+# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2008/03/25 23:41:50 matthieu Exp $
+
+.include <bsd.xconf.mk>
+
+.if ${XENOCARA_BUILD_DRI:L} != "yes"
+CONFIGURE_ARGS+= --disable-dri
+.endif
+
+.include <bsd.xorg.mk>
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/Makefile.in	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,11 +33,15 @@
 #  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -51,32 +55,29 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING NEWS compile \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -94,7 +95,10 @@ distcleancheck_listfiles = find . -type
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -102,41 +106,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -144,12 +165,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -157,13 +177,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -177,26 +192,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -208,13 +224,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -228,7 +242,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -239,16 +252,10 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
 SUBDIRS = uxa src man
-EXTRA_DIST = README AUTHORS NEWS
-DISTCLEANFILES = doltcompile
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -290,7 +297,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	  $(MAKE) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -311,7 +318,8 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool config.lt
+	-rm -f libtool
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -344,7 +352,8 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -388,8 +397,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -414,8 +423,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -425,12 +434,13 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -445,22 +455,23 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -474,7 +485,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -482,16 +493,17 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -500,10 +512,6 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -531,8 +539,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -572,7 +578,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -616,11 +622,11 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -643,20 +649,12 @@ info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-recursive
-
 install-exec-am:
 
-install-html: install-html-recursive
-
 install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -677,27 +675,35 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-libtool clean-recursive \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-recursive distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+
+.PHONY: ChangeLog INSTALL
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+INSTALL:
+	$(INSTALL_CMD)
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+ChangeLog:
+	$(CHANGELOG_CMD)
 
+dist-hook: ChangeLog INSTALL
 # 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 -Naurp old/xsrc/external/mit/xf86-video-intel/dist/man/intel.man new/xsrc/external/mit/xf86-video-intel/dist/man/intel.man
--- old/xsrc/external/mit/xf86-video-intel/dist/man/intel.man	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/man/intel.man	2011-02-08 11:14:00.000000000 +0100
@@ -56,11 +56,6 @@ The following driver
 .B Options
 are supported
 .TP
-.BI "Option \*qNoAccel\*q \*q" boolean \*q
-Disable or enable acceleration.
-.IP
-Default: acceleration is enabled.
-.TP
 .BI "Option \*qColorKey\*q \*q" integer \*q
 This sets the default pixel value for the YUV video overlay key.
 .IP
@@ -92,6 +87,16 @@ performance.
 .IP
 Default: enabled.
 .TP
+.BI "Option \*qSwapbuffersWait\*q \*q" boolean \*q
+This option controls the behavior of glXSwapBuffers and glXCopySubBufferMESA
+calls by GL applications.  If enabled, the calls will avoid tearing by making
+sure the display scanline is outside of the area to be copied before the copy
+occurs.  If disabled, no scanline synchronization is performed, meaning tearing
+will likely occur.  Note that when enabled, this option can adversely affect
+the framerate of applications that render frames at less than refresh rate.
+.IP
+Default: enabled.
+.TP
 .BI "Option \*qDRI\*q \*q" boolean \*q
 Disable or enable DRI support.
 .IP
@@ -124,6 +129,11 @@ This option specifies the amount of syst
 The default is 8192 if AGP allocable memory is < 128 MB, 16384 if < 192 MB,
 24576 if higher. DRI require at least a value of 16384. Higher values may give
 better 3D performance, at expense of available system memory.
+.TP
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
+Disable or enable acceleration.
+.IP
+Default: acceleration is enabled.
 
 .PP
 The following driver
@@ -146,16 +156,6 @@ have options for selecting adaptors.
 .IP
 Default: Textured video adaptor is preferred.
 .TP
-.BI "Option \*qAccelMethod\*q \*q" string \*q
-Choose acceleration architecture, either "XAA", "EXA", or "UXA".  XAA is the old
-XFree86 based acceleration architecture.  EXA is a simpler
-acceleration architecture designed to better accelerate the X Render extension.
-UXA is a newer acceleration architecture built from the EXA acceleration
-code but taking advantage of kernel memory management to provide simpler,
-faster code.
-.IP
-Default: "UXA" if kernel-modesetting is available, "EXA" otherwise.
-.TP
 .BI "Option \*qModeDebug\*q \*q" boolean \*q
 Enable printing of additional debugging information about modesetting to
 the server log.
@@ -186,6 +186,31 @@ within the X server.  This option instea
 frame buffer color depth is really a matter of preference by the user,
 while setting the pixel format here is a requirement of the connected
 hardware.
+.BI "Option \*qDebugFlushBatches\*q \*q" boolean \*q
+Flush the batch buffer after every single operation.
+.IP
+Default: Disabled
+.TP
+.BI "Option \*qDebugFlushCaches\*q \*q" boolean \*q
+Include an MI_FLUSH at the end of every batch buffer to force data to
+be flushed out of cache and into memory before the completion of the
+batch.
+.IP
+Default: Disabled
+.TP
+.BI "Option \*qDebugWait\*q \*q" boolean \*q
+Wait for the completion of every batch buffer before continuing,
+i.e. perform synchronous rendering.
+.IP
+Default: Disabled
+.TP
+.BI "Option \*qSwapbuffersWait\*q \*q" boolean \*q
+This option controls the behavior of glXSwapBuffers and glXCopySubBufferMESA
+calls by GL applications.  If enabled, the calls will avoid tearing by making
+sure the display scanline is outside of the area to be copied before the copy
+occurs.  If disabled, no scanline synchronization is performed, meaning tearing
+will likely occur.  Note that when enabled, this option can adversely affect
+the framerate of applications that render frames at less than refresh rate.
 .IP
 Leaving this unset implies the default value of false,
 which is almost always going to be right choice.  If your
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.am	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -1,27 +1,24 @@
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-# 
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
 # 
 
 drivermandir = $(DRIVER_MAN_DIR)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,35 +16,36 @@
 
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-# 
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
 # 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -61,11 +62,10 @@ host_triplet = @host@
 subdir = man
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -83,7 +83,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -91,41 +94,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -133,12 +153,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -146,13 +165,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -166,26 +180,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -197,13 +212,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -217,7 +230,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -228,12 +240,8 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 drivermandir = $(DRIVER_MAN_DIR)
 driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
 EXTRA_DIST = $(DRIVER_NAME).man
@@ -263,8 +271,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -294,9 +302,13 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-drivermanDATA: $(driverman_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(drivermandir)" || $(MKDIR_P) "$(DESTDIR)$(drivermandir)"
+	test -z "$(drivermandir)" || $(mkdir_p) "$(DESTDIR)$(drivermandir)"
 	@list='$(driverman_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -319,21 +331,22 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -349,7 +362,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(drivermandir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -382,7 +395,7 @@ clean-am: clean-generic clean-libtool mo
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-libtool
 
 dvi: dvi-am
 
@@ -396,20 +409,12 @@ info-am:
 
 install-data-am: install-drivermanDATA
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -428,21 +433,18 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-drivermanDATA
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-drivermanDATA uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-drivermanDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-drivermanDATA
+	install-data install-data-am install-drivermanDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-drivermanDATA \
+	uninstall-info-am
 
 
 .man.$(DRIVER_MAN_SUFFIX):
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/missing new/xsrc/external/mit/xf86-video-intel/dist/missing
--- old/xsrc/external/mit/xf86-video-intel/dist/missing	2008-08-02 07:12:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/missing	2011-02-08 11:14:00.000000000 +0100
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,8 +33,6 @@ if test $# -eq 0; then
 fi
 
 run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -46,7 +44,7 @@ fi
 
 msg="missing on your system"
 
-case $1 in
+case "$1" in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -79,7 +77,6 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case $1 in
+case "$1" in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -138,7 +135,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case "$1" in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -167,7 +164,7 @@ WARNING: \`$1' is $msg.  You should only
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case $f in
+      case "$f" in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
     if test -f "$file"; then
 	touch $file
     else
@@ -217,25 +214,25 @@ WARNING: \`$1' $msg.  You should only ne
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
+    if [ $# -ne 1 ]; then
         eval LASTARG="\${$#}"
-	case $LASTARG in
+	case "$LASTARG" in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if test ! -f y.tab.h; then
+    if [ ! -f y.tab.h ]; then
 	echo >y.tab.h
     fi
-    if test ! -f y.tab.c; then
+    if [ ! -f y.tab.c ]; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -247,18 +244,18 @@ WARNING: \`$1' is $msg.  You should only
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if test $# -ne 1; then
+    if [ $# -ne 1 ]; then
         eval LASTARG="\${$#}"
-	case $LASTARG in
+	case "$LASTARG" in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if test ! -f lex.yy.c; then
+    if [ ! -f lex.yy.c ]; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -270,9 +267,11 @@ WARNING: \`$1' is $msg.  You should only
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -290,17 +289,11 @@ WARNING: \`$1' is $msg.  You should only
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -324,13 +317,13 @@ WARNING: \`$1' is $msg.  You should only
     fi
     firstarg="$1"
     if shift; then
-	case $firstarg in
+	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case $firstarg in
+	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/NEWS new/xsrc/external/mit/xf86-video-intel/dist/NEWS
--- old/xsrc/external/mit/xf86-video-intel/dist/NEWS	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/NEWS	2011-02-08 11:14:00.000000000 +0100
@@ -1,39 +1,199 @@
-Release 2.7.1 (2009-05-12)
---------------------------
-This is a maintenance release on the 2.7 branch. Compared to 2.7.0 it
-consists only of a few carefully hand-picked fixes for bugs,
-(including GPU crashers). We encourage all users of 2.7.0 to upgrade
-to 2.7.1.
-
-Bug fixes since 2.7.0:
-
-    * KMS: Hook up output properties for RANDR, (this allows output
-      properties to be controlled in the KMS case just as in the UMS
-      case). [Zhenyu Wang <zhenyu.z.wang@intel.com>]
-
-    * Fix multiplication error when computing required batch space.
-      This could fix any number of cases where the driver did
-      inexplicable things (due to having computed the wrong
-      size). [Keith Packard <keithp@keithp.com>]
-
-    * Hold reference to video binding table until all rects are
-      painted. This prevent general chaos in the buffer
-      manager. [Keith Packard <keithp@keithp.com>]
-
-    * Split i915 textured video commands to fit into batch
-      buffers. Video and 3D setup commands share the same batch
-      buffer, so without this fix, various problems could occur when
-      video and 3D clients were both heavily active at the same
-      time. [Keith Packard <keithp@keithp.com>]
-
-    * Fix crash with XV with large virtual display (> 2049). [Albert
-      Damen <albrt@gmx.net>]
-
-    * Provide missing value to 3D_STATE_VERTEX_BUFFERS command. We
-      don't know that this was causing any problem, but the change
-      does bring the driver into conformance with what the
-      specification says the hardware requires here. [Keith Packard
-      <keithp@keithp.com>]
+Release 2.9.1 (2009-10-26)
+==========================
+We are pleased to announce a maintenance release (2.9.1) of the
+xf86-video-intel driver. This release comes one month after 2.9.0 and
+consists only of a few, hand-picked bug fixes since that release.
+
+Complete list of fixes in 2.9.1 compared to 2.9.0
+-------------------------------------------------
+ * Fix corruption and artifacts due to wrong colors in the colormap
+   with X server 1.7
+
+ * Fix incorrect rendering, such as missing scrollbar arrows in some
+   themes (http://bugs.freedesktop.org/show_bug.cgi?id=24459)
+
+ * Fix black screen when X server is reset
+   (https://bugs.freedesktop.org/show_bug.cgi?id=24383)
+
+ * Fix regressions detecting DVI monitors
+
+   http://bugs.freedesktop.org/show_bug.cgi?id=24255
+   http://bugs.freedesktop.org/show_bug.cgi?id=24282
+   http://bugs.freedesktop.org/show_bug.cgi?id=24458
+
+Release 2.9.0 (2009-09-28)
+==========================
+We are pleased to announce the 2.9.0 release of the xf86-video-intel
+driver. (If you have been following along at home, this release is
+identical to the 2.8.99.902 release candidate other than the version
+number).
+
+New features in 2.9 compared to 2.8
+-----------------------------------
+* Support for the B43 chipset.
+
+Major fixes in 2.9.0 compared to 2.8.0
+--------------------------------------
+* Multiple fixes to make the driver stable for 8xx chipsets, (855GM,
+  865G, etc.). The 2.8 driver series was extremely unstable with many
+  of these chipsets.
+
+  https://bugs.freedesktop.org/show_bug.cgi?id=22904 (and many duplicates)
+  https://bugs.freedesktop.org/show_bug.cgi?id=22947
+
+* Add support for BACKLIGHT property when using kernel modesetting
+  (KMS). This allows backlight adjustment with programs such as
+  "xbacklight -set <percentage>" or "xrandr --set BACKLIGHT <value>".
+
+  https://bugs.freedesktop.org/show_bug.cgi?id=20963
+
+* Fix so that "xrandr --scale" works when using KMS.
+
+  https://bugs.freedesktop.org/show_bug.cgi?id=22893
+
+* Fix segfaults of X server when logging out.
+
+  https://bugs.freedesktop.org/show_bug.cgi?id=20516
+
+* Avoid falling back to software for 1-bit alpha-only masks.
+
+  https://bugs.freedesktop.org/show_bug.cgi?id=23184
+
+* Fix pixel sampling position for 8xx chipsets, (fixes some cairo-test
+  suite failures).
+
+Snapshot 2.8.99.901 (2009-09-09)
+================================
+This is the first release candidate in preparation for the upcoming
+2.9.0 release. We will appreciate any feedback we can get from testing
+of this snapshot to improve the 2.9.0 release.
+
+See the commit log for changes in this release, and developers, please
+provide me summaries for any major features in this release that you
+think should appear in NEWS and in the 2.9.0 release notes.
+
+Note: We are still investigating failures with 865G chipsets, (these
+failures existed in the 2.8 series as well). We are hoping to fix
+these failures before the 2.9.0 release.
+
+Release 2.8.0 (2009-07-20)
+==========================
+We are pleased to present this major release of the xf86-video-intel
+driver. This release is very similar to the 2.7.99.902 release
+candidate but includes a couple of additional bug fixes, (for bugs
+#22760 and @22483).
+
+Compared to the 2.7 releases this driver contains several new features
+and many bug fixes. The driver now depends on X server 1.6 or later,
+and eliminates several obsolete code paths, (XAA and EXA removed in
+favor of UXA, DRI1 support eliminated). The driver certainly will work
+best with an i915 module from a recent kernel (2.6.31) and with
+kernel-modesetting (KMS, specified by loading i915 with the option
+"modeset=1").
+
+New features in 2.8.0 compared to 2.7
+-------------------------------------
+* Remove XAA/EXA/DRI1 and NoAccel, and only support UXA/DRI2 now
+  (requiring xserver 1.6).
+
+* VLD support added into XvMC for Mpeg2, which decreases CPU usage
+  when playing video.
+
+Major fixes in 2.8.0 compared to 2.7
+------------------------------------
+* Fix broken front-buffer rendering
+  https://bugs.freedesktop.org/show_bug.cgi?id=19174
+
+* Fix disabling of XvMC disabled
+  https://bugs.freedesktop.org/show_bug.cgi?id=20790
+
+* Fix broken VT switch on some machines
+  https://bugs.freedesktop.org/show_bug.cgi?id=19578
+
+* Improve performance of trapezoid rendering for UXA
+  https://bugs.freedesktop.org/show_bug.cgi?id=21376
+
+* Vblank sync'd GL buffer swap (fixing video tearing under composite)
+  https://bugs.freedesktop.org/show_bug.cgi?id=20664
+
+* Fix G41 DRM support
+  https://bugs.freedesktop.org/show_bug.cgi?id=21095
+
+* Fix crash on some 8xx
+  https://bugs.freedesktop.org/show_bug.cgi?id=18974
+
+Various fixes for GPU hangs, and more...
+
+Snapshot 2.7.99.902 (2009-07-13)
+--------------------------------
+This is the first release candidate in preparation for the upcoming
+2.8.0 release. Most major and critical bugs should be fixed, but some
+minor bugs may still be present. We will appreciate any feedback we
+can get from testing of this snapshot to improve the 2.8.0 release.
+
+Snapshot 2.7.99.901 (2009-06-10)
+--------------------------------
+This is the first release candidate in preparation for the upcoming
+2.8.0 release. Most critical bugs should be fixed, but some major
+bugs may still be present. We will appreciate any feedback we can
+get from testing of this snapshot to improve the 2.8.0 release.
+
+Some of the major fixes in this snapshot include:
+
+	* Several fixes for intermittent GPU hangs/crashes, (some of
+	  which already appeared in the 2.7.1 release)
+
+	* Fix to avoid X crash when viewing large images in browser
+
+	* Fix X server failure when running old (non-GEM) kernel
+
+	* Fixes for SDVO LVDS mode detection
+
+	* Fix major performance regression of trapezoid rendering
+          compared to XAA/EXA
+
+	* New support for tear-free video when using KMS
+
+	* New support for tear-free DRI2 CopyRegion
+
+Snapshot 2.7.99.1 (2009-04-28)
+------------------------------
+This is a development snapshot very early in the process toward
+developing 2.8. There have been some big changes to the code, and
+we're anxious to get feedback on these changes as early as possible.
+
+Here is a summary of the biggest changes:
+
+  * Driver now depends on X server 1.6 or later
+
+  * Eliminate XAA and EXA support (in favor of UXA)
+
+  * Eliminate DRI1 support
+
+  * Fixes for running without DRI at all
+
+These code removals represent a deletion of a substantial amount of
+code, (and hopefully piles of bugs), as well as reduce the maintenance
+effort going forward as the number of combinatorial configurations for
+the driver are greatly reduced. This means that users are much more
+likely to be running code that has actually been tested, and it will
+be much easy for developers to replicate bugs that users experience.
+
+One of the things that would be most useful in testing this release is
+to revisit any outstanding bugs that you have previously reported. If
+the buggy behavior is gone, (or the bug is no longer relevant---such
+as a bug that's specific to XAA only), please feel free to indicate so
+in bugzilla or even just close the bug.
+
+If you confirm that the bug is still present, please indicate so in
+the bug report. (I was going to ask that you select a 1.7.99 version,
+but it looks like bugzilla only has versions for products not
+compoenents, while we use a "xorg" product and a "driver/intel"
+component.) We definitely want to make any such confirmed bugs a
+priority, so it would be nice to have a consistent mechanism to search
+for these bugs. Suggestions are welcome on the best approach.
+
+Thanks in advance for any testing or feedback on this snapshot.
 
 Release 2.7.0 (2009-04-15)
 --------------------------
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/README new/xsrc/external/mit/xf86-video-intel/dist/README
--- old/xsrc/external/mit/xf86-video-intel/dist/README	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/README	2011-02-08 11:14:00.000000000 +0100
@@ -31,7 +31,7 @@ documentation can be read with the follo
 Mailing list for communication with users and developers of
 xf86-video-intel:
 
-	intel-gfx@lists.freedesktop.org.
+	intel-gfx@lists.freedesktop.org
 
 	Note: Subscription is required before posting, but anyone is
 	free to subscribe. See instructions (and archives) here:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/RELEASING new/xsrc/external/mit/xf86-video-intel/dist/RELEASING
--- old/xsrc/external/mit/xf86-video-intel/dist/RELEASING	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/RELEASING	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,52 @@
+The process for releasing a new tarball is as follows:
+
+1. Make sure you have the latest build requirements installed:
+
+	git://git.freedesktop.org/git/util/macros
+	git://git.freedesktop.org/git/util/modular
+
+2. Add relevant release notes to the NEWS files
+
+	Skim the git log since the last release, and add notes in a
+	similar style to previous releases.
+
+	For major releases list added features and known limitations.
+
+	For minor releases indicate which bugs were fixed and which
+	are still present.
+
+
+3. Update your module version (usually found in configure.ac)
+
+	$ vi configure.ac # bump version
+	$ git commit
+	$ git push origin # make sure you're on the release branch
+
+4. Verify your module builds
+
+	$ make distcheck
+
+5. Tag the release
+
+	$ git tag -m "Intel <ver> release" <ver>
+
+6. Run the release script (this should push the tag)
+
+	$ <path_to>/util/modular/release.sh driver <last_ver> <ver>
+
+7. Edit and send the generated release message.
+
+	At the very least, add the release notes from the NEWS file.
+
+	The message is generated as xf86-video-intel-<version>.announce
+
+	For snapshots and release candidates, mail to:
+
+		intel-gfx@lists.freedesktop.org
+
+	For major releases also send to:
+
+		xorg@lists.freedesktop.org
+		xorg-announce@lists.freedesktop.org
+
+8. Throw a release party, you're done! :)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_dumper.c new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_dumper.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_dumper.c	2008-08-02 07:12:50.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_dumper.c	2011-02-08 11:14:00.000000000 +0100
@@ -37,68 +37,71 @@
 #include <err.h>
 
 #ifndef DEFFILEMODE
-#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) /* 0666*/
+#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)	/* 0666 */
 #endif
 
 static void usage(void)
 {
-    fprintf(stderr, "usage: bios_dumper <filename>\n");
-    exit(1);
+	fprintf(stderr, "usage: bios_dumper <filename>\n");
+	exit(1);
 }
 
 int main(int argc, char **argv)
 {
-    struct pci_device *dev;
-    void *bios;
-    int err, fd;
-
-    if (argc != 2)
-	usage();
-
-    err = pci_system_init();
-    if (err != 0) {
-	fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err));
-	exit(1);
-    }
-
-    /* Grab the graphics card */
-    dev = pci_device_find_by_slot(0, 0, 2, 0);
-    if (dev == NULL)
-	errx(1, "Couldn't find graphics card");
-
-    err = pci_device_probe(dev);
-    if (err != 0) {
-	fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
-	exit(1);
-    }
-
-    if (dev->vendor_id != 0x8086)
-	errx(1, "Graphics card is non-intel");
-
-    bios = malloc(dev->rom_size);
-    if (bios == NULL)
-	errx(1, "Couldn't allocate memory for BIOS data\n");
-
-    err = pci_device_read_rom(dev, bios);
-    if (err != 0) {
-	fprintf(stderr, "Couldn't read graphics card ROM: %s\n",
-		strerror(err));
-	exit(1);
-    }
-
-    fd = open(argv[1], O_RDWR | O_CREAT | O_TRUNC, DEFFILEMODE);
-    if (fd < 0) {
-	fprintf(stderr, "Couldn't open output: %s\n", strerror(errno));
-	exit(1);
-    }
-
-    if (write(fd, bios, dev->rom_size) < dev->rom_size) {
-	fprintf(stderr, "Couldn't write BIOS data: %s\n", strerror(errno));
-	exit(1);
-    }
+	struct pci_device *dev;
+	void *bios;
+	int err, fd;
+
+	if (argc != 2)
+		usage();
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+
+	bios = malloc(dev->rom_size);
+	if (bios == NULL)
+		errx(1, "Couldn't allocate memory for BIOS data\n");
+
+	err = pci_device_read_rom(dev, bios);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't read graphics card ROM: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	fd = open(argv[1], O_RDWR | O_CREAT | O_TRUNC, DEFFILEMODE);
+	if (fd < 0) {
+		fprintf(stderr, "Couldn't open output: %s\n", strerror(errno));
+		exit(1);
+	}
+
+	if (write(fd, bios, dev->rom_size) < dev->rom_size) {
+		fprintf(stderr, "Couldn't write BIOS data: %s\n",
+			strerror(errno));
+		exit(1);
+	}
 
-    close(fd);
-    pci_system_cleanup();
+	close(fd);
+	pci_system_cleanup();
 
-    return 0;
+	return 0;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_reader.c new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_reader.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_reader.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/bios_reader.c	2011-02-08 11:14:00.000000000 +0100
@@ -35,7 +35,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-
 #include "../i830_bios.h"
 
 #include <X11/Xfuncproto.h>
@@ -43,10 +42,9 @@
 #define _PARSE_EDID_
 #include "edid.h"
 
-
 /* Make a fake pI830 so we can easily pull i830_bios.c code in here. */
 struct _fake_i830 {
-    uint8_t *VBIOS;
+	uint8_t *VBIOS;
 };
 struct _fake_i830 I830;
 struct _fake_i830 *pI830 = &I830;
@@ -55,16 +53,16 @@ struct _fake_i830 *pI830 = &I830;
 #define INTEL_BIOS_16(_addr)	(pI830->VBIOS[_addr] | \
 				 (pI830->VBIOS[_addr + 1] << 8))
 #define INTEL_BIOS_32(_addr)	(pI830->VBIOS[_addr] | \
-				 (pI830->VBIOS[_addr + 1] << 8) \
-				 (pI830->VBIOS[_addr + 2] << 16) \
+				 (pI830->VBIOS[_addr + 1] << 8) | \
+				 (pI830->VBIOS[_addr + 2] << 16) | \
 				 (pI830->VBIOS[_addr + 3] << 24))
 
 #define YESNO(val) ((val) ? "yes" : "no")
 
 struct bdb_block {
-    uint8_t id;
-    uint16_t size;
-    void *data;
+	uint8_t id;
+	uint16_t size;
+	void *data;
 };
 
 struct bdb_header *bdb;
@@ -74,430 +72,516 @@ static int panel_type;
 
 static struct bdb_block *find_section(int section_id)
 {
-    struct bdb_block *block;
-    unsigned char *base = (unsigned char *)bdb;
-    int index = 0;
-    uint16_t total, current_size;
-    unsigned char current_id;
-
-    /* skip to first section */
-    index += bdb->header_size;
-    total = bdb->bdb_size;
-
-    block = malloc(sizeof(*block));
-    if (!block) {
-	fprintf(stderr, "out of memory\n");
-	exit(-1);
-    }
-
-    /* walk the sections looking for section_id */
-    while (index < total) {
-	current_id = *(base + index);
-	index++;
-	current_size = *((uint16_t *)(base + index));
-	index += 2;
-	if (current_id == section_id) {
-	    block->id = current_id;
-	    block->size = current_size;
-	    block->data = base + index;
-	    return block;
+	struct bdb_block *block;
+	unsigned char *base = (unsigned char *)bdb;
+	int index = 0;
+	uint16_t total, current_size;
+	unsigned char current_id;
+
+	/* skip to first section */
+	index += bdb->header_size;
+	total = bdb->bdb_size;
+
+	block = malloc(sizeof(*block));
+	if (!block) {
+		fprintf(stderr, "out of memory\n");
+		exit(-1);
 	}
-	index += current_size;
-    }
 
-    free(block);
-    return NULL;
+	/* walk the sections looking for section_id */
+	while (index < total) {
+		current_id = *(base + index);
+		index++;
+		current_size = *((uint16_t *) (base + index));
+		index += 2;
+		if (current_id == section_id) {
+			block->id = current_id;
+			block->size = current_size;
+			block->data = base + index;
+			return block;
+		}
+		index += current_size;
+	}
+
+	free(block);
+	return NULL;
 }
 
 static void dump_general_features(void)
 {
-    struct bdb_general_features *features;
-    struct bdb_block *block;
+	struct bdb_general_features *features;
+	struct bdb_block *block;
+
+	block = find_section(BDB_GENERAL_FEATURES);
+
+	if (!block)
+		return;
+
+	features = block->data;
+
+	printf("General features block:\n");
+
+	printf("\tPanel fitting: ");
+	switch (features->panel_fitting) {
+	case 0:
+		printf("disabled\n");
+		break;
+	case 1:
+		printf("text only\n");
+		break;
+	case 2:
+		printf("graphics only\n");
+		break;
+	case 3:
+		printf("text & graphics\n");
+		break;
+	}
+	printf("\tFlexaim: %s\n", YESNO(features->flexaim));
+	printf("\tMessage: %s\n", YESNO(features->msg_enable));
+	printf("\tClear screen: %d\n", features->clear_screen);
+	printf("\tDVO color flip required: %s\n", YESNO(features->color_flip));
+	printf("\tExternal VBT: %s\n", YESNO(features->download_ext_vbt));
+	printf("\tEnable SSC: %s\n", YESNO(features->enable_ssc));
+	if (features->enable_ssc)
+		printf("\tSSC frequency: %s\n", features->ssc_freq ?
+		       "100 MHz (66 MHz on 855)" : "96 MHz (48 MHz on 855)");
+	printf("\tLFP on override: %s\n",
+	       YESNO(features->enable_lfp_on_override));
+	printf("\tDisable SSC on clone: %s\n",
+	       YESNO(features->disable_ssc_ddt));
+	printf("\tDisable smooth vision: %s\n",
+	       YESNO(features->disable_smooth_vision));
+	printf("\tSingle DVI for CRT/DVI: %s\n", YESNO(features->single_dvi));
+	printf("\tLegacy monitor detect: %s\n",
+	       YESNO(features->legacy_monitor_detect));
+	printf("\tIntegrated CRT: %s\n", YESNO(features->int_crt_support));
+	printf("\tIntegrated TV: %s\n", YESNO(features->int_tv_support));
+
+	tv_present = 1;		/* should be based on whether TV DAC exists */
+	lvds_present = 1;	/* should be based on IS_MOBILE() */
+
+	free(block);
+}
+
+static void dump_backlight_info(void)
+{
+	struct bdb_block *block;
+	struct bdb_lvds_backlight *backlight;
+	struct blc_struct *blc;
+
+	block = find_section(BDB_LVDS_BACKLIGHT);
 
-    block = find_section(BDB_GENERAL_FEATURES);
+	if (!block)
+		return;
+
+	backlight = block->data;
 
-    if (!block)
-	return;
+	printf("Backlight info block (len %d):\n", block->size);
 
-    features = block->data;
-
-    printf("General features block:\n");
-
-    printf("\tPanel fitting: ");
-    switch (features->panel_fitting) {
-    case 0:
-	printf("disabled\n");
-	break;
-    case 1:
-	printf("text only\n");
-	break;
-    case 2:
-	printf("graphics only\n");
-	break;
-    case 3:
-	printf("text & graphics\n");
-	break;
-    }
-    printf("\tFlexaim: %s\n", YESNO(features->flexaim));
-    printf("\tMessage: %s\n", YESNO(features->msg_enable));
-    printf("\tClear screen: %d\n", features->clear_screen);
-    printf("\tDVO color flip required: %s\n", YESNO(features->color_flip));
-    printf("\tExternal VBT: %s\n", YESNO(features->download_ext_vbt));
-    printf("\tEnable SSC: %s\n", YESNO(features->enable_ssc));
-    if (features->enable_ssc)
-	printf("\tSSC frequency: %s\n", features->ssc_freq ?
-	       "100 MHz (66 MHz on 855)" : "96 MHz (48 MHz on 855)");
-    printf("\tLFP on override: %s\n", YESNO(features->enable_lfp_on_override));
-    printf("\tDisable SSC on clone: %s\n", YESNO(features->disable_ssc_ddt));
-    printf("\tDisable smooth vision: %s\n",
-	   YESNO(features->disable_smooth_vision));
-    printf("\tSingle DVI for CRT/DVI: %s\n", YESNO(features->single_dvi));
-    printf("\tLegacy monitor detect: %s\n",
-	   YESNO(features->legacy_monitor_detect));
-    printf("\tIntegrated CRT: %s\n", YESNO(features->int_crt_support));
-    printf("\tIntegrated TV: %s\n", YESNO(features->int_tv_support));
+	if (sizeof(struct blc_struct) != backlight->blcstruct_size) {
+		printf
+		    ("\tBacklight struct sizes don't match (expected %d, got %d), skipping\n",
+		     sizeof(struct blc_struct), backlight->blcstruct_size);
+		return;
+	}
 
-    tv_present = 1; /* should be based on whether TV DAC exists */
-    lvds_present = 1; /* should be based on IS_MOBILE() */
+	blc = &backlight->panels[panel_type];
 
-    free(block);
+	printf("\tInverter type: %d\n", blc->inverter_type);
+	printf("\t     polarity: %d\n", blc->inverter_polarity);
+	printf("\t    GPIO pins: %d\n", blc->gpio_pins);
+	printf("\t  GMBUS speed: %d\n", blc->gmbus_speed);
+	printf("\t     PWM freq: %d\n", blc->pwm_freq);
+	printf("\tMinimum brightness: %d\n", blc->min_brightness);
+	printf("\tI2C slave addr: 0x%02x\n", blc->i2c_slave_addr);
+	printf("\tI2C command: 0x%02x\n", blc->i2c_cmd);
 }
 
 static void dump_general_definitions(void)
 {
-    struct bdb_block *block;
-    struct bdb_general_definitions *defs;
-    struct child_device_config *child;
-    int i;
-    char child_id[11];
-
-    block = find_section(BDB_GENERAL_DEFINITIONS);
-
-    if (!block)
-	return;
-
-    defs = block->data;
-
-    printf("General definitions block:\n");
-
-    printf("\tCRT DDC GMBUS addr: 0x%02x\n", defs->crt_ddc_gmbus_pin);
-    printf("\tUse ACPI DPMS CRT power states: %s\n", YESNO(defs->dpms_acpi));
-    printf("\tSkip CRT detect at boot: %s\n",
-	   YESNO(defs->skip_boot_crt_detect));
-    printf("\tUse DPMS on AIM devices: %s\n", YESNO(defs->dpms_aim));
-    printf("\tBoot display type: 0x%02x%02x\n", defs->boot_display[1],
-	   defs->boot_display[0]);
-    printf("\tTV data block present: %s\n", YESNO(tv_present));
-    for (i = 0; i < 4; i++) {
-	child = &defs->devices[i];
-	if (!child->device_type) {
-	    printf("\tChild device %d not present\n", i);
-	    continue;
-	}
-	strncpy(child_id, (char *)child->device_id, 10);
-	child_id[10] = 0;
-	printf("\tChild %d device info:\n", i);
-	printf("\t\tSignature: %s\n", child_id);
-	printf("\t\tAIM offset: %d\n", child->addin_offset);
-	printf("\t\tDVO port: 0x%02x\n", child->dvo_port);
-    }
+	struct bdb_block *block;
+	struct bdb_general_definitions *defs;
+	struct child_device_config *child;
+	int i;
+	char child_id[11];
+	int child_device_num;
+
+	block = find_section(BDB_GENERAL_DEFINITIONS);
+
+	if (!block)
+		return;
+
+	defs = block->data;
+
+	printf("General definitions block:\n");
+
+	printf("\tCRT DDC GMBUS addr: 0x%02x\n", defs->crt_ddc_gmbus_pin);
+	printf("\tUse ACPI DPMS CRT power states: %s\n",
+	       YESNO(defs->dpms_acpi));
+	printf("\tSkip CRT detect at boot: %s\n",
+	       YESNO(defs->skip_boot_crt_detect));
+	printf("\tUse DPMS on AIM devices: %s\n", YESNO(defs->dpms_aim));
+	printf("\tBoot display type: 0x%02x%02x\n", defs->boot_display[1],
+	       defs->boot_display[0]);
+	printf("\tTV data block present: %s\n", YESNO(tv_present));
+	child_device_num = (block->size - sizeof(*defs)) / sizeof(*child);
+	for (i = 0; i < child_device_num; i++) {
+		child = &defs->devices[i];
+		if (!child->device_type) {
+			printf("\tChild device %d not present\n", i);
+			continue;
+		}
+		strncpy(child_id, (char *)child->device_id, 10);
+		child_id[10] = 0;
+		printf("\tChild %d device info:\n", i);
+		printf("\t\tSignature: %s\n", child_id);
+		printf("\t\tAIM offset: %d\n", child->addin_offset);
+		printf("\t\tDVO port: 0x%02x\n", child->dvo_port);
+	}
 
-    free(block);
+	free(block);
 }
 
 #if 0
 static void dump_child_devices(void)
 {
-    struct bdb_block *block;
-    struct bdb_child_devices *child_devs;
-    struct child_device_config *child;
-    int i;
-
-    block = find_section(BDB_CHILD_DEVICE_TABLE);
-    if (!block) {
-	printf("No child device table found\n");
-	return;
-    }
-
-    child_devs = block->data;
-
-    printf("Child devices block:\n");
-    for (i = 0; i < DEVICE_CHILD_SIZE; i++) {
-	child = &child_devs->children[i];
-	/* Skip nonexistent children */
-	if (!child->device_type)
-	    continue;
-	printf("\tChild device %d\n", i);
-	printf("\t\tType: 0x%04x\n", child->device_type);
-	printf("\t\tDVO port: 0x%02x\n", child->dvo_port);
-	printf("\t\tI2C pin: 0x%02x\n", child->i2c_pin);
-	printf("\t\tSlave addr: 0x%02x\n", child->slave_addr);
-	printf("\t\tDDC pin: 0x%02x\n", child->ddc_pin);
-	printf("\t\tDVO config: 0x%02x\n", child->dvo_cfg);
-	printf("\t\tDVO wiring: 0x%02x\n", child->dvo_wiring);
-    }
+	struct bdb_block *block;
+	struct bdb_child_devices *child_devs;
+	struct child_device_config *child;
+	int i;
+
+	block = find_section(BDB_CHILD_DEVICE_TABLE);
+	if (!block) {
+		printf("No child device table found\n");
+		return;
+	}
+
+	child_devs = block->data;
+
+	printf("Child devices block:\n");
+	for (i = 0; i < DEVICE_CHILD_SIZE; i++) {
+		child = &child_devs->children[i];
+		/* Skip nonexistent children */
+		if (!child->device_type)
+			continue;
+		printf("\tChild device %d\n", i);
+		printf("\t\tType: 0x%04x\n", child->device_type);
+		printf("\t\tDVO port: 0x%02x\n", child->dvo_port);
+		printf("\t\tI2C pin: 0x%02x\n", child->i2c_pin);
+		printf("\t\tSlave addr: 0x%02x\n", child->slave_addr);
+		printf("\t\tDDC pin: 0x%02x\n", child->ddc_pin);
+		printf("\t\tDVO config: 0x%02x\n", child->dvo_cfg);
+		printf("\t\tDVO wiring: 0x%02x\n", child->dvo_wiring);
+	}
 
-    free(block);
+	free(block);
 }
 #endif
 
 static void dump_lvds_options(void)
 {
-    struct bdb_block *block;
-    struct bdb_lvds_options *options;
+	struct bdb_block *block;
+	struct bdb_lvds_options *options;
+
+	block = find_section(BDB_LVDS_OPTIONS);
+	if (!block) {
+		printf("No LVDS options block\n");
+		return;
+	}
+
+	options = block->data;
 
-    block = find_section(BDB_LVDS_OPTIONS);
-    if (!block) {
-	printf("No LVDS options block\n");
-	return;
-    }
-
-    options = block->data;
-
-    printf("LVDS options block:\n");
-
-    panel_type = options->panel_type;
-    printf("\tPanel type: %d\n", panel_type);
-    printf("\tLVDS EDID available: %s\n", YESNO(options->lvds_edid));
-    printf("\tPixel dither: %s\n", YESNO(options->pixel_dither));
-    printf("\tPFIT auto ratio: %s\n", YESNO(options->pfit_ratio_auto));
-    printf("\tPFIT enhanced graphics mode: %s\n",
-	   YESNO(options->pfit_gfx_mode_enhanced));
-    printf("\tPFIT enhanced text mode: %s\n",
-	   YESNO(options->pfit_text_mode_enhanced));
-    printf("\tPFIT mode: %d\n", options->pfit_mode);
+	printf("LVDS options block:\n");
 
-    free(block);
+	panel_type = options->panel_type;
+	printf("\tPanel type: %d\n", panel_type);
+	printf("\tLVDS EDID available: %s\n", YESNO(options->lvds_edid));
+	printf("\tPixel dither: %s\n", YESNO(options->pixel_dither));
+	printf("\tPFIT auto ratio: %s\n", YESNO(options->pfit_ratio_auto));
+	printf("\tPFIT enhanced graphics mode: %s\n",
+	       YESNO(options->pfit_gfx_mode_enhanced));
+	printf("\tPFIT enhanced text mode: %s\n",
+	       YESNO(options->pfit_text_mode_enhanced));
+	printf("\tPFIT mode: %d\n", options->pfit_mode);
+
+	free(block);
 }
 
 static void dump_lvds_ptr_data(void)
 {
-    struct bdb_block *block;
-    struct bdb_lvds_lfp_data_ptrs *ptrs;
-    struct lvds_fp_timing *fp_timing;
-
-    block = find_section(BDB_LVDS_LFP_DATA_PTRS);
-    if (!block) {
-	printf("No LFP data pointers block\n");
-	return;
-    }
-
-    ptrs = block->data;
-    fp_timing =	(struct lvds_fp_timing *)((uint8_t *)bdb +
-					  ptrs->ptr[panel_type].fp_timing_offset);
+	struct bdb_block *block;
+	struct bdb_lvds_lfp_data *lvds_data;
+	struct bdb_lvds_lfp_data_ptrs *ptrs;
+	struct lvds_fp_timing *fp_timing;
+	struct bdb_lvds_lfp_data_entry *entry;
+	int lfp_data_size;
+
+	block = find_section(BDB_LVDS_LFP_DATA_PTRS);
+	if (!block) {
+		printf("No LFP data pointers block\n");
+		return;
+	}
+	ptrs = block->data;
+
+	block = find_section(BDB_LVDS_LFP_DATA);
+	if (!block) {
+		printf("No LVDS data block\n");
+		return;
+	}
+	lvds_data = block->data;
 
-    printf("LVDS timing pointer data:\n");
-    printf("  Number of entries: %d\n", ptrs->lvds_entries);
+	lfp_data_size =
+	    ptrs->ptr[1].fp_timing_offset - ptrs->ptr[0].fp_timing_offset;
+	entry =
+	    (struct bdb_lvds_lfp_data_entry *)((uint8_t *) lvds_data->data +
+					       (lfp_data_size * panel_type));
+	fp_timing = &entry->fp_timing;
 
-    printf("\tpanel type %02i: %dx%d\n", panel_type, fp_timing->x_res,
-	   fp_timing->y_res);
+	printf("LVDS timing pointer data:\n");
+	printf("  Number of entries: %d\n", ptrs->lvds_entries);
 
-    free(block);
+	printf("\tpanel type %02i: %dx%d\n", panel_type, fp_timing->x_res,
+	       fp_timing->y_res);
+
+	free(block);
 }
 
 static void dump_lvds_data(void)
 {
-    struct bdb_block *block;
-    struct bdb_lvds_lfp_data *lvds_data;
-    int num_entries;
-    int i;
-    int hdisplay, hsyncstart, hsyncend, htotal;
-    int vdisplay, vsyncstart, vsyncend, vtotal;
-    float clock;
-
-    block = find_section(BDB_LVDS_LFP_DATA);
-    if (!block) {
-	printf("No LVDS data block\n");
-	return;
-    }
-
-    lvds_data = block->data;
-    num_entries = block->size / sizeof(struct bdb_lvds_lfp_data_entry);
-
-    printf("LVDS panel data block (preferred block marked with '*'):\n");
-    printf("  Number of entries: %d\n", num_entries);
-
-    for (i = 0; i < num_entries; i++) {
-	struct bdb_lvds_lfp_data_entry *lfp_data = &lvds_data->data[i];
-	uint8_t *timing_data = (uint8_t *)&lfp_data->dvo_timing;
-	char marker;
-
-	if (i == panel_type)
-	    marker = '*';
-	else
-	    marker = ' ';
-
-	hdisplay   = _H_ACTIVE(timing_data);
-	hsyncstart = hdisplay + _H_SYNC_OFF(timing_data);
-	hsyncend   = hsyncstart + _H_SYNC_WIDTH(timing_data);
-	htotal     = hdisplay + _H_BLANK(timing_data);
-
-	vdisplay   = _V_ACTIVE(timing_data);
-	vsyncstart = vdisplay + _V_SYNC_OFF(timing_data);
-	vsyncend   = vsyncstart + _V_SYNC_WIDTH(timing_data);
-	vtotal     = vdisplay + _V_BLANK(timing_data);
-	clock      = _PIXEL_CLOCK(timing_data) / 1000;
-
-	printf("%c\tpanel type %02i: %dx%d clock %d\n", marker,
-	       i, lfp_data->fp_timing.x_res, lfp_data->fp_timing.y_res,
-	       _PIXEL_CLOCK(timing_data));
-	printf("\t\tinfo:\n");
-	printf("\t\t  LVDS: 0x%08lx\n",
-	       (unsigned long)lfp_data->fp_timing.lvds_reg_val);
-	printf("\t\t  PP_ON_DELAYS: 0x%08lx\n",
-	       (unsigned long)lfp_data->fp_timing.pp_on_reg_val);
-	printf("\t\t  PP_OFF_DELAYS: 0x%08lx\n",
-	       (unsigned long)lfp_data->fp_timing.pp_off_reg_val);
-	printf("\t\t  PP_DIVISOR: 0x%08lx\n",
-	       (unsigned long)lfp_data->fp_timing.pp_cycle_reg_val);
-	printf("\t\t  PFIT: 0x%08lx\n",
-	       (unsigned long)lfp_data->fp_timing.pfit_reg_val);
-	printf("\t\ttimings: %d %d %d %d %d %d %d %d %.2f (%s)\n",
-	       hdisplay, hsyncstart, hsyncend, htotal,
-	       vdisplay, vsyncstart, vsyncend, vtotal, clock,
-	       (hsyncend > htotal || vsyncend > vtotal) ?
-	       "BAD!" : "good");
-    }
-    free(block);
+	struct bdb_block *block;
+	struct bdb_lvds_lfp_data *lvds_data;
+	struct bdb_lvds_lfp_data_ptrs *ptrs;
+	int num_entries;
+	int i;
+	int hdisplay, hsyncstart, hsyncend, htotal;
+	int vdisplay, vsyncstart, vsyncend, vtotal;
+	float clock;
+	int lfp_data_size, dvo_offset;
+
+	block = find_section(BDB_LVDS_LFP_DATA_PTRS);
+	if (!block) {
+		printf("No LVDS ptr block\n");
+		return;
+	}
+	ptrs = block->data;
+	lfp_data_size =
+	    ptrs->ptr[1].fp_timing_offset - ptrs->ptr[0].fp_timing_offset;
+	dvo_offset =
+	    ptrs->ptr[0].dvo_timing_offset - ptrs->ptr[0].fp_timing_offset;
+	free(block);
+
+	block = find_section(BDB_LVDS_LFP_DATA);
+	if (!block) {
+		printf("No LVDS data block\n");
+		return;
+	}
+
+	lvds_data = block->data;
+	num_entries = block->size / lfp_data_size;
+
+	printf("LVDS panel data block (preferred block marked with '*'):\n");
+	printf("  Number of entries: %d\n", num_entries);
+
+	for (i = 0; i < num_entries; i++) {
+		uint8_t *lfp_data_ptr =
+		    (uint8_t *) lvds_data->data + lfp_data_size * i;
+		uint8_t *timing_data = lfp_data_ptr + dvo_offset;
+		struct bdb_lvds_lfp_data_entry *lfp_data =
+		    (struct bdb_lvds_lfp_data_entry *)lfp_data_ptr;
+		char marker;
+
+		if (i == panel_type)
+			marker = '*';
+		else
+			marker = ' ';
+
+		hdisplay = _H_ACTIVE(timing_data);
+		hsyncstart = hdisplay + _H_SYNC_OFF(timing_data);
+		hsyncend = hsyncstart + _H_SYNC_WIDTH(timing_data);
+		htotal = hdisplay + _H_BLANK(timing_data);
+
+		vdisplay = _V_ACTIVE(timing_data);
+		vsyncstart = vdisplay + _V_SYNC_OFF(timing_data);
+		vsyncend = vsyncstart + _V_SYNC_WIDTH(timing_data);
+		vtotal = vdisplay + _V_BLANK(timing_data);
+		clock = _PIXEL_CLOCK(timing_data) / 1000;
+
+		printf("%c\tpanel type %02i: %dx%d clock %d\n", marker,
+		       i, lfp_data->fp_timing.x_res, lfp_data->fp_timing.y_res,
+		       _PIXEL_CLOCK(timing_data));
+		printf("\t\tinfo:\n");
+		printf("\t\t  LVDS: 0x%08lx\n",
+		       (unsigned long)lfp_data->fp_timing.lvds_reg_val);
+		printf("\t\t  PP_ON_DELAYS: 0x%08lx\n",
+		       (unsigned long)lfp_data->fp_timing.pp_on_reg_val);
+		printf("\t\t  PP_OFF_DELAYS: 0x%08lx\n",
+		       (unsigned long)lfp_data->fp_timing.pp_off_reg_val);
+		printf("\t\t  PP_DIVISOR: 0x%08lx\n",
+		       (unsigned long)lfp_data->fp_timing.pp_cycle_reg_val);
+		printf("\t\t  PFIT: 0x%08lx\n",
+		       (unsigned long)lfp_data->fp_timing.pfit_reg_val);
+		printf("\t\ttimings: %d %d %d %d %d %d %d %d %.2f (%s)\n",
+		       hdisplay, hsyncstart, hsyncend, htotal,
+		       vdisplay, vsyncstart, vsyncend, vtotal, clock,
+		       (hsyncend > htotal || vsyncend > vtotal) ?
+		       "BAD!" : "good");
+	}
+	free(block);
 }
 
 static void dump_driver_feature(void)
 {
-    struct bdb_block *block;
-    struct bdb_driver_feature *feature;
+	struct bdb_block *block;
+	struct bdb_driver_feature *feature;
+
+	block = find_section(BDB_DRIVER_FEATURES);
+	if (!block) {
+		printf("No Driver feature data block\n");
+		return;
+	}
+	feature = block->data;
 
-    block = find_section(BDB_DRIVER_FEATURES);
-    if (!block) {
-	printf("No Driver feature data block\n");
-	return;
-    }
-    feature = block->data;
-
-    printf("Driver feature Data Block:\n");
-    printf("\tBoot Device Algorithm: %s\n", feature->boot_dev_algorithm ?
-	    "driver default": "os default");
-    printf("\tBlock display switching when DVD active: %s\n",
-	    YESNO(feature->block_display_switch));
-    printf("\tAllow display switching when in Full Screen DOS: %s\n",
-	    YESNO(feature->allow_display_switch));
-    printf("\tHot Plug DVO: %s\n", YESNO(feature->hotplug_dvo));
-    printf("\tDual View Zoom: %s\n", YESNO(feature->dual_view_zoom));
-    printf("\tDriver INT 15h hook: %s\n", YESNO(feature->int15h_hook));
-    printf("\tEnable Sprite in Clone Mode: %s\n", YESNO(feature->sprite_in_clone));
-    printf("\tUse 00000110h ID for Primary LFP: %s\n", YESNO(feature->primary_lfp_id));
-    printf("\tBoot Mode X: %u\n", feature->boot_mode_x);
-    printf("\tBoot Mode Y: %u\n", feature->boot_mode_y);
-    printf("\tBoot Mode Bpp: %u\n", feature->boot_mode_bpp);
-    printf("\tBoot Mode Refresh: %u\n", feature->boot_mode_refresh);
-    printf("\tEnable LFP as primary: %s\n", YESNO(feature->enable_lfp_primary));
-    printf("\tSelective Mode Pruning: %s\n", YESNO(feature->selective_mode_pruning));
-    printf("\tDual-Frequency Graphics Technology: %s\n", YESNO(feature->dual_frequency));
-    printf("\tDefault Render Clock Frequency: %s\n", feature->render_clock_freq ? "low" : "high");
-    printf("\tNT 4.0 Dual Display Clone Support: %s\n", YESNO(feature->nt_clone_support));
-    printf("\tDefault Power Scheme user interface: %s\n", feature->power_scheme_ui ? "3rd party":"CUI");
-    printf("\tSprite Display Assignment when Overlay is Active in Clone Mode: %s\n",
-	    feature->sprite_display_assign ? "primary" : "secondary");
-    printf("\tDisplay Maintain Aspect Scaling via CUI: %s\n", YESNO(feature->cui_aspect_scaling));
-    printf("\tPreserve Aspect Ratio: %s\n", YESNO(feature->preserve_aspect_ratio));
-    printf("\tEnable SDVO device power down: %s\n", YESNO(feature->sdvo_device_power_down));
-    printf("\tCRT hotplug: %s\n", YESNO(feature->crt_hotplug));
-    printf("\tLVDS config: ");
-    switch (feature->lvds_config) {
+	printf("Driver feature Data Block:\n");
+	printf("\tBoot Device Algorithm: %s\n", feature->boot_dev_algorithm ?
+	       "driver default" : "os default");
+	printf("\tBlock display switching when DVD active: %s\n",
+	       YESNO(feature->block_display_switch));
+	printf("\tAllow display switching when in Full Screen DOS: %s\n",
+	       YESNO(feature->allow_display_switch));
+	printf("\tHot Plug DVO: %s\n", YESNO(feature->hotplug_dvo));
+	printf("\tDual View Zoom: %s\n", YESNO(feature->dual_view_zoom));
+	printf("\tDriver INT 15h hook: %s\n", YESNO(feature->int15h_hook));
+	printf("\tEnable Sprite in Clone Mode: %s\n",
+	       YESNO(feature->sprite_in_clone));
+	printf("\tUse 00000110h ID for Primary LFP: %s\n",
+	       YESNO(feature->primary_lfp_id));
+	printf("\tBoot Mode X: %u\n", feature->boot_mode_x);
+	printf("\tBoot Mode Y: %u\n", feature->boot_mode_y);
+	printf("\tBoot Mode Bpp: %u\n", feature->boot_mode_bpp);
+	printf("\tBoot Mode Refresh: %u\n", feature->boot_mode_refresh);
+	printf("\tEnable LFP as primary: %s\n",
+	       YESNO(feature->enable_lfp_primary));
+	printf("\tSelective Mode Pruning: %s\n",
+	       YESNO(feature->selective_mode_pruning));
+	printf("\tDual-Frequency Graphics Technology: %s\n",
+	       YESNO(feature->dual_frequency));
+	printf("\tDefault Render Clock Frequency: %s\n",
+	       feature->render_clock_freq ? "low" : "high");
+	printf("\tNT 4.0 Dual Display Clone Support: %s\n",
+	       YESNO(feature->nt_clone_support));
+	printf("\tDefault Power Scheme user interface: %s\n",
+	       feature->power_scheme_ui ? "3rd party" : "CUI");
+	printf
+	    ("\tSprite Display Assignment when Overlay is Active in Clone Mode: %s\n",
+	     feature->sprite_display_assign ? "primary" : "secondary");
+	printf("\tDisplay Maintain Aspect Scaling via CUI: %s\n",
+	       YESNO(feature->cui_aspect_scaling));
+	printf("\tPreserve Aspect Ratio: %s\n",
+	       YESNO(feature->preserve_aspect_ratio));
+	printf("\tEnable SDVO device power down: %s\n",
+	       YESNO(feature->sdvo_device_power_down));
+	printf("\tCRT hotplug: %s\n", YESNO(feature->crt_hotplug));
+	printf("\tLVDS config: ");
+	switch (feature->lvds_config) {
 	case BDB_DRIVER_NO_LVDS:
-	    printf("No LVDS\n");
-	    break;
+		printf("No LVDS\n");
+		break;
 	case BDB_DRIVER_INT_LVDS:
-	    printf("Integrated LVDS\n");
-	    break;
+		printf("Integrated LVDS\n");
+		break;
 	case BDB_DRIVER_SDVO_LVDS:
-	    printf("SDVO LVDS\n");
-	    break;
+		printf("SDVO LVDS\n");
+		break;
 	case BDB_DRIVER_EDP:
-	    printf("Embedded DisplayPort\n");
-	    break;
-    }
-    printf("\tDefine Display statically: %s\n", YESNO(feature->static_display));
-    printf("\tLegacy CRT max X: %d\n", feature->legacy_crt_max_x);
-    printf("\tLegacy CRT max Y: %d\n", feature->legacy_crt_max_y);
-    printf("\tLegacy CRT max refresh: %d\n", feature->legacy_crt_max_refresh);
-    free(block);
+		printf("Embedded DisplayPort\n");
+		break;
+	}
+	printf("\tDefine Display statically: %s\n",
+	       YESNO(feature->static_display));
+	printf("\tLegacy CRT max X: %d\n", feature->legacy_crt_max_x);
+	printf("\tLegacy CRT max Y: %d\n", feature->legacy_crt_max_y);
+	printf("\tLegacy CRT max refresh: %d\n",
+	       feature->legacy_crt_max_refresh);
+	free(block);
 }
 
 int main(int argc, char **argv)
 {
-    int fd;
-    struct vbt_header *vbt = NULL;
-    int vbt_off, bdb_off, i;
-    char *filename = "bios";
-    struct stat finfo;
-    struct bdb_block *block;
-    char signature[17];
-
-    if (argc != 2) {
-	printf("usage: %s <rom file>\n", argv[0]);
-	return 1;
-    }
-
-    filename = argv[1];
-
-    fd = open(filename, O_RDONLY);
-    if (fd == -1) {
-	printf("Couldn't open \"%s\": %s\n", filename, strerror(errno));
-	return 1;
-    }
-
-    if (stat(filename, &finfo)) {
-	printf("failed to stat \"%s\": %s\n", filename, strerror(errno));
-	return 1;
-    }
-
-    pI830->VBIOS = mmap(NULL, finfo.st_size, PROT_READ, MAP_SHARED, fd, 0);
-    if (pI830->VBIOS == MAP_FAILED) {
-	printf("failed to map \"%s\": %s\n", filename, strerror(errno));
-	return 1;
-    }
-
-    /* Scour memory looking for the VBT signature */
-    for (i = 0; i + 4 < finfo.st_size; i++) {
-	if (!memcmp(pI830->VBIOS + i, "$VBT", 4)) {
-	    vbt_off = i;
-	    vbt = (struct vbt_header *)(pI830->VBIOS + i);
-	    break;
-	}
-    }
-
-    if (!vbt) {
-	printf("VBT signature missing\n");
-	return 1;
-    }
-
-    printf("VBT vers: %d.%d\n", vbt->version / 100, vbt->version % 100);
-
-    bdb_off = vbt_off + vbt->bdb_offset;
-    bdb = (struct bdb_header *)(pI830->VBIOS + bdb_off);
-    strncpy(signature, (char *)bdb->signature, 16);
-    signature[16] = 0;
-    printf("BDB sig: %s\n", signature);
-    printf("BDB vers: %d.%d\n", bdb->version / 100, bdb->version % 100);
-
-    printf("Available sections: ");
-    for (i = 0; i < 256; i++) {
-	block = find_section(i);
-	if (!block)
-	    continue;
-	printf("%d ", i);
-	free(block);
-    }
-    printf("\n");
+	int fd;
+	struct vbt_header *vbt = NULL;
+	int vbt_off, bdb_off, i;
+	char *filename = "bios";
+	struct stat finfo;
+	struct bdb_block *block;
+	char signature[17];
+
+	if (argc != 2) {
+		printf("usage: %s <rom file>\n", argv[0]);
+		return 1;
+	}
+
+	filename = argv[1];
+
+	fd = open(filename, O_RDONLY);
+	if (fd == -1) {
+		printf("Couldn't open \"%s\": %s\n", filename, strerror(errno));
+		return 1;
+	}
+
+	if (stat(filename, &finfo)) {
+		printf("failed to stat \"%s\": %s\n", filename,
+		       strerror(errno));
+		return 1;
+	}
+
+	pI830->VBIOS = mmap(NULL, finfo.st_size, PROT_READ, MAP_SHARED, fd, 0);
+	if (pI830->VBIOS == MAP_FAILED) {
+		printf("failed to map \"%s\": %s\n", filename, strerror(errno));
+		return 1;
+	}
+
+	/* Scour memory looking for the VBT signature */
+	for (i = 0; i + 4 < finfo.st_size; i++) {
+		if (!memcmp(pI830->VBIOS + i, "$VBT", 4)) {
+			vbt_off = i;
+			vbt = (struct vbt_header *)(pI830->VBIOS + i);
+			break;
+		}
+	}
+
+	if (!vbt) {
+		printf("VBT signature missing\n");
+		return 1;
+	}
+
+	printf("VBT vers: %d.%d\n", vbt->version / 100, vbt->version % 100);
+
+	bdb_off = vbt_off + vbt->bdb_offset;
+	bdb = (struct bdb_header *)(pI830->VBIOS + bdb_off);
+	strncpy(signature, (char *)bdb->signature, 16);
+	signature[16] = 0;
+	printf("BDB sig: %s\n", signature);
+	printf("BDB vers: %d.%d\n", bdb->version / 100, bdb->version % 100);
+
+	printf("Available sections: ");
+	for (i = 0; i < 256; i++) {
+		block = find_section(i);
+		if (!block)
+			continue;
+		printf("%d ", i);
+		free(block);
+	}
+	printf("\n");
 
-    dump_general_features();
-    dump_general_definitions();
+	dump_general_features();
+	dump_general_definitions();
 //    dump_child_devices();
-    dump_lvds_options();
-    dump_lvds_data();
-    dump_lvds_ptr_data();
+	dump_lvds_options();
+	dump_lvds_data();
+	dump_lvds_ptr_data();
+	dump_backlight_info();
 
-    dump_driver_feature();
+	dump_driver_feature();
 
-    return 0;
+	return 0;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.am	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -1,9 +1,8 @@
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ @PCIACCESS_CFLAGS@ \
+AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \
 	-DREG_DUMPER
 
 noinst_PROGRAMS = bios_reader  $(BIOS_DUMPER) $(SWF_DUMPER)
 
-if LIBPCIACCESS
 BIOS_DUMPER = bios_dumper
 
 bios_dumper_SOURCES = bios_dumper.c
@@ -15,5 +14,3 @@ SWF_DUMPER = swf_dumper
 swf_dumper_SOURCES = swf_dumper.c
 
 swf_dumper_LDADD = $(PCIACCESS_LIBS)
-
-endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.in	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -36,47 +40,49 @@ noinst_PROGRAMS = bios_reader$(EXEEXT) $
 subdir = src/bios_reader
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-@LIBPCIACCESS_TRUE@am__EXEEXT_1 = bios_dumper$(EXEEXT)
-@LIBPCIACCESS_TRUE@am__EXEEXT_2 = swf_dumper$(EXEEXT)
+am__EXEEXT_1 = bios_dumper$(EXEEXT)
+am__EXEEXT_2 = swf_dumper$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
-am__bios_dumper_SOURCES_DIST = bios_dumper.c
-@LIBPCIACCESS_TRUE@am_bios_dumper_OBJECTS = bios_dumper.$(OBJEXT)
+am_bios_dumper_OBJECTS = bios_dumper.$(OBJEXT)
 bios_dumper_OBJECTS = $(am_bios_dumper_OBJECTS)
 am__DEPENDENCIES_1 =
-@LIBPCIACCESS_TRUE@bios_dumper_DEPENDENCIES = $(am__DEPENDENCIES_1)
+bios_dumper_DEPENDENCIES = $(am__DEPENDENCIES_1)
 bios_reader_SOURCES = bios_reader.c
 bios_reader_OBJECTS = bios_reader.$(OBJEXT)
 bios_reader_LDADD = $(LDADD)
-am__swf_dumper_SOURCES_DIST = swf_dumper.c
-@LIBPCIACCESS_TRUE@am_swf_dumper_OBJECTS = swf_dumper.$(OBJEXT)
+am_swf_dumper_OBJECTS = swf_dumper.$(OBJEXT)
 swf_dumper_OBJECTS = $(am_swf_dumper_OBJECTS)
-@LIBPCIACCESS_TRUE@swf_dumper_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+swf_dumper_DEPENDENCIES = $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(bios_dumper_SOURCES) bios_reader.c $(swf_dumper_SOURCES)
-DIST_SOURCES = $(am__bios_dumper_SOURCES_DIST) bios_reader.c \
-	$(am__swf_dumper_SOURCES_DIST)
+DIST_SOURCES = $(bios_dumper_SOURCES) bios_reader.c \
+	$(swf_dumper_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -84,41 +90,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -126,12 +149,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -139,13 +161,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -159,26 +176,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -190,13 +208,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -210,7 +226,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -221,21 +236,17 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ @PCIACCESS_CFLAGS@ \
+AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \
 	-DREG_DUMPER
 
-@LIBPCIACCESS_TRUE@BIOS_DUMPER = bios_dumper
-@LIBPCIACCESS_TRUE@bios_dumper_SOURCES = bios_dumper.c
-@LIBPCIACCESS_TRUE@bios_dumper_LDADD = $(PCIACCESS_LIBS)
-@LIBPCIACCESS_TRUE@SWF_DUMPER = swf_dumper
-@LIBPCIACCESS_TRUE@swf_dumper_SOURCES = swf_dumper.c
-@LIBPCIACCESS_TRUE@swf_dumper_LDADD = $(PCIACCESS_LIBS)
+BIOS_DUMPER = bios_dumper
+bios_dumper_SOURCES = bios_dumper.c
+bios_dumper_LDADD = $(PCIACCESS_LIBS)
+SWF_DUMPER = swf_dumper
+swf_dumper_SOURCES = swf_dumper.c
+swf_dumper_LDADD = $(PCIACCESS_LIBS)
 all: all-am
 
 .SUFFIXES:
@@ -244,8 +255,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -278,13 +289,13 @@ clean-noinstPROGRAMS:
 	done
 bios_dumper$(EXEEXT): $(bios_dumper_OBJECTS) $(bios_dumper_DEPENDENCIES) 
 	@rm -f bios_dumper$(EXEEXT)
-	$(LINK) $(bios_dumper_OBJECTS) $(bios_dumper_LDADD) $(LIBS)
+	$(LINK) $(bios_dumper_LDFLAGS) $(bios_dumper_OBJECTS) $(bios_dumper_LDADD) $(LIBS)
 bios_reader$(EXEEXT): $(bios_reader_OBJECTS) $(bios_reader_DEPENDENCIES) 
 	@rm -f bios_reader$(EXEEXT)
-	$(LINK) $(bios_reader_OBJECTS) $(bios_reader_LDADD) $(LIBS)
+	$(LINK) $(bios_reader_LDFLAGS) $(bios_reader_OBJECTS) $(bios_reader_LDADD) $(LIBS)
 swf_dumper$(EXEEXT): $(swf_dumper_OBJECTS) $(swf_dumper_DEPENDENCIES) 
 	@rm -f swf_dumper$(EXEEXT)
-	$(LINK) $(swf_dumper_OBJECTS) $(swf_dumper_LDADD) $(LIBS)
+	$(LINK) $(swf_dumper_LDFLAGS) $(swf_dumper_OBJECTS) $(swf_dumper_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -297,22 +308,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swf_dumper.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -323,13 +334,17 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -341,8 +356,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -352,12 +367,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -371,21 +387,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -433,7 +450,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -447,20 +464,12 @@ info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -481,22 +490,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/swf_dumper.c new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/swf_dumper.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/swf_dumper.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/bios_reader/swf_dumper.c	2011-02-08 11:14:00.000000000 +0100
@@ -41,70 +41,72 @@
 #include "../i830_bios.h"
 
 #ifndef DEFFILEMODE
-#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) /* 0666*/
+#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)	/* 0666 */
 #endif
 
 static uint32_t read32(void *base, int reg)
 {
-    uint32_t *addr = (uint32_t *)((unsigned char *)(base) + reg);
+	uint32_t *addr = (uint32_t *) ((unsigned char *)(base) + reg);
 
-    return *addr;
+	return *addr;
 }
 
 #if 0
 static void write32(void *base, int reg, uint32_t val)
 {
-    uint32_t *addr = (uint32_t *)((unsigned char *)(base) + reg);
-    *addr = val;
+	uint32_t *addr = (uint32_t *) ((unsigned char *)(base) + reg);
+	*addr = val;
 }
 #endif
 
 static void usage(void)
 {
-    fprintf(stderr, "usage: swf_dumper\n");
-    exit(1);
+	fprintf(stderr, "usage: swf_dumper\n");
+	exit(1);
 }
 
 int main(int argc, char **argv)
 {
-    struct pci_device *dev;
-    int err;
-    void *addr;
-
-    if (argc != 1)
-	usage();
-
-    err = pci_system_init();
-    if (err != 0) {
-	fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err));
-	exit(1);
-    }
-
-    /* Grab the graphics card */
-    dev = pci_device_find_by_slot(0, 0, 2, 0);
-    if (dev == NULL)
-	errx(1, "Couldn't find graphics card");
-
-    err = pci_device_probe(dev);
-    if (err != 0) {
-	fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
-	exit(1);
-    }
-
-    if (dev->vendor_id != 0x8086)
-	errx(1, "Graphics card is non-intel");
-
-    err = pci_device_map_range(dev, dev->regions[0].base_addr,
-			       dev->regions[0].size,
-			       PCI_DEV_MAP_FLAG_WRITABLE, &addr);
-    if (err) {
-	fprintf(stderr, "Couldn't map MMIO space: %s\n", strerror(err));
-	exit(1);
-    }
+	struct pci_device *dev;
+	int err;
+	void *addr;
+
+	if (argc != 1)
+		usage();
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+
+	err = pci_device_map_range(dev, dev->regions[0].base_addr,
+				   dev->regions[0].size,
+				   PCI_DEV_MAP_FLAG_WRITABLE, &addr);
+	if (err) {
+		fprintf(stderr, "Couldn't map MMIO space: %s\n", strerror(err));
+		exit(1);
+	}
 
-    printf("SWF14: 0x%08x\n", read32(addr, SWF14));
+	printf("SWF14: 0x%08x\n", read32(addr, SWF14));
 
-    pci_system_cleanup();
+	pci_system_cleanup();
 
-    return 0;
+	return 0;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/brw_structs.h new/xsrc/external/mit/xf86-video-intel/dist/src/brw_structs.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/brw_structs.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/brw_structs.h	2011-02-08 11:14:00.000000000 +0100
@@ -838,6 +838,27 @@ struct brw_wm_unit_state
    
    float global_depth_offset_constant;  
    float global_depth_offset_scale;   
+
+   struct {
+      unsigned int pad0:1;
+      unsigned int grf_reg_count_1:3; 
+      unsigned int pad1:2;
+      unsigned int kernel_start_pointer_1:26;
+   } wm8;       
+
+   struct {
+      unsigned int pad0:1;
+      unsigned int grf_reg_count_2:3; 
+      unsigned int pad1:2;
+      unsigned int kernel_start_pointer_2:26;
+   } wm9;       
+
+   struct {
+      unsigned int pad0:1;
+      unsigned int grf_reg_count_3:3; 
+      unsigned int pad1:2;
+      unsigned int kernel_start_pointer_3:26;
+   } wm10;       
 };
 
 /* The hardware supports two different modes for border color. The
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/ch7017.c new/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/ch7017.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/ch7017.c	2010-11-23 09:53:04.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/ch7017.c	2011-02-08 11:14:00.000000000 +0100
@@ -38,8 +38,13 @@
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 
 #include "../i2c_vid.h"
 #include "ch7017_reg.h"
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.am	2008-08-02 07:12:50.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 ch7017_la_LTLIBRARIES = ch7017.la
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.in	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ch7017/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +39,10 @@ host_triplet = @host@
 subdir = src/ch7017
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,18 +57,17 @@ LTLIBRARIES = $(ch7017_la_LTLIBRARIES)
 ch7017_la_LIBADD =
 am_ch7017_la_OBJECTS = ch7017.lo ch7017_module.lo
 ch7017_la_OBJECTS = $(am_ch7017_la_OBJECTS)
-ch7017_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(ch7017_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(ch7017_la_SOURCES)
 DIST_SOURCES = $(ch7017_la_SOURCES)
 ETAGS = etags
@@ -74,7 +76,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -82,41 +87,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -124,12 +146,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -137,13 +158,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -157,26 +173,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -188,13 +205,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -208,7 +223,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -219,19 +233,15 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 ch7017_la_LTLIBRARIES = ch7017.la
@@ -250,8 +260,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -277,21 +287,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-ch7017_laLTLIBRARIES: $(ch7017_la_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(ch7017_ladir)" || $(MKDIR_P) "$(DESTDIR)$(ch7017_ladir)"
+	test -z "$(ch7017_ladir)" || $(mkdir_p) "$(DESTDIR)$(ch7017_ladir)"
 	@list='$(ch7017_la_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ch7017_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ch7017_ladir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ch7017_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ch7017_ladir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(ch7017_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ch7017_ladir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(ch7017_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ch7017_ladir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-ch7017_laLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(ch7017_la_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(ch7017_la_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(ch7017_ladir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(ch7017_ladir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(ch7017_ladir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(ch7017_ladir)/$$p"; \
 	done
 
 clean-ch7017_laLTLIBRARIES:
@@ -303,7 +313,7 @@ clean-ch7017_laLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 ch7017.la: $(ch7017_la_OBJECTS) $(ch7017_la_DEPENDENCIES) 
-	$(ch7017_la_LINK) -rpath $(ch7017_ladir) $(ch7017_la_OBJECTS) $(ch7017_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(ch7017_ladir) $(ch7017_la_LDFLAGS) $(ch7017_la_OBJECTS) $(ch7017_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -315,22 +325,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ch7017_module.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -341,13 +351,17 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -359,8 +373,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -370,12 +384,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -389,21 +404,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -419,7 +435,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(ch7017_ladir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -454,7 +470,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -468,20 +484,12 @@ info-am:
 
 install-data-am: install-ch7017_laLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -502,9 +510,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-ch7017_laLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-ch7017_laLTLIBRARIES uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-ch7017_laLTLIBRARIES clean-generic clean-libtool ctags \
@@ -512,14 +518,12 @@ uninstall-am: uninstall-ch7017_laLTLIBRA
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am \
 	install-ch7017_laLTLIBRARIES install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-ch7017_laLTLIBRARIES
+	uninstall-am uninstall-ch7017_laLTLIBRARIES uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/ch7xxx.c new/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/ch7xxx.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/ch7xxx.c	2010-11-23 09:53:04.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/ch7xxx.c	2011-02-08 11:14:00.000000000 +0100
@@ -38,8 +38,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 
 #include "../i2c_vid.h"
 #include "ch7xxx.h"
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.am	2008-08-02 07:12:49.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 ch7xxx_la_LTLIBRARIES = ch7xxx.la
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.in	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +39,10 @@ host_triplet = @host@
 subdir = src/ch7xxx
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,18 +57,17 @@ LTLIBRARIES = $(ch7xxx_la_LTLIBRARIES)
 ch7xxx_la_LIBADD =
 am_ch7xxx_la_OBJECTS = ch7xxx.lo ch7xxx_module.lo
 ch7xxx_la_OBJECTS = $(am_ch7xxx_la_OBJECTS)
-ch7xxx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(ch7xxx_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(ch7xxx_la_SOURCES)
 DIST_SOURCES = $(ch7xxx_la_SOURCES)
 ETAGS = etags
@@ -74,7 +76,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -82,41 +87,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -124,12 +146,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -137,13 +158,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -157,26 +173,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -188,13 +205,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -208,7 +223,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -219,19 +233,15 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 ch7xxx_la_LTLIBRARIES = ch7xxx.la
@@ -251,8 +261,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -278,21 +288,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-ch7xxx_laLTLIBRARIES: $(ch7xxx_la_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(ch7xxx_ladir)" || $(MKDIR_P) "$(DESTDIR)$(ch7xxx_ladir)"
+	test -z "$(ch7xxx_ladir)" || $(mkdir_p) "$(DESTDIR)$(ch7xxx_ladir)"
 	@list='$(ch7xxx_la_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ch7xxx_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ch7xxx_ladir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ch7xxx_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ch7xxx_ladir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(ch7xxx_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ch7xxx_ladir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(ch7xxx_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ch7xxx_ladir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-ch7xxx_laLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(ch7xxx_la_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(ch7xxx_la_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(ch7xxx_ladir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(ch7xxx_ladir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(ch7xxx_ladir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(ch7xxx_ladir)/$$p"; \
 	done
 
 clean-ch7xxx_laLTLIBRARIES:
@@ -304,7 +314,7 @@ clean-ch7xxx_laLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 ch7xxx.la: $(ch7xxx_la_OBJECTS) $(ch7xxx_la_DEPENDENCIES) 
-	$(ch7xxx_la_LINK) -rpath $(ch7xxx_ladir) $(ch7xxx_la_OBJECTS) $(ch7xxx_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(ch7xxx_ladir) $(ch7xxx_la_LDFLAGS) $(ch7xxx_la_OBJECTS) $(ch7xxx_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -316,22 +326,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ch7xxx_module.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -342,13 +352,17 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -360,8 +374,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -371,12 +385,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -390,21 +405,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -420,7 +436,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(ch7xxx_ladir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -455,7 +471,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -469,20 +485,12 @@ info-am:
 
 install-data-am: install-ch7xxx_laLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -503,9 +511,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-ch7xxx_laLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-ch7xxx_laLTLIBRARIES uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-ch7xxx_laLTLIBRARIES clean-generic clean-libtool ctags \
@@ -513,14 +519,12 @@ uninstall-am: uninstall-ch7xxx_laLTLIBRA
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am \
 	install-ch7xxx_laLTLIBRARIES install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-ch7xxx_laLTLIBRARIES
+	uninstall-am uninstall-ch7xxx_laLTLIBRARIES uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/common.h new/xsrc/external/mit/xf86-video-intel/dist/src/common.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/common.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/common.h	2011-02-08 11:14:00.000000000 +0100
@@ -27,7 +27,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v 1.9 2003/09/24 02:43:23 dawes Exp $ */
 
 /*
  * Authors:
@@ -40,7 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define _INTEL_COMMON_H_
 
 /* Provide substitutes for gcc's __FUNCTION__ on other compilers */
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__FUNCTION__)
 # if defined(__STDC__) && (__STDC_VERSION__>=199901L) /* C99 */
 #  define __FUNCTION__ __func__
 # else
@@ -55,11 +54,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #ifdef I830DEBUG
 #define MARKER() ErrorF("\n### %s:%d: >>> %s <<< ###\n\n", \
 			 __FILE__, __LINE__,__FUNCTION__)
-#define DPRINTF I830DPRINTF_stub
+#define DPRINTF I830DPRINTF
 #else /* #ifdef I830DEBUG */
 #define MARKER()
-/* this is a real ugly hack to get the compiler to optimize the debugging statements into oblivion */
-#define DPRINTF if(0) I830DPRINTF_stub
+#define DPRINTF I830DPRINTF_stub
+static inline void
+I830DPRINTF_stub(const char *filename, int line, const char *function,
+		 const char *fmt, ...)
+{
+}
 #endif /* #ifdef I830DEBUG */
 
 #define KB(x) ((x) * 1024)
@@ -75,21 +78,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #ifndef REG_DUMPER
 /* I830 hooks for the I810 driver setup/probe. */
 extern const OptionInfoRec *I830AvailableOptions(int chipid, int busid);
-extern void I830InitpScrn(ScrnInfoPtr pScrn);
+extern void intel_init_scrn(ScrnInfoPtr scrn);
 
 /* Symbol lists shared by the i810 and i830 parts. */
 extern int I830EntityIndex;
-extern const char *I810vgahwSymbols[];
-extern const char *I810ramdacSymbols[];
-extern const char *I810ddcSymbols[];
-extern const char *I810fbSymbols[];
-extern const char *I810xaaSymbols[];
-extern const char *I810shadowFBSymbols[];
-#ifdef XF86DRI
-extern const char *I810driSymbols[];
-extern const char *I810drmSymbols[];
-#endif
-extern const char *I810i2cSymbols[];
 
 extern void I830DPRINTF_stub(const char *filename, int line,
 			     const char *function, const char *fmt, ...);
@@ -97,7 +89,7 @@ extern void I830DPRINTF_stub(const char
 #ifdef _I830_H_
 #define PrintErrorState i830_dump_error_state
 #define WaitRingFunc I830WaitLpRing
-#define RecPtr pI830
+#define RecPtr intel
 #else
 #define PrintErrorState I810PrintErrorState
 #define WaitRingFunc I810WaitLpRing
@@ -318,21 +310,27 @@ extern int I810_DEBUG;
 #define PCI_CHIP_G41_G_BRIDGE	0x2E30
 #endif
 
-#if XSERVER_LIBPCIACCESS
+#ifndef PCI_CHIP_B43_G
+#define PCI_CHIP_B43_G		0x2E42
+#define PCI_CHIP_B43_G_BRIDGE	0x2E40
+#endif
+
+#ifndef PCI_CHIP_IGDNG_D_G
+#define PCI_CHIP_IGDNG_D_G		0x0042
+#define PCI_CHIP_IGDNG_D_G_BRIDGE	0x0040
+#endif
+
+#ifndef PCI_CHIP_IGDNG_M_G
+#define PCI_CHIP_IGDNG_M_G		0x0046
+#define PCI_CHIP_IGDNG_M_G_BRIDGE	0x0044
+#endif
+
 #define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr
 #define VENDOR_ID(p)      (p)->vendor_id
 #define DEVICE_ID(p)      (p)->device_id
 #define SUBVENDOR_ID(p)	  (p)->subvendor_id
 #define SUBSYS_ID(p)      (p)->subdevice_id
 #define CHIP_REVISION(p)  (p)->revision
-#else
-#define I810_MEMBASE(p,n) (p)->memBase[n]
-#define VENDOR_ID(p)      (p)->vendor
-#define DEVICE_ID(p)      (p)->chipType
-#define SUBVENDOR_ID(p)	  (p)->subsysVendor
-#define SUBSYS_ID(p)      (p)->subsysCard
-#define CHIP_REVISION(p)  (p)->chipRev
-#endif
 
 #define IS_I810(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I810 ||	\
 			DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I810_DC100 || \
@@ -353,10 +351,13 @@ extern int I810_DEBUG;
 #define IS_IGDG(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_G)
 #define IS_IGD(pI810) (IS_IGDG(pI810) || IS_IGDGM(pI810))
 #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM)
-#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || IS_GM45(pI810))
+#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_B43_G || IS_GM45(pI810))
 #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME)
 #define IS_965_Q(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q)
-#define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_G4X(pI810))
+#define IS_IGDNG_D(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGDNG_D_G)
+#define IS_IGDNG_M(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGDNG_M_G)
+#define IS_IGDNG(pI810) (IS_IGDNG_D(pI810) || IS_IGDNG_M(pI810))
+#define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_G4X(pI810) || IS_IGDNG(pI810))
 #define IS_G33CLASS(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G33_G ||\
  			    DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q35_G ||\
 			    DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q33_G || \
@@ -364,22 +365,22 @@ extern int I810_DEBUG;
 #define IS_I9XX(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) || IS_I945G(pI810) || IS_I945GM(pI810) || IS_I965G(pI810) || IS_G33CLASS(pI810))
 #define IS_I915(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) || IS_I945G(pI810) || IS_I945GM(pI810) || IS_G33CLASS(pI810))
 
-#define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810) || IS_I945GM(pI810) || IS_I965GM(pI810) || IS_GM45(pI810) || IS_IGD(pI810))
+#define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810) || IS_I945GM(pI810) || IS_I965GM(pI810) || IS_GM45(pI810) || IS_IGD(pI810) || IS_IGDNG_M(pI810))
 /* mark chipsets for using gfx VM offset for overlay */
 #define OVERLAY_NOPHYSICAL(pI810) (IS_G33CLASS(pI810) || IS_I965G(pI810))
 /* mark chipsets without overlay hw */
-#define OVERLAY_NOEXIST(pI810) (IS_G4X(pI810))
+#define OVERLAY_NOEXIST(pI810) (IS_G4X(pI810) || IS_IGDNG(pI810))
 /* chipsets require graphics mem for hardware status page */
 #define HWS_NEED_GFX(pI810) (!pI810->use_drm_mode && \
 			     (IS_G33CLASS(pI810) ||\
-			      IS_G4X(pI810)))
+			      IS_G4X(pI810) || IS_IGDNG(pI810)))
 /* chipsets require status page in non stolen memory */
-#define HWS_NEED_NONSTOLEN(pI810) (IS_G4X(pI810))
-#define SUPPORTS_INTEGRATED_HDMI(pI810) (IS_G4X(pI810))
+#define HWS_NEED_NONSTOLEN(pI810) (IS_G4X(pI810) || IS_IGDNG(pI810))
+#define SUPPORTS_INTEGRATED_HDMI(pI810) (IS_G4X(pI810) || IS_IGDNG(pI810))
 /* dsparb controlled by hw only */
-#define DSPARB_HWCONTROL(pI810) (IS_G4X(pI810))
+#define DSPARB_HWCONTROL(pI810) (IS_G4X(pI810) || IS_IGDNG(pI810))
 /* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
-#define SUPPORTS_YTILING(pI810) (IS_I965G(pI830))
+#define SUPPORTS_YTILING(pI810) (IS_I965G(intel))
 
 #define GTT_PAGE_SIZE			KB(4)
 #define ROUND_TO(x, y)			(((x) + (y) - 1) / (y) * (y))
@@ -399,9 +400,19 @@ extern int I810_DEBUG;
 
 #define PIPE_NAME(n)			('A' + (n))
 
-#if XSERVER_LIBPCIACCESS
 struct pci_device *
 intel_host_bridge (void);
-#endif
-   
+
+/**
+ * Hints to CreatePixmap to tell the driver how the pixmap is going to be
+ * used.
+ *
+ * Compare to CREATE_PIXMAP_USAGE_* in the server.
+ */
+enum {
+	INTEL_CREATE_PIXMAP_TILING_X = 0x10000000,
+	INTEL_CREATE_PIXMAP_TILING_Y,
+	INTEL_CREATE_PIXMAP_TILING_NONE,
+};
+
 #endif /* _INTEL_COMMON_H_ */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/drmmode_display.c new/xsrc/external/mit/xf86-video-intel/dist/src/drmmode_display.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/drmmode_display.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/drmmode_display.c	2011-02-08 11:14:00.000000000 +0100
@@ -29,9 +29,14 @@
 #include "config.h"
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
 #include "xorgVersion.h"
 
-#ifdef XF86DRM_MODE
 #include "i830.h"
 #include "intel_bufmgr.h"
 #include "xf86drmMode.h"
@@ -59,6 +64,10 @@ typedef struct {
     Atom *atoms;
 } drmmode_prop_rec, *drmmode_prop_ptr;
 
+struct fixed_panel_lvds {
+	int hdisplay;
+	int vdisplay;
+};
 typedef struct {
     drmmode_ptr drmmode;
     int output_id;
@@ -67,11 +76,159 @@ typedef struct {
     drmModePropertyBlobPtr edid_blob;
     int num_props;
     drmmode_prop_ptr props;
+    void *private_data;
+    int dpms_mode;
+    char *backlight_iface;
+    int backlight_active_level;
+    int backlight_max;
 } drmmode_output_private_rec, *drmmode_output_private_ptr;
 
 static void
 drmmode_output_dpms(xf86OutputPtr output, int mode);
 
+#define BACKLIGHT_CLASS "/sys/class/backlight"
+
+/*
+ * List of available kernel interfaces in priority order
+ */
+static char *backlight_interfaces[] = {
+    "asus-laptop",
+    "eeepc",
+    "thinkpad_screen",
+    "acpi_video1",
+    "acpi_video0",
+    "fujitsu-laptop",
+    "sony",
+    "samsung",
+    NULL,
+};
+/*
+ * Must be long enough for BACKLIGHT_CLASS + '/' + longest in above table +
+ * '/' + "max_backlight"
+ */
+#define BACKLIGHT_PATH_LEN 80
+/* Enough for 10 digits of backlight + '\n' + '\0' */
+#define BACKLIGHT_VALUE_LEN 12
+
+static void
+drmmode_backlight_set(xf86OutputPtr output, int level)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN];
+    int fd, len, ret;
+
+    if (level > drmmode_output->backlight_max)
+	level = drmmode_output->backlight_max;
+    if (! drmmode_output->backlight_iface || level < 0)
+	return;
+
+    len = snprintf(val, BACKLIGHT_VALUE_LEN, "%d\n", level);
+    sprintf(path, "%s/%s/brightness",
+	    BACKLIGHT_CLASS, drmmode_output->backlight_iface);
+    fd = open(path, O_RDWR);
+    if (fd == -1) {
+	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
+		   "control: %s\n", path, strerror(errno));
+	return;
+    }
+
+    ret = write(fd, val, len);
+    if (ret == -1) {
+	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "write to %s for backlight "
+		   "control failed: %s\n", path, strerror(errno));
+    }
+
+    close(fd);
+}
+
+static int
+drmmode_backlight_get(xf86OutputPtr output)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN];
+    int fd, level;
+
+    if (! drmmode_output->backlight_iface)
+	return -1;
+
+    sprintf(path, "%s/%s/actual_brightness",
+	    BACKLIGHT_CLASS, drmmode_output->backlight_iface);
+    fd = open(path, O_RDONLY);
+    if (fd == -1) {
+	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "failed to open %s "
+		   "for backlight control: %s\n", path, strerror(errno));
+	return -1;
+    }
+
+    memset(val, 0, sizeof(val));
+    if (read(fd, val, BACKLIGHT_VALUE_LEN) == -1) {
+	close(fd);
+	return -1;
+    }
+
+    close(fd);
+
+    level = atoi(val);
+    if (level > drmmode_output->backlight_max)
+	level = drmmode_output->backlight_max;
+    if (level < 0)
+	level = -1;
+    return level;
+}
+
+static int
+drmmode_backlight_get_max(xf86OutputPtr output)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN];
+    int fd, max = 0;
+
+    sprintf(path, "%s/%s/max_brightness",
+	    BACKLIGHT_CLASS, drmmode_output->backlight_iface);
+    fd = open(path, O_RDONLY);
+    if (fd == -1) {
+	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "failed to open %s "
+		   "for backlight control: %s\n", path, strerror(errno));
+	return 0;
+    }
+
+    memset(val, 0, sizeof(val));
+    if (read(fd, val, BACKLIGHT_VALUE_LEN) == -1) {
+	close(fd);
+	return -1;
+    }
+
+    close(fd);
+
+    max = atoi(val);
+    if (max <= 0)
+	max  = -1;
+    return max;
+}
+
+static void
+drmmode_backlight_init(xf86OutputPtr output)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    char path[BACKLIGHT_PATH_LEN];
+    struct stat buf;
+    int i;
+
+    for (i = 0; backlight_interfaces[i] != NULL; i++) {
+	sprintf(path, "%s/%s", BACKLIGHT_CLASS, backlight_interfaces[i]);
+	if (!stat(path, &buf)) {
+	    drmmode_output->backlight_iface = backlight_interfaces[i];
+	    xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
+		       "found backlight control interface %s\n", path);
+	    drmmode_output->backlight_max = drmmode_backlight_get_max(output);
+	    drmmode_output->backlight_active_level = drmmode_backlight_get(output);
+	    return;
+	}
+    }
+    drmmode_output->backlight_iface = NULL;
+}
+
+
 static void
 drmmode_ConvertFromKMode(ScrnInfoPtr scrn,
 			 drmModeModeInfoPtr kmode,
@@ -141,8 +298,8 @@ static Bool
 drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		       Rotation rotation, int x, int y)
 {
-	ScrnInfoPtr pScrn = crtc->scrn;
-	I830Ptr     pI830 = I830PTR(pScrn);
+	ScrnInfoPtr scrn = crtc->scrn;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
@@ -155,13 +312,13 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
 	int i;
 	int fb_id;
 	drmModeModeInfo kmode;
-	unsigned int pitch = pScrn->displayWidth * pI830->cpp;
+	unsigned int pitch = scrn->displayWidth * intel->cpp;
 
 	if (drmmode->fb_id == 0) {
 		ret = drmModeAddFB(drmmode->fd,
-				   pScrn->virtualX, pScrn->virtualY,
-				   pScrn->depth, pScrn->bitsPerPixel,
-				   pitch, pI830->front_buffer->bo->handle,
+				   scrn->virtualX, scrn->virtualY,
+				   scrn->depth, scrn->bitsPerPixel,
+				   pitch, intel->front_buffer->bo->handle,
 				   &drmmode->fb_id);
 		if (ret < 0) {
 			ErrorF("failed to add fb\n");
@@ -178,11 +335,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
 	crtc->x = x;
 	crtc->y = y;
 	crtc->rotation = rotation;
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,99,0,0)
-	crtc->transformPresent = FALSE;
-#endif
 
-	output_ids = xcalloc(sizeof(uint32_t), xf86_config->num_output);
+	output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
 	if (!output_ids) {
 		ret = FALSE;
 		goto done;
@@ -209,12 +363,20 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
 		goto done;
 #endif
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,0,0,0)
+	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+			       crtc->gamma_blue, crtc->gamma_size);
+#endif
+
 	drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
 
 
 	fb_id = drmmode->fb_id;
-	if (drmmode_crtc->rotate_fb_id)
+	if (drmmode_crtc->rotate_fb_id) {
 		fb_id = drmmode_crtc->rotate_fb_id;
+		x = 0;
+		y = 0;
+	}
 	ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
 			     fb_id, x, y, output_ids, output_count, &kmode);
 	if (ret)
@@ -233,6 +395,10 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
 		drmmode_output_dpms(output, DPMSModeOn);
 	}
 
+	i830_set_gem_max_sizes(scrn);
+
+	if (scrn->pScreen)
+		xf86_reload_cursors(scrn->pScreen);
 done:
 	if (!ret) {
 		crtc->x = saved_x;
@@ -261,12 +427,11 @@ drmmode_set_cursor_position (xf86CrtcPtr
 static void
 drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
 {
-	ScrnInfoPtr pScrn = crtc->scrn;
-	I830Ptr pI830 = I830PTR(pScrn);
+	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	int ret;
 
 	/* cursor should be mapped already */
-	ret = dri_bo_subdata(pI830->cursor_mem->bo, 0, 64*64*4, image);
+	ret = dri_bo_subdata(drmmode_crtc->cursor, 0, 64*64*4, image);
 	if (ret)
 		xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
 			   "failed to set cursor: %s", strerror(-ret));
@@ -290,29 +455,27 @@ drmmode_show_cursor (xf86CrtcPtr crtc)
 {
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
-	ScrnInfoPtr pScrn = crtc->scrn;
-	I830Ptr pI830 = I830PTR(pScrn);
 
 	drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
-			 pI830->cursor_mem->bo->handle, 64, 64);
+			 drmmode_crtc->cursor->handle, 64, 64);
 }
 
 static void *
 drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
 {
-	ScrnInfoPtr pScrn = crtc->scrn;
-	I830Ptr pI830 = I830PTR(pScrn);
+	ScrnInfoPtr scrn = crtc->scrn;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 	int size, ret;
 	unsigned long rotate_pitch;
 
-	width = i830_pad_drawable_width(width, drmmode->cpp);
+	width = i830_pad_drawable_width(width);
 	rotate_pitch = width * drmmode->cpp;
 	size = rotate_pitch * height;
 
 	drmmode_crtc->rotate_bo =
-		drm_intel_bo_alloc(pI830->bufmgr, "rotate", size, 4096);
+		drm_intel_bo_alloc(intel->bufmgr, "rotate", size, 4096);
 
 	if (!drmmode_crtc->rotate_bo) {
 		xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
@@ -320,7 +483,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr
 		return NULL;
 	}
 
-	drm_intel_gem_bo_map_gtt(drmmode_crtc->rotate_bo);
+	drm_intel_bo_disable_reuse(drmmode_crtc->rotate_bo);
 
 	ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth,
 			   crtc->scrn->bitsPerPixel, rotate_pitch,
@@ -332,33 +495,39 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr
 		return NULL;
 	}
 
-	return drmmode_crtc->rotate_bo->virtual;
+	return drmmode_crtc->rotate_bo;
 }
 
 static PixmapPtr
 drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 {
-	ScrnInfoPtr pScrn = crtc->scrn;
+	ScrnInfoPtr scrn = crtc->scrn;
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 	unsigned long rotate_pitch;
 	PixmapPtr rotate_pixmap;
 
-	if (!data)
+	if (!data) {
 		data = drmmode_crtc_shadow_allocate (crtc, width, height);
+		if (!data) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+				   "Couldn't allocate shadow pixmap for rotated CRTC\n");
+			return NULL;
+		}
+	}
 
-	rotate_pitch =
-		i830_pad_drawable_width(width, drmmode->cpp) * drmmode->cpp;
-	rotate_pixmap = GetScratchPixmapHeader(pScrn->pScreen,
+	rotate_pitch = i830_pad_drawable_width(width) * drmmode->cpp;
+	rotate_pixmap = GetScratchPixmapHeader(scrn->pScreen,
 					       width, height,
-					       pScrn->depth,
-					       pScrn->bitsPerPixel,
+					       scrn->depth,
+					       scrn->bitsPerPixel,
 					       rotate_pitch,
-					       data);
+					       NULL);
 
 	if (rotate_pixmap == NULL) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "Couldn't allocate shadow pixmap for rotated CRTC\n");
+		return NULL;
 	}
 
 	if (drmmode_crtc->rotate_bo)
@@ -373,8 +542,10 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 
-	if (rotate_pixmap)
+	if (rotate_pixmap) {
+		i830_set_pixmap_bo(rotate_pixmap, NULL);
 		FreeScratchPixmapHeader(rotate_pixmap);
+	}
 
 
 	if (data) {
@@ -382,7 +553,6 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr
 		 * unbound. */
 		drmModeRmFB(drmmode->fd, drmmode_crtc->rotate_fb_id);
 		drmmode_crtc->rotate_fb_id = 0;
-		drm_intel_gem_bo_unmap_gtt(drmmode_crtc->rotate_bo);
 		dri_bo_unreference(drmmode_crtc->rotate_bo);
 		drmmode_crtc->rotate_bo = NULL;
 	}
@@ -416,12 +586,12 @@ static const xf86CrtcFuncsRec drmmode_cr
 
 
 static void
-drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+drmmode_crtc_init(ScrnInfoPtr scrn, drmmode_ptr drmmode, int num)
 {
 	xf86CrtcPtr crtc;
 	drmmode_crtc_private_ptr drmmode_crtc;
 
-	crtc = xf86CrtcCreate(pScrn, &drmmode_crtc_funcs);
+	crtc = xf86CrtcCreate(scrn, &drmmode_crtc_funcs);
 	if (crtc == NULL)
 		return;
 
@@ -434,6 +604,13 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drm
 	return;
 }
 
+void
+drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor)
+{
+	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+	drmmode_crtc->cursor = cursor;
+}
+
 static xf86OutputStatus
 drmmode_output_detect(xf86OutputPtr output)
 {
@@ -464,9 +641,150 @@ drmmode_output_detect(xf86OutputPtr outp
 static Bool
 drmmode_output_mode_valid(xf86OutputPtr output, DisplayModePtr pModes)
 {
+	drmmode_output_private_ptr drmmode_output = output->driver_private;
+	drmModeConnectorPtr koutput = drmmode_output->mode_output;
+	struct fixed_panel_lvds *p_lvds = drmmode_output->private_data;
+
+	/*
+	 * If the connector type is LVDS, we will use the panel limit to
+	 * verfiy whether the mode is valid.
+	 */
+	if ((koutput->connector_type ==  DRM_MODE_CONNECTOR_LVDS) && p_lvds) {
+		if (pModes->HDisplay > p_lvds->hdisplay ||
+			pModes->VDisplay > p_lvds->vdisplay)
+			return MODE_PANEL;
+		else
+			return MODE_OK;
+	}
 	return MODE_OK;
 }
 
+static void fill_detailed_lvds_block(struct detailed_monitor_section *det_mon,
+					DisplayModePtr mode)
+{
+	struct detailed_timings *timing = &det_mon->section.d_timings;
+
+	det_mon->type = DT;
+	timing->clock = mode->Clock * 1000;
+	timing->h_active = mode->HDisplay;
+	timing->h_blanking = mode->HTotal - mode->HDisplay;
+	timing->v_active = mode->VDisplay;
+	timing->v_blanking = mode->VTotal - mode->VDisplay;
+	timing->h_sync_off = mode->HSyncStart - mode->HDisplay;
+	timing->h_sync_width = mode->HSyncEnd - mode->HSyncStart;
+	timing->v_sync_off = mode->VSyncStart - mode->VDisplay;
+	timing->v_sync_width = mode->VSyncEnd - mode->VSyncStart;
+
+	if (mode->Flags & V_PVSYNC)
+		timing->misc |= 0x02;
+
+	if (mode->Flags & V_PHSYNC)
+		timing->misc |= 0x01;
+}
+
+static int drmmode_output_lvds_edid(xf86OutputPtr output,
+				struct fixed_panel_lvds *p_lvds)
+{
+	drmmode_output_private_ptr drmmode_output = output->driver_private;
+	drmModeConnectorPtr koutput = drmmode_output->mode_output;
+	int i, j;
+	DisplayModePtr pmode;
+	xf86MonPtr	edid_mon;
+	drmModeModeInfo *mode_ptr;
+	struct detailed_monitor_section *det_mon;
+
+	if (output->MonInfo) {
+		/*
+		 * If there exists the EDID, we will either find a DS_RANGES
+		 * or replace a DS_VENDOR block, smashing it into a DS_RANGES
+		 * block with opern refresh to match all the default modes.
+		 */
+		int edid_det_block_num;
+		edid_mon = output->MonInfo;
+		edid_mon->features.msc |= 0x01;
+		j = -1;
+		edid_det_block_num = sizeof(edid_mon->det_mon) /
+					sizeof(edid_mon->det_mon[0]);
+		for (i = 0; i < edid_det_block_num; i++) {
+			if (edid_mon->det_mon[i].type >= DS_VENDOR && j == -1)
+				j = i;
+			if (edid_mon->det_mon[i].type == DS_RANGES) {
+				j = i;
+				break;
+			}
+		}
+		if (j != -1) {
+			struct monitor_ranges	*ranges =
+				&edid_mon->det_mon[j].section.ranges;
+			edid_mon->det_mon[j].type = DS_RANGES;
+			ranges->min_v = 0;
+			ranges->max_v = 200;
+			ranges->min_h = 0;
+			ranges->max_h = 200;
+		}
+		return 0;
+	}
+	/*
+	 * If there is no EDID, we will construct a bogus EDID for LVDS output
+	 * device. This is similar to what we have done in i830_lvds.c
+	 */
+	edid_mon = NULL;
+	edid_mon = calloc(1, sizeof(xf86Monitor));
+	if (!edid_mon) {
+		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+			"Can't allocate memory for edid_mon.\n");
+		return 0;
+	}
+	/* Find the fixed panel mode.
+	 * In theory when there is no EDID, KMS kernel will return only one
+	 * mode. And this can be regarded as fixed lvds panel mode.
+	 * But it will be better to traverse the mode list to get the fixed
+	 * lvds panel mode again as we don't know whether some new modes
+	 * are added for the LVDS output device
+	 */
+	j = 0;
+	for (i = 0; i < koutput->count_modes; i++) {
+		mode_ptr = &koutput->modes[i];
+		if ((mode_ptr->hdisplay == p_lvds->hdisplay) &&
+			(mode_ptr->vdisplay == p_lvds->vdisplay)) {
+			/* find the fixed panel mode */
+			j = i;
+			break;
+		}
+	}
+	pmode = xnfalloc(sizeof(DisplayModeRec));
+	drmmode_ConvertFromKMode(output->scrn, &koutput->modes[j], pmode);
+	/*support DPM, instead of DPMS*/
+	edid_mon->features.dpms |= 0x1;
+	/*defaultly support RGB color display*/
+	edid_mon->features.display_type |= 0x1;
+	/*defaultly display support continuous-freqencey*/
+	edid_mon->features.msc |= 0x1;
+	/*defaultly  the EDID version is 1.4 */
+	edid_mon->ver.version = 1;
+	edid_mon->ver.revision = 4;
+	det_mon = edid_mon->det_mon;
+	if (pmode) {
+		/* now we construct new EDID monitor,
+		 * so filled one detailed timing block
+		 */
+		fill_detailed_lvds_block(det_mon, pmode);
+		/* the filed timing block should be set preferred*/
+		edid_mon->features.msc |= 0x2;
+		det_mon = det_mon + 1;
+	}
+	/* Set wide sync ranges so we get all modes
+	 * handed to valid_mode for checking
+	 */
+	det_mon->type = DS_RANGES;
+	det_mon->section.ranges.min_v = 0;
+	det_mon->section.ranges.max_v = 200;
+	det_mon->section.ranges.min_h = 0;
+	det_mon->section.ranges.max_h = 200;
+	output->MonInfo = edid_mon;
+	return 0;
+}
+
 static DisplayModePtr
 drmmode_output_get_modes(xf86OutputPtr output)
 {
@@ -476,15 +794,20 @@ drmmode_output_get_modes(xf86OutputPtr o
 	int i;
 	DisplayModePtr Modes = NULL, Mode;
 	drmModePropertyPtr props;
+	struct fixed_panel_lvds *p_lvds;
+	drmModeModeInfo *mode_ptr;
 
 	/* look for an EDID property */
 	for (i = 0; i < koutput->count_props; i++) {
 		props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-		if (!props || !(props->flags & DRM_MODE_PROP_BLOB))
+		if (!props)
+			continue;
+		if (!(props->flags & DRM_MODE_PROP_BLOB)) {
+			drmModeFreeProperty(props);
 			continue;
+		}
 
-		if (!strcmp(props->name, "EDID") &&
-		    drmmode_output->edid_blob == NULL) {
+		if (!strcmp(props->name, "EDID")) {
 			drmModeFreePropertyBlob(drmmode_output->edid_blob);
 			drmmode_output->edid_blob =
 				drmModeGetPropertyBlob(drmmode->fd,
@@ -511,6 +834,28 @@ drmmode_output_get_modes(xf86OutputPtr o
 		Modes = xf86ModesAdd(Modes, Mode);
 
 	}
+	p_lvds = drmmode_output->private_data;
+	/*
+	 * If the connector type is LVDS, we will traverse the kernel mode to
+	 * get the panel limit.
+	 * If it is incorrect, please fix me.
+	 */
+	if ((koutput->connector_type ==  DRM_MODE_CONNECTOR_LVDS) && p_lvds) {
+		p_lvds->hdisplay = 0;
+		p_lvds->vdisplay = 0;
+		for (i = 0; i < koutput->count_modes; i++) {
+			mode_ptr = &koutput->modes[i];
+			if ((mode_ptr->hdisplay >= p_lvds->hdisplay) &&
+				(mode_ptr->vdisplay >= p_lvds->vdisplay)) {
+				p_lvds->hdisplay = mode_ptr->hdisplay;
+				p_lvds->vdisplay = mode_ptr->vdisplay;
+			}
+		}
+		if (!p_lvds->hdisplay || !p_lvds->vdisplay)
+			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+				"Incorrect KMS mode.\n");
+		drmmode_output_lvds_edid(output, p_lvds);
+	}
 	return Modes;
 }
 
@@ -524,15 +869,41 @@ drmmode_output_destroy(xf86OutputPtr out
 		drmModeFreePropertyBlob(drmmode_output->edid_blob);
 	for (i = 0; i < drmmode_output->num_props; i++) {
 	    drmModeFreeProperty(drmmode_output->props[i].mode_prop);
-	    xfree(drmmode_output->props[i].atoms);
+	    free(drmmode_output->props[i].atoms);
 	}
-	xfree(drmmode_output->props);
+	free(drmmode_output->props);
 	drmModeFreeConnector(drmmode_output->mode_output);
-	xfree(drmmode_output);
+	if (drmmode_output->private_data) {
+		free(drmmode_output->private_data);
+		drmmode_output->private_data = NULL;
+	}
+	if (drmmode_output->backlight_iface)
+		drmmode_backlight_set(output, drmmode_output->backlight_active_level);
+	free(drmmode_output);
 	output->driver_private = NULL;
 }
 
 static void
+drmmode_output_dpms_backlight(xf86OutputPtr output, int oldmode, int mode)
+{
+	drmmode_output_private_ptr drmmode_output = output->driver_private;
+
+	if (!drmmode_output->backlight_iface)
+		return;
+
+	if (mode == DPMSModeOn) {
+		/* If we're going from off->on we may need to turn on the backlight. */
+		if (oldmode != DPMSModeOn)
+			drmmode_backlight_set(output, drmmode_output->backlight_active_level);
+	} else {
+		/* Only save the current backlight value if we're going from on to off. */
+		if (oldmode == DPMSModeOn)
+			drmmode_output->backlight_active_level = drmmode_backlight_get(output);
+		drmmode_backlight_set(output, 0);
+	}
+}
+
+static void
 drmmode_output_dpms(xf86OutputPtr output, int mode)
 {
 	drmmode_output_private_ptr drmmode_output = output->driver_private;
@@ -551,6 +922,10 @@ drmmode_output_dpms(xf86OutputPtr output
                                 drmmode_output->output_id,
                                 props->prop_id,
                                 mode);
+			drmmode_output_dpms_backlight(output,
+				drmmode_output->dpms_mode,
+				mode);
+			drmmode_output->dpms_mode = mode;
                         drmModeFreeProperty(props);
                         return;
 		}
@@ -558,6 +933,14 @@ drmmode_output_dpms(xf86OutputPtr output
 	}
 }
 
+int
+drmmode_output_dpms_status(xf86OutputPtr output)
+{
+	drmmode_output_private_ptr drmmode_output = output->driver_private;
+
+	return drmmode_output->dpms_mode;
+}
+
 static Bool
 drmmode_property_ignore(drmModePropertyPtr prop)
 {
@@ -574,6 +957,10 @@ drmmode_property_ignore(drmModePropertyP
     return FALSE;
 }
 
+#define BACKLIGHT_NAME             "Backlight"
+#define BACKLIGHT_DEPRECATED_NAME  "BACKLIGHT"
+static Atom backlight_atom, backlight_deprecated_atom;
+
 static void
 drmmode_output_create_resources(xf86OutputPtr output)
 {
@@ -583,7 +970,7 @@ drmmode_output_create_resources(xf86Outp
     drmModePropertyPtr drmmode_prop;
     int i, j, err;
 
-    drmmode_output->props = xcalloc(mode_output->count_props, sizeof(drmmode_prop_rec));
+    drmmode_output->props = calloc(mode_output->count_props, sizeof(drmmode_prop_rec));
     if (!drmmode_output->props)
 	return;
 
@@ -608,7 +995,7 @@ drmmode_output_create_resources(xf86Outp
 	    INT32 range[2];
 
 	    p->num_atoms = 1;
-	    p->atoms = xcalloc(p->num_atoms, sizeof(Atom));
+	    p->atoms = calloc(p->num_atoms, sizeof(Atom));
 	    if (!p->atoms)
 		continue;
 	    p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
@@ -630,7 +1017,7 @@ drmmode_output_create_resources(xf86Outp
 	    }
 	} else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) {
 	    p->num_atoms = drmmode_prop->count_enums + 1;
-	    p->atoms = xcalloc(p->num_atoms, sizeof(Atom));
+	    p->atoms = calloc(p->num_atoms, sizeof(Atom));
 	    if (!p->atoms)
 		continue;
 	    p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
@@ -658,6 +1045,46 @@ drmmode_output_create_resources(xf86Outp
 	    }
 	}
     }
+
+    if (drmmode_output->backlight_iface) {
+	INT32 data, backlight_range[2];
+	/* Set up the backlight property, which takes effect immediately
+	 * and accepts values only within the backlight_range. */
+	backlight_atom = MakeAtom(BACKLIGHT_NAME, sizeof(BACKLIGHT_NAME) - 1, TRUE);
+	backlight_deprecated_atom = MakeAtom(BACKLIGHT_DEPRECATED_NAME,
+		sizeof(BACKLIGHT_DEPRECATED_NAME) - 1, TRUE);
+
+	backlight_range[0] = 0;
+	backlight_range[1] = drmmode_output->backlight_max;
+	err = RRConfigureOutputProperty(output->randr_output, backlight_atom,
+	                                FALSE, TRUE, FALSE, 2, backlight_range);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRConfigureOutputProperty error, %d\n", err);
+	}
+	err = RRConfigureOutputProperty(output->randr_output, backlight_deprecated_atom,
+	                                FALSE, TRUE, FALSE, 2, backlight_range);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRConfigureOutputProperty error, %d\n", err);
+	}
+	/* Set the current value of the backlight property */
+	data = drmmode_output->backlight_active_level;
+	err = RRChangeOutputProperty(output->randr_output, backlight_atom,
+	                             XA_INTEGER, 32, PropModeReplace, 1, &data,
+	                             FALSE, TRUE);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRChangeOutputProperty error, %d\n", err);
+	}
+	err = RRChangeOutputProperty(output->randr_output, backlight_deprecated_atom,
+	                             XA_INTEGER, 32, PropModeReplace, 1, &data,
+	                             FALSE, TRUE);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRChangeOutputProperty error, %d\n", err);
+	}
+    }
 }
 
 static Bool
@@ -668,6 +1095,25 @@ drmmode_output_set_property(xf86OutputPt
     drmmode_ptr drmmode = drmmode_output->drmmode;
     int i;
 
+    if (property == backlight_atom || property == backlight_deprecated_atom) {
+	INT32 val;
+
+	if (value->type != XA_INTEGER || value->format != 32 ||
+	    value->size != 1)
+	{
+	    return FALSE;
+	}
+
+	val = *(INT32 *)value->data;
+	if (val < 0 || val > drmmode_output->backlight_max)
+	    return FALSE;
+
+	if (drmmode_output->dpms_mode == DPMSModeOn)
+	    drmmode_backlight_set(output, val);
+	drmmode_output->backlight_active_level = val;
+	return TRUE;
+    }
+
     for (i = 0; i < drmmode_output->num_props; i++) {
 	drmmode_prop_ptr p = &drmmode_output->props[i];
 
@@ -703,16 +1149,48 @@ drmmode_output_set_property(xf86OutputPt
 		    return TRUE;
 		}
 	    }
+	    return FALSE;
 	}
     }
-    /* no property found? */
-    return FALSE;
+
+    return TRUE;
+}
+
+static Bool
+drmmode_output_get_property(xf86OutputPtr output, Atom property)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    int err;
+
+    if (property == backlight_atom || property == backlight_deprecated_atom) {
+	INT32 val;
+
+	if (! drmmode_output->backlight_iface)
+	    return FALSE;
+
+	val = drmmode_backlight_get(output);
+	if (val < 0)
+	    return FALSE;
+	err = RRChangeOutputProperty(output->randr_output, property,
+	                             XA_INTEGER, 32, PropModeReplace, 1, &val,
+	                             FALSE, TRUE);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRChangeOutputProperty error, %d\n", err);
+	    return FALSE;
+	}
+
+	return TRUE;
+    }
+
+    return TRUE;
 }
 
 static const xf86OutputFuncsRec drmmode_output_funcs = {
 	.create_resources = drmmode_output_create_resources,
 #ifdef RANDR_12_INTERFACE
 	.set_property = drmmode_output_set_property,
+	.get_property = drmmode_output_get_property,
 #endif
 	.dpms = drmmode_output_dpms,
 #if 0
@@ -738,24 +1216,24 @@ static int subpixel_conv_table[7] = { 0,
 				      SubPixelVerticalBGR,
 				      SubPixelNone };
 
-const char *output_names[] = { "None",
-			       "VGA",
-			       "DVI",
-			       "DVI",
-			       "DVI",
-			       "Composite",
-			       "TV",
-			       "LVDS",
-			       "CTV",
-			       "DIN",
-			       "DP",
-			       "HDMI",
-			       "HDMI",
+static const char *output_names[] = { "None",
+				      "VGA",
+				      "DVI",
+				      "DVI",
+				      "DVI",
+				      "Composite",
+				      "TV",
+				      "LVDS",
+				      "CTV",
+				      "DIN",
+				      "DP",
+				      "HDMI",
+				      "HDMI",
 };
 
 
 static void
-drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+drmmode_output_init(ScrnInfoPtr scrn, drmmode_ptr drmmode, int num)
 {
 	xf86OutputPtr output;
 	drmModeConnectorPtr koutput;
@@ -777,21 +1255,33 @@ drmmode_output_init(ScrnInfoPtr pScrn, d
 	snprintf(name, 32, "%s%d", output_names[koutput->connector_type],
 		 koutput->connector_type_id);
 
-	output = xf86OutputCreate (pScrn, &drmmode_output_funcs, name);
+	output = xf86OutputCreate (scrn, &drmmode_output_funcs, name);
 	if (!output) {
 		drmModeFreeEncoder(kencoder);
 		drmModeFreeConnector(koutput);
 		return;
 	}
 
-	drmmode_output = xcalloc(sizeof(drmmode_output_private_rec), 1);
+	drmmode_output = calloc(sizeof(drmmode_output_private_rec), 1);
 	if (!drmmode_output) {
 		xf86OutputDestroy(output);
 		drmModeFreeConnector(koutput);
 		drmModeFreeEncoder(kencoder);
 		return;
 	}
-
+	/*
+	 * If the connector type of the output device is LVDS, we will
+	 * allocate the private_data to store the panel limit.
+	 * For example: hdisplay, vdisplay
+	 */
+	drmmode_output->private_data = NULL;
+	if (koutput->connector_type ==  DRM_MODE_CONNECTOR_LVDS) {
+		drmmode_output->private_data = calloc(
+				sizeof(struct fixed_panel_lvds), 1);
+		if (!drmmode_output->private_data)
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+				"Can't allocate private memory for LVDS.\n");
+	}
 	drmmode_output->output_id = drmmode->mode_res->connectors[num];
 	drmmode_output->mode_output = koutput;
 	drmmode_output->mode_encoder = kencoder;
@@ -802,6 +1292,9 @@ drmmode_output_init(ScrnInfoPtr pScrn, d
 	output->subpixel_order = subpixel_conv_table[koutput->subpixel];
 	output->driver_private = drmmode_output;
 
+	if (koutput->connector_type ==  DRM_MODE_CONNECTOR_LVDS)
+		drmmode_backlight_init(output);
+
 	output->possible_crtcs = kencoder->possible_crtcs;
 	output->possible_clones = kencoder->possible_clones;
 	return;
@@ -814,21 +1307,19 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
 	drmmode_crtc_private_ptr
 		    drmmode_crtc = xf86_config->crtc[0]->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
-	I830Ptr     pI830 = I830PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 	i830_memory *old_front = NULL;
 	Bool	    tiled, ret;
 	ScreenPtr   screen = screenInfo.screens[scrn->scrnIndex];
 	uint32_t    old_fb_id;
-	int	    i, pitch, old_width, old_height, old_pitch;
+	int	    i, w, pitch, old_width, old_height, old_pitch;
 
 	if (scrn->virtualX == width && scrn->virtualY == height)
 		return TRUE;
 
-	if (!pI830->can_resize)
-		return FALSE;
-
-	pitch = i830_pad_drawable_width(width, pI830->cpp);
-	tiled = i830_tiled_width(pI830, &pitch, pI830->cpp);
+	w = i830_pad_drawable_width(width);
+	i830_tiled_width(intel, &w, intel->cpp);
+	pitch = w * intel->cpp;
 	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "Allocate new frame buffer %dx%d stride %d\n",
 		   width, height, pitch);
@@ -837,29 +1328,26 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
 	old_height = scrn->virtualY;
 	old_pitch = scrn->displayWidth;
 	old_fb_id = drmmode->fb_id;
-	old_front = pI830->front_buffer;
+	old_front = intel->front_buffer;
 
 	scrn->virtualX = width;
 	scrn->virtualY = height;
-	scrn->displayWidth = pitch;
-	pI830->front_buffer = i830_allocate_framebuffer(scrn);
-	if (!pI830->front_buffer)
+	scrn->displayWidth = w;
+	intel->front_buffer = i830_allocate_framebuffer(scrn);
+	if (!intel->front_buffer)
 		goto fail;
 
 	ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth,
-			   scrn->bitsPerPixel, pitch * pI830->cpp,
-			   pI830->front_buffer->bo->handle,
+			   scrn->bitsPerPixel, pitch,
+			   intel->front_buffer->bo->handle,
 			   &drmmode->fb_id);
 	if (ret)
 		goto fail;
 
-	i830_set_pixmap_bo(screen->GetScreenPixmap(screen), pI830->front_buffer->bo);
-	scrn->fbOffset = pI830->front_buffer->offset;
+	i830_set_pixmap_bo(screen->GetScreenPixmap(screen), intel->front_buffer->bo);
 
 	screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
-				   width, height, -1, -1, pitch * pI830->cpp, NULL);
-	xf86DrvMsg(scrn->scrnIndex, X_INFO, "New front buffer at 0x%lx\n",
-		   pI830->front_buffer->offset);
+				   width, height, -1, -1, pitch, NULL);
 
 	for (i = 0; i < xf86_config->num_crtc; i++) {
 		xf86CrtcPtr crtc = xf86_config->crtc[i];
@@ -879,9 +1367,9 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
 	return TRUE;
 
  fail:
-	if (pI830->front_buffer)
-		i830_free_memory(scrn, pI830->front_buffer);
-	pI830->front_buffer = old_front;
+	if (intel->front_buffer)
+		i830_free_memory(scrn, intel->front_buffer);
+	intel->front_buffer = old_front;
 	scrn->virtualX = old_width;
 	scrn->virtualY = old_height;
 	scrn->displayWidth = old_pitch;
@@ -894,9 +1382,8 @@ static const xf86CrtcConfigFuncsRec drmm
 	drmmode_xf86crtc_resize
 };
 
-Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+Bool drmmode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
 {
-	I830Ptr pI830 = I830PTR(pScrn);
 	xf86CrtcConfigPtr   xf86_config;
 	drmmode_ptr drmmode;
 	int i;
@@ -905,49 +1392,49 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
 	drmmode->fd = fd;
 	drmmode->fb_id = 0;
 
-	xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
-	xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+	xf86CrtcConfigInit(scrn, &drmmode_xf86crtc_config_funcs);
+	xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 
 	drmmode->cpp = cpp;
 	drmmode->mode_res = drmModeGetResources(drmmode->fd);
-	if (!drmmode->mode_res)
+	if (!drmmode->mode_res) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "failed to get resources: %s\n", strerror(errno));
 		return FALSE;
+	}
 
-	xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
+	xf86CrtcSetSizeRange(scrn, 320, 200, drmmode->mode_res->max_width,
 			     drmmode->mode_res->max_height);
 	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
-		drmmode_crtc_init(pScrn, drmmode, i);
+		drmmode_crtc_init(scrn, drmmode, i);
 
 	for (i = 0; i < drmmode->mode_res->count_connectors; i++)
-		drmmode_output_init(pScrn, drmmode, i);
+		drmmode_output_init(scrn, drmmode, i);
 
-	xf86InitialConfiguration(pScrn, pI830->can_resize);
+	xf86InitialConfiguration(scrn, TRUE);
 
 	return TRUE;
 }
 
-Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo)
+int
+drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc)
 {
-	return FALSE;
+	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
-#if 0
-	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn);
-	int i;
+	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
+}
+
+void drmmode_closefb(ScrnInfoPtr scrn)
+{
+	xf86CrtcConfigPtr xf86_config;
+	drmmode_crtc_private_ptr drmmode_crtc;
+	drmmode_ptr drmmode;
 
-	for (i = 0; i < config->num_crtc; i++) {
-		xf86CrtcPtr crtc = config->crtc[i];
-		drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+	xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 
-		if (!drmmode_crtc->rotate_bo)
-			continue;
+	drmmode_crtc = xf86_config->crtc[0]->driver_private;
+	drmmode = drmmode_crtc->drmmode;
 
-		if (drmmode_crtc->rotate_bo->virtual == pPixData) {
-			*bo = drmmode_crtc->rotate_bo;
-			return TRUE;
-		}
-	}
-	return FALSE;
-#endif
+	drmModeRmFB(drmmode->fd, drmmode->fb_id);
+	drmmode->fb_id = 0;
 }
-
-#endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i2c_vid.h new/xsrc/external/mit/xf86-video-intel/dist/src/i2c_vid.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i2c_vid.h	2008-08-02 07:12:41.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i2c_vid.h	2011-02-08 11:14:00.000000000 +0100
@@ -129,8 +129,4 @@ typedef struct _I830I2CVidOutputRec {
     void (*dump_regs)(I2CDevPtr d);
 } I830I2CVidOutputRec, *I830I2CVidOutputPtr;
 
-/* XXX change this name to avoid driver-specific prefix */
-DisplayModePtr
-i830_dvo_get_current_mode (xf86OutputPtr output);
-
 #endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_accel.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_accel.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_accel.c	2008-08-02 07:12:44.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_accel.c	2011-02-08 11:14:00.000000000 +0100
@@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v 1.21 2004/01/02 20:22:17 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors:
  *   Keith Whitwell <keith@tungstengraphics.com>
  *
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_common.h new/xsrc/external/mit/xf86-video-intel/dist/src/i810_common.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_common.h	2008-08-02 07:12:41.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_common.h	2011-02-08 11:14:00.000000000 +0100
@@ -25,7 +25,6 @@
  * Converted to common header format:
  *   Jens Owen <jens@tungstengraphics.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_common.h,v 1.1 2002/09/11 00:29:31 dawes Exp $
  *
  */
 
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_cursor.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_cursor.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_cursor.c	2008-08-02 07:12:35.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_cursor.c	2011-02-08 11:14:00.000000000 +0100
@@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_cursor.c,v 1.6 2002/09/11 00:29:31 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors:
  *   Keith Whitwell <keith@tungstengraphics.com>
  *
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_dga.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_dga.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_dga.c	2008-08-02 07:12:44.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_dga.c	2011-02-08 11:14:00.000000000 +0100
@@ -21,20 +21,6 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c,v 1.5 2002/09/11 00:29:31 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -98,10 +84,10 @@ I810DGAInit(ScreenPtr pScreen)
 
    while (pMode) {
 
-      newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+      newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
 
       if (!newmodes) {
-	 xfree(modes);
+	 free(modes);
 	 return FALSE;
       }
       modes = newmodes;
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c	2008-08-02 07:12:40.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,17 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v 1.41 2003/09/24 02:43:23 dawes Exp $ */
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -186,25 +172,25 @@ I810InitVisualConfigs(ScreenPtr pScreen)
       numConfigs = 8;
 
       pConfigs =
-	    (__GLXvisualConfig *) xcalloc(sizeof(__GLXvisualConfig),
+	    (__GLXvisualConfig *) calloc(sizeof(__GLXvisualConfig),
 					  numConfigs);
       if (!pConfigs)
 	 return FALSE;
 
       pI810Configs =
-	    (I810ConfigPrivPtr) xcalloc(sizeof(I810ConfigPrivRec),
+	    (I810ConfigPrivPtr) calloc(sizeof(I810ConfigPrivRec),
 					numConfigs);
       if (!pI810Configs) {
-	 xfree(pConfigs);
+	 free(pConfigs);
 	 return FALSE;
       }
 
       pI810ConfigPtrs =
-	    (I810ConfigPrivPtr *) xcalloc(sizeof(I810ConfigPrivPtr),
+	    (I810ConfigPrivPtr *) calloc(sizeof(I810ConfigPrivPtr),
 					  numConfigs);
       if (!pI810ConfigPtrs) {
-	 xfree(pConfigs);
-	 xfree(pI810Configs);
+	 free(pConfigs);
+	 free(pI810Configs);
 	 return FALSE;
       }
 
@@ -352,16 +338,10 @@ I810DRIScreenInit(ScreenPtr pScreen)
    if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
       pDRIInfo->busIdString = DRICreatePCIBusID(pI810->PciInfo);
    } else {
-      pDRIInfo->busIdString = xalloc(64);
+      pDRIInfo->busIdString = malloc(64);
       sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
-#if XSERVER_LIBPCIACCESS
 	      ((pI810->PciInfo->domain << 8) | pI810->PciInfo->bus),
 	      pI810->PciInfo->dev, pI810->PciInfo->func
-#else
-	      ((pciConfigPtr) pI810->PciInfo->thisCard)->busnum,
-	      ((pciConfigPtr) pI810->PciInfo->thisCard)->devnum,
-	      ((pciConfigPtr) pI810->PciInfo->thisCard)->funcnum
-#endif
 	      );
    }
    pDRIInfo->ddxDriverMajorVersion = I810_MAJOR_VERSION;
@@ -390,7 +370,7 @@ I810DRIScreenInit(ScreenPtr pScreen)
    }
    pDRIInfo->SAREASize = SAREA_MAX;
 
-   if (!(pI810DRI = (I810DRIPtr) xcalloc(sizeof(I810DRIRec), 1))) {
+   if (!(pI810DRI = (I810DRIPtr) calloc(sizeof(I810DRIRec), 1))) {
       DRIDestroyInfoRec(pI810->pDRIInfo);
       pI810->pDRIInfo = NULL;
       return FALSE;
@@ -419,7 +399,7 @@ I810DRIScreenInit(ScreenPtr pScreen)
    if (!DRIScreenInit(pScreen, pDRIInfo, &pI810->drmSubFD)) {
       xf86DrvMsg(pScreen->myNum, X_ERROR,
 		 "[dri] DRIScreenInit failed.  Disabling DRI.\n");
-      xfree(pDRIInfo->devPrivate);
+      free(pDRIInfo->devPrivate);
       pDRIInfo->devPrivate = NULL;
       DRIDestroyInfoRec(pI810->pDRIInfo);
       pI810->pDRIInfo = NULL;
@@ -978,19 +958,10 @@ I810DRIScreenInit(ScreenPtr pScreen)
 
    if (!pI810DRI->irq) {
       pI810DRI->irq = drmGetInterruptFromBusID(pI810->drmSubFD,
-#if XSERVER_LIBPCIACCESS
 					       ((pI810->PciInfo->domain << 8) |
 						pI810->PciInfo->bus),
 					       pI810->PciInfo->dev,
 					       pI810->PciInfo->func
-#else
-					       ((pciConfigPtr) pI810->
-						PciInfo->thisCard)->busnum,
-					       ((pciConfigPtr) pI810->
-						PciInfo->thisCard)->devnum,
-					       ((pciConfigPtr) pI810->
-						PciInfo->thisCard)->funcnum
-#endif
 					       );
       if ((drmCtlInstHandler(pI810->drmSubFD, pI810DRI->irq)) != 0) {
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -1084,16 +1055,16 @@ I810DRICloseScreen(ScreenPtr pScreen)
 
    if (pI810->pDRIInfo) {
       if (pI810->pDRIInfo->devPrivate) {
-	 xfree(pI810->pDRIInfo->devPrivate);
+	 free(pI810->pDRIInfo->devPrivate);
 	 pI810->pDRIInfo->devPrivate = NULL;
       }
       DRIDestroyInfoRec(pI810->pDRIInfo);
       pI810->pDRIInfo = NULL;
    }
    if (pI810->pVisualConfigs)
-      xfree(pI810->pVisualConfigs);
+      free(pI810->pVisualConfigs);
    if (pI810->pVisualConfigsPriv)
-      xfree(pI810->pVisualConfigsPriv);
+      free(pI810->pVisualConfigsPriv);
 }
 
 static Bool
@@ -1231,12 +1202,12 @@ I810DRIMoveBuffers(WindowPtr pParent, DD
 
       if (nbox > 1) {
 	 /* Keep ordering in each band, reverse order of bands */
-	 pboxNew1 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
+	 pboxNew1 = (BoxPtr) malloc(sizeof(BoxRec) * nbox);
 	 if (!pboxNew1)
 	    return;
-	 pptNew1 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
+	 pptNew1 = (DDXPointPtr) malloc(sizeof(DDXPointRec) * nbox);
 	 if (!pptNew1) {
-	    xfree(pboxNew1);
+	    free(pboxNew1);
 	    return;
 	 }
 	 pboxBase = pboxNext = pbox + nbox - 1;
@@ -1267,16 +1238,16 @@ I810DRIMoveBuffers(WindowPtr pParent, DD
 
       if (nbox > 1) {
 	 /*reverse orderof rects in each band */
-	 pboxNew2 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
-	 pptNew2 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
+	 pboxNew2 = (BoxPtr) malloc(sizeof(BoxRec) * nbox);
+	 pptNew2 = (DDXPointPtr) malloc(sizeof(DDXPointRec) * nbox);
 	 if (!pboxNew2 || !pptNew2) {
 	    if (pptNew2)
-	       xfree(pptNew2);
+	       free(pptNew2);
 	    if (pboxNew2)
-	       xfree(pboxNew2);
+	       free(pboxNew2);
 	    if (pboxNew1) {
-	       xfree(pptNew1);
-	       xfree(pboxNew1);
+	       free(pptNew1);
+	       free(pboxNew1);
 	    }
 	    return;
 	 }
@@ -1341,12 +1312,12 @@ I810DRIMoveBuffers(WindowPtr pParent, DD
    I810EmitFlush(pScrn);
 
    if (pboxNew2) {
-      xfree(pptNew2);
-      xfree(pboxNew2);
+      free(pptNew2);
+      free(pboxNew2);
    }
    if (pboxNew1) {
-      xfree(pptNew1);
-      xfree(pboxNew1);
+      free(pptNew1);
+      free(pboxNew1);
    }
 
    if (pI810->AccelInfoRec)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.h new/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.h	2008-08-02 07:12:35.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.h	2011-02-08 11:14:00.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h,v 1.10 2002/12/10 01:27:04 dawes Exp $ */
 
 #ifndef _I810_DRI_
 #define _I810_DRI_
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c	2010-11-24 03:54:08.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c	2011-02-08 11:14:00.000000000 +0100
@@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.101 2004/01/02 20:15:47 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors:
  *   Keith Whitwell <keith@tungstengraphics.com>
  *
@@ -70,6 +56,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86cmap.h"
+
 #include "compiler.h"
 #include "mibstore.h"
 #include "vgaHW.h"
@@ -89,23 +76,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "dri.h"
 #endif
 
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
-#define xf86LoaderReqSymLists(...) do {} while (0)
-#define LoaderRefSymLists(...) do {} while (0)
-#endif
-
 /* Required Functions: */
 
 static void I810Identify(int flags);
-
-#if XSERVER_LIBPCIACCESS
+static Bool I810DriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr);
 static Bool intel_pci_probe (DriverPtr		drv,
 			     int		entity_num,
 			     struct pci_device	*dev,
 			     intptr_t		match_data);
-#else
-static Bool I810Probe(DriverPtr drv, int flags);
-#endif
 
 #ifndef I830_ONLY
 static Bool I810PreInit(ScrnInfoPtr pScrn, int flags);
@@ -123,9 +101,6 @@ static ModeStatus I810ValidMode(int scrn
 				Bool verbose, int flags);
 #endif /* I830_ONLY */
 
-
-#if XSERVER_LIBPCIACCESS
-
 #define INTEL_DEVICE_MATCH(d,i) \
     { 0x8086, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
 
@@ -162,28 +137,23 @@ static const struct pci_id_match intel_d
    INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ),
    INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
    INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
+   INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ),
+   INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ),
+   INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ),
     { 0, 0, 0 },
 };
 
-#endif /* XSERVER_LIBPCIACCESS */
-
 _X_EXPORT DriverRec I810 = {
    I810_VERSION,
    I810_DRIVER_NAME,
    I810Identify,
-#if XSERVER_LIBPCIACCESS
    NULL,
-#else
-   I810Probe,
-#endif
    I810AvailableOptions,
    NULL,
    0,
-   NULL,
-#if XSERVER_LIBPCIACCESS
+   I810DriverFunc,
    intel_device_match,
    intel_pci_probe
-#endif
 };
 
 /* *INDENT-OFF* */
@@ -205,8 +175,8 @@ static SymTabRec I810Chipsets[] = {
    {PCI_CHIP_I945_G,		"945G"},
    {PCI_CHIP_I945_GM,		"945GM"},
    {PCI_CHIP_I945_GME,		"945GME"},
-   {PCI_CHIP_IGD_GM,		"IGD_GM"},
-   {PCI_CHIP_IGD_G,		"IGD_G"},
+   {PCI_CHIP_IGD_GM,		"Pineview GM"},
+   {PCI_CHIP_IGD_G,		"Pineview G"},
    {PCI_CHIP_I965_G,		"965G"},
    {PCI_CHIP_G35_G,		"G35"},
    {PCI_CHIP_I965_Q,		"965Q"},
@@ -216,48 +186,54 @@ static SymTabRec I810Chipsets[] = {
    {PCI_CHIP_G33_G,		"G33"},
    {PCI_CHIP_Q35_G,		"Q35"},
    {PCI_CHIP_Q33_G,		"Q33"},
-   {PCI_CHIP_GM45_GM,		"Mobile Intel® GM45 Express Chipset"},
-   {PCI_CHIP_IGD_E_G,		"Intel Integrated Graphics Device"},
+   {PCI_CHIP_GM45_GM,		"GM45"},
+   {PCI_CHIP_IGD_E_G,		"4 Series"},
    {PCI_CHIP_G45_G,		"G45/G43"},
    {PCI_CHIP_Q45_G,		"Q45/Q43"},
    {PCI_CHIP_G41_G,		"G41"},
+   {PCI_CHIP_B43_G,		"B43"},
+   {PCI_CHIP_IGDNG_D_G,		"Clarkdale"},
+   {PCI_CHIP_IGDNG_M_G,		"Arrandale"},
    {-1,				NULL}
 };
 
 static PciChipsets I810PciChipsets[] = {
 #ifndef I830_ONLY
-   {PCI_CHIP_I810,		PCI_CHIP_I810,		RES_SHARED_VGA},
-   {PCI_CHIP_I810_DC100,	PCI_CHIP_I810_DC100,	RES_SHARED_VGA},
-   {PCI_CHIP_I810_E,		PCI_CHIP_I810_E,	RES_SHARED_VGA},
-   {PCI_CHIP_I815,		PCI_CHIP_I815,		RES_SHARED_VGA},
-#endif
-   {PCI_CHIP_I830_M,		PCI_CHIP_I830_M,	RES_SHARED_VGA},
-   {PCI_CHIP_845_G,		PCI_CHIP_845_G,		RES_SHARED_VGA},
-   {PCI_CHIP_I855_GM,		PCI_CHIP_I855_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I865_G,		PCI_CHIP_I865_G,	RES_SHARED_VGA},
-   {PCI_CHIP_I915_G,		PCI_CHIP_I915_G,	RES_SHARED_VGA},
-   {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	RES_SHARED_VGA},
-   {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	RES_SHARED_VGA},
-   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I945_GME,		PCI_CHIP_I945_GME,	RES_SHARED_VGA},
-   {PCI_CHIP_IGD_GM,		PCI_CHIP_IGD_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_IGD_G,		PCI_CHIP_IGD_G,		RES_SHARED_VGA},
-   {PCI_CHIP_I965_G,		PCI_CHIP_I965_G,	RES_SHARED_VGA},
-   {PCI_CHIP_G35_G,		PCI_CHIP_G35_G,		RES_SHARED_VGA},
-   {PCI_CHIP_I965_Q,		PCI_CHIP_I965_Q,	RES_SHARED_VGA},
-   {PCI_CHIP_I946_GZ,		PCI_CHIP_I946_GZ,	RES_SHARED_VGA},
-   {PCI_CHIP_I965_GM,		PCI_CHIP_I965_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I965_GME,		PCI_CHIP_I965_GME,	RES_SHARED_VGA},
-   {PCI_CHIP_G33_G,		PCI_CHIP_G33_G,		RES_SHARED_VGA},
-   {PCI_CHIP_Q35_G,		PCI_CHIP_Q35_G,		RES_SHARED_VGA},
-   {PCI_CHIP_Q33_G,		PCI_CHIP_Q33_G,		RES_SHARED_VGA},
-   {PCI_CHIP_GM45_GM,		PCI_CHIP_GM45_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_IGD_E_G,		PCI_CHIP_IGD_E_G,	RES_SHARED_VGA},
-   {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		RES_SHARED_VGA},
-   {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		RES_SHARED_VGA},
-   {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		RES_SHARED_VGA},
-   {-1,				-1, RES_UNDEFINED }
+   {PCI_CHIP_I810,		PCI_CHIP_I810,		NULL},
+   {PCI_CHIP_I810_DC100,	PCI_CHIP_I810_DC100,	NULL},
+   {PCI_CHIP_I810_E,		PCI_CHIP_I810_E,	NULL},
+   {PCI_CHIP_I815,		PCI_CHIP_I815,		NULL},
+#endif
+   {PCI_CHIP_I830_M,		PCI_CHIP_I830_M,	NULL},
+   {PCI_CHIP_845_G,		PCI_CHIP_845_G,		NULL},
+   {PCI_CHIP_I855_GM,		PCI_CHIP_I855_GM,	NULL},
+   {PCI_CHIP_I865_G,		PCI_CHIP_I865_G,	NULL},
+   {PCI_CHIP_I915_G,		PCI_CHIP_I915_G,	NULL},
+   {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	NULL},
+   {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	NULL},
+   {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	NULL},
+   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	NULL},
+   {PCI_CHIP_I945_GME,		PCI_CHIP_I945_GME,	NULL},
+   {PCI_CHIP_IGD_GM,		PCI_CHIP_IGD_GM,	NULL},
+   {PCI_CHIP_IGD_G,		PCI_CHIP_IGD_G,		NULL},
+   {PCI_CHIP_I965_G,		PCI_CHIP_I965_G,	NULL},
+   {PCI_CHIP_G35_G,		PCI_CHIP_G35_G,		NULL},
+   {PCI_CHIP_I965_Q,		PCI_CHIP_I965_Q,	NULL},
+   {PCI_CHIP_I946_GZ,		PCI_CHIP_I946_GZ,	NULL},
+   {PCI_CHIP_I965_GM,		PCI_CHIP_I965_GM,	NULL},
+   {PCI_CHIP_I965_GME,		PCI_CHIP_I965_GME,	NULL},
+   {PCI_CHIP_G33_G,		PCI_CHIP_G33_G,		NULL},
+   {PCI_CHIP_Q35_G,		PCI_CHIP_Q35_G,		NULL},
+   {PCI_CHIP_Q33_G,		PCI_CHIP_Q33_G,		NULL},
+   {PCI_CHIP_GM45_GM,		PCI_CHIP_GM45_GM,	NULL},
+   {PCI_CHIP_IGD_E_G,		PCI_CHIP_IGD_E_G,	NULL},
+   {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		NULL},
+   {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		NULL},
+   {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		NULL},
+   {PCI_CHIP_B43_G,		PCI_CHIP_B43_G,		NULL},
+   {PCI_CHIP_IGDNG_D_G,		PCI_CHIP_IGDNG_D_G,	NULL},
+   {PCI_CHIP_IGDNG_M_G,		PCI_CHIP_IGDNG_M_G,	NULL},
+   {-1,				-1, NULL }
 };
 
 #ifndef I830_ONLY
@@ -290,145 +266,6 @@ static const OptionInfoRec I810Options[]
 /* *INDENT-ON* */
 #endif
 
-const char *I810vgahwSymbols[] = {
-   "vgaHWFreeHWRec",
-   "vgaHWGetHWRec",
-   "vgaHWGetIOBase",
-   "vgaHWGetIndex",
-   "vgaHWInit",
-   "vgaHWLock",
-   "vgaHWMapMem",
-   "vgaHWProtect",
-   "vgaHWRestore",
-   "vgaHWSave",
-   "vgaHWSaveScreen",
-   "vgaHWSetMmioFuncs",
-   "vgaHWUnlock",
-   "vgaHWUnmapMem",
-   NULL
-};
-
-const char *I810fbSymbols[] = {
-   "fbPictureInit",
-   "fbScreenInit",
-   NULL
-};
-
-const char *I810vbeSymbols[] = {
-   "VBEFreeModeInfo",
-   "VBEFreeVBEInfo",
-   "VBEGetModeInfo",
-   "VBEGetModePool",
-   "VBEGetVBEInfo",
-   "VBEGetVBEMode",
-   "VBEInit",
-   "VBEPrintModes",
-   "VBESaveRestore",
-   "VBESetDisplayStart",
-   "VBESetGetDACPaletteFormat",
-   "VBESetGetLogicalScanlineLength",
-   "VBESetGetPaletteData",
-   "VBESetModeNames",
-   "VBESetModeParameters",
-   "VBESetVBEMode",
-   "VBEValidateModes",
-   "vbeDoEDID",
-   "vbeFree",
-   NULL
-};
-
-#ifdef XFree86LOADER
-static const char *vbeOptionalSymbols[] = {
-   "VBEDPMSSet",
-   "VBEGetPixelClock",
-   NULL
-};
-#endif
-
-const char *I810ddcSymbols[] = {
-   "xf86PrintEDID",
-   "xf86SetDDCproperties",
-   NULL
-};
-
-const char *I810xaaSymbols[] = {
-   "XAACreateInfoRec",
-   "XAADestroyInfoRec",
-   "XAAInit",
-   "XAAGetCopyROP",
-   "XAAGetPatternROP",
-   NULL
-};
-
-const char *I810ramdacSymbols[] = {
-   "xf86CreateCursorInfoRec",
-   "xf86DestroyCursorInfoRec",
-   "xf86InitCursor",
-   NULL
-};
-
-const char *I810shadowFBSymbols[] = {
-    "ShadowFBInit",
-    NULL
-};
-
-#ifdef XF86DRI
-const char *I810drmSymbols[] = {
-   "drmAddBufs",
-   "drmAddMap",
-   "drmAgpAcquire",
-   "drmAgpAlloc",
-   "drmAgpBind",
-   "drmAgpEnable",
-   "drmAgpFree",
-   "drmAgpRelease",
-   "drmAgpUnbind",
-   "drmAuthMagic",
-   "drmCommandNone",
-   "drmCommandWrite",
-   "drmCreateContext",
-   "drmCtlInstHandler",
-   "drmCtlUninstHandler",
-   "drmDestroyContext",
-   "drmFreeVersion",
-   "drmGetInterruptFromBusID",
-   "drmGetLibVersion",
-   "drmGetVersion",
-   "drmRmMap",
-#ifdef XSERVER_LIBDRM_MM 
-   "drmMMInit",
-   "drmMMTakedown",
-   "drmMMLock",
-   "drmMMUnlock",
-#endif
-   NULL
-};
-
-
-const char *I810driSymbols[] = {
-   "DRICloseScreen",
-   "DRICreateInfoRec",
-   "DRIGetContext",
-   "DRIDestroyInfoRec",
-   "DRIFinishScreenInit",
-   "DRIGetSAREAPrivate",
-   "DRILock",
-   "DRIQueryVersion",
-   "DRIScreenInit",
-   "DRIUnlock",
-   "GlxSetVisualConfigs",
-   "DRICreatePCIBusID",
-   NULL
-};
-
-#endif /* I830_ONLY */
-
-const char *I810i2cSymbols[] = {
-    "xf86CreateI2CBusRec",
-    "xf86I2CBusInit",
-    NULL
-};
-
 #ifndef I810_DEBUG
 int I810_DEBUG = (0
 /*     		  | DEBUG_ALWAYS_SYNC  */
@@ -485,28 +322,10 @@ i810Setup(pointer module, pointer opts,
    if (!setupDone) {
       setupDone = 1;
       xf86AddDriver(&I810, module,
-#if XSERVER_LIBPCIACCESS
 		    HaveDriverFuncs
-#else
-		    0
-#endif
 		    );
 
       /*
-       * Tell the loader about symbols from other modules that this module
-       * might refer to.
-       */
-      LoaderRefSymLists(I810vgahwSymbols,
-			I810fbSymbols, I810xaaSymbols, I810ramdacSymbols,
-#ifdef XF86DRI
-			I810drmSymbols,
-			I810driSymbols,
-#endif
-			I810shadowFBSymbols,
-			I810vbeSymbols, vbeOptionalSymbols,
-			I810ddcSymbols, NULL);
-
-      /*
        * The return value must be non-NULL on success even though there
        * is no TearDownProc.
        */
@@ -545,7 +364,7 @@ I810FreeRec(ScrnInfoPtr pScrn)
       return;
    if (!pScrn->driverPrivate)
       return;
-   xfree(pScrn->driverPrivate);
+   free(pScrn->driverPrivate);
    pScrn->driverPrivate = NULL;
 }
 #endif
@@ -578,7 +397,26 @@ I810AvailableOptions(int chipid, int bus
 #endif
 }
 
-#if XSERVER_LIBPCIACCESS
+static Bool
+I810DriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
+{
+    xorgHWFlags *flag;
+
+    switch (op) {
+        case GET_REQUIRED_HW_INTERFACES:
+            flag = (CARD32*)ptr;
+#ifdef KMS_ONLY
+            (*flag) = 0;
+#else
+	    (*flag) = HW_IO | HW_MMIO;
+#endif
+            return TRUE;
+        default:
+	    /* Unknown or deprecated function */
+            return FALSE;
+    }
+}
+
 struct pci_device *
 intel_host_bridge (void)
 {
@@ -638,153 +476,12 @@ static Bool intel_pci_probe (DriverPtr
 	    break;
 #endif
 	default:
-	    I830InitpScrn(scrn);
+	    intel_init_scrn(scrn);
 	    break;
 	}
     }
     return scrn != NULL;
 }
-#else /* XSERVER_LIBPCIACCESS */
-
-/*
- * I810Probe --
- *
- * Look through the PCI bus to find cards that are I810 boards.
- * Setup the dispatch table for the rest of the driver functions.
- *
- */
-static Bool
-I810Probe(DriverPtr drv, int flags)
-{
-   int i, numUsed, numDevSections, *usedChips;
-   DevUnion *pPriv;						
-   GDevPtr *devSections;
-   Bool foundScreen = FALSE;
-   pciVideoPtr *VideoInfo;
-   pciVideoPtr *ppPci;
-   PciChipsets *id;
-
-   /*
-    * Find the config file Device sections that match this
-    * driver, and return if there are none.
-    */
-   if ((numDevSections =
-	xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) {
-      return FALSE;
-   }
-
-   /*
-    * This probing is just checking the PCI data the server already
-    * collected.
-    */
-   if (!(VideoInfo = xf86GetPciVideoInfo()))
-      return FALSE;
-
-   /*
-    * Mobile platforms may have both function 0 and 1 active, but they
-    * are handled as a single entity.  To make sure that the function 1
-    * entity isn't assigned to a screen, check for and claim it here
-    * first.
-    *
-    * XXX If function 1's resources are ever needed, they'll need to be
-    * added to the screen and marked active.
-    */
-   for (ppPci = VideoInfo; ppPci != NULL && *ppPci != NULL; ppPci++) {
-      if ((*ppPci)->vendor == PCI_VENDOR_INTEL &&
-	  (*ppPci)->func == 1) {
-	 for (id = I810PciChipsets; id->PCIid != -1; id++) {
-	    if (id->PCIid == (*ppPci)->chipType) {
-	       /* Claim slot */
-	       if (xf86CheckPciSlot((*ppPci)->bus, (*ppPci)->device,
-				    (*ppPci)->func)) {
-	  	  xf86ClaimPciSlot((*ppPci)->bus, (*ppPci)->device,
-				   (*ppPci)->func, drv, id->PCIid,
-				   NULL, FALSE);
-	       }
-	       break;
-	    }
-	 }
-      }
-   }
-
-   /* Look for Intel i8xx devices. */
-   numUsed = xf86MatchPciInstances(I810_NAME, PCI_VENDOR_INTEL,
-				   I810Chipsets, I810PciChipsets,
-				   devSections, numDevSections,
-				   drv, &usedChips);
-
-   if (flags & PROBE_DETECT) {
-      if (numUsed > 0)
-	 foundScreen = TRUE;
-   } else {
-      for (i = 0; i < numUsed; i++) {
-	 ScrnInfoPtr pScrn = NULL;
-
-	 /* Allocate new ScrnInfoRec and claim the slot */
-	 if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
-					  I810PciChipsets, NULL, NULL, NULL,
-					  NULL, NULL))) {
-	    EntityInfoPtr pEnt;
-
-	    pEnt = xf86GetEntityInfo(usedChips[i]);
-
-	    pScrn->driverVersion = I810_VERSION;
-	    pScrn->driverName = I810_DRIVER_NAME;
-	    pScrn->name = I810_NAME;
-	    pScrn->Probe = I810Probe;
-	    foundScreen = TRUE;
-	    switch (pEnt->chipset) {
-	    case PCI_CHIP_845_G:
-	    case PCI_CHIP_I865_G:
-	    case PCI_CHIP_I830_M:
-	    case PCI_CHIP_I855_GM:
-	    case PCI_CHIP_I915_G:
-	    case PCI_CHIP_E7221_G:
-	    case PCI_CHIP_I915_GM:
-	    case PCI_CHIP_I945_G:
-	    case PCI_CHIP_I945_GM:
-	    case PCI_CHIP_I945_GME:
-	    case PCI_CHIP_IGD_GM:
-	    case PCI_CHIP_IGD_G:
-	    case PCI_CHIP_I965_G:
-	    case PCI_CHIP_G35_G:
-	    case PCI_CHIP_I965_Q:
-	    case PCI_CHIP_I946_GZ:
-	    case PCI_CHIP_I965_GM:
-	    case PCI_CHIP_I965_GME:
- 	    case PCI_CHIP_G33_G:
- 	    case PCI_CHIP_Q35_G:
- 	    case PCI_CHIP_Q33_G:
- 	    case PCI_CHIP_GM45_GM:
-	    case PCI_CHIP_IGD_E_G:
-	    case PCI_CHIP_G45_G:
-	    case PCI_CHIP_Q45_G:
-	    case PCI_CHIP_G41_G:
-	       I830InitpScrn(pScrn);
-	       break;
-#ifndef I830_ONLY
-	    default:
-	       pScrn->PreInit = I810PreInit;
-	       pScrn->ScreenInit = I810ScreenInit;
-	       pScrn->SwitchMode = I810SwitchMode;
-	       pScrn->AdjustFrame = I810AdjustFrame;
-	       pScrn->EnterVT = I810EnterVT;
-	       pScrn->LeaveVT = I810LeaveVT;
-	       pScrn->FreeScreen = I810FreeScreen;
-	       pScrn->ValidMode = I810ValidMode;
-	       break;
-#endif
-	    }
-	 }
-      }
-   }
-
-   xfree(usedChips);
-   xfree(devSections);
-
-   return foundScreen;
-}
-#endif /* else XSERVER_LIBPCIACCESS */
 
 #ifndef I830_ONLY
 static void
@@ -812,7 +509,6 @@ I810DoDDC(ScrnInfoPtr pScrn, int index)
    }
 
    if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
-      xf86LoaderReqSymLists(I810vbeSymbols, NULL);
       MonInfo = vbeDoEDID(pVbe, NULL);
       xf86PrintEDID(MonInfo);
       xf86SetDDCproperties(pScrn, MonInfo);
@@ -867,8 +563,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
    if (!xf86LoadSubModule(pScrn, "vgahw"))
       return FALSE;
 
-   xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
-
    /* Allocate a vgaHWRec */
    if (!vgaHWGetHWRec(pScrn))
       return FALSE;
@@ -876,16 +570,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
    pI810->ioBase = hwp->PIOOffset;
 
    pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index);
-#if !XSERVER_LIBPCIACCESS
-   pI810->PciTag = pciTag(pI810->PciInfo->bus, pI810->PciInfo->device,
-			  pI810->PciInfo->func);
-#endif
-
-#if 0
-   if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
-      return FALSE;
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-#endif
 
    /* Set pScrn->monitor */
    pScrn->monitor = pScrn->confScreen->monitor;
@@ -934,7 +618,7 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
 
    /* Process the options */
    xf86CollectOptions(pScrn, NULL);
-   if (!(pI810->Options = xalloc(sizeof(I810Options))))
+   if (!(pI810->Options = malloc(sizeof(I810Options))))
       return FALSE;
    memcpy(pI810->Options, I810Options, sizeof(I810Options));
    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI810->Options);
@@ -965,7 +649,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
 	 I810FreeRec(pScrn);
 	 return FALSE;
       }
-      xf86LoaderReqSymLists(I810xaaSymbols, NULL);
    }
    
 #ifdef XF86DRI
@@ -1020,45 +703,11 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
    xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n",
 	      (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown i810");
 
-#if XSERVER_LIBPCIACCESS
    pI810->LinearAddr = pI810->PciInfo->regions[0].base_addr;
-#else
-   if (pI810->pEnt->device->MemBase != 0) {
-      pI810->LinearAddr = pI810->pEnt->device->MemBase;
-      from = X_CONFIG;
-   } else {
-      if (pI810->PciInfo->memBase[1] != 0) {
-	 pI810->LinearAddr = pI810->PciInfo->memBase[0] & 0xFF000000;
-	 from = X_PROBED;
-      } else {
-	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "No valid FB address in PCI config space\n");
-	 I810FreeRec(pScrn);
-	 return FALSE;
-      }
-   }
-#endif
    xf86DrvMsg(pScrn->scrnIndex, from, "Linear framebuffer at 0x%lX\n",
 	      (unsigned long)pI810->LinearAddr);
 
-#if XSERVER_LIBPCIACCESS
    pI810->MMIOAddr = pI810->PciInfo->regions[1].base_addr;
-#else
-   if (pI810->pEnt->device->IOBase != 0) {
-      pI810->MMIOAddr = pI810->pEnt->device->IOBase;
-      from = X_CONFIG;
-   } else {
-      if (pI810->PciInfo->memBase[1]) {
-	 pI810->MMIOAddr = pI810->PciInfo->memBase[1] & 0xFFF80000;
-	 from = X_PROBED;
-      } else {
-	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "No valid MMIO address in PCI config space\n");
-	 I810FreeRec(pScrn);
-	 return FALSE;
-      }
-   }
-#endif
    xf86DrvMsg(pScrn->scrnIndex, from, "IO registers at addr 0x%lX\n",
 	      (unsigned long)pI810->MMIOAddr);
 
@@ -1077,11 +726,7 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
    {
       uint32_t whtcfg_pamr_drp;
     
-#if XSERVER_LIBPCIACCESS
       pci_device_cfg_read_u32(pI810->PciInfo, & whtcfg_pamr_drp, WHTCFG_PAMR_DRP);
-#else
-      whtcfg_pamr_drp = pciReadLong(pI810->PciTag, WHTCFG_PAMR_DRP);
-#endif
 
       /* Need this for choosing watermarks.
        */
@@ -1134,18 +779,10 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
 
    /* Calculate Fixed Offsets depending on graphics aperture size */
    {
-#if XSERVER_LIBPCIACCESS
       struct pci_device *bridge = intel_host_bridge ();
       uint32_t   smram_miscc;
       
       pci_device_cfg_read_u32 (bridge, & smram_miscc, SMRAM_MISCC);
-#else
-      PCITAG bridge;
-      long smram_miscc;
-
-      bridge = pciTag(0, 0, 0);		/* This is always the host bridge */
-      smram_miscc = pciReadLong(bridge, SMRAM_MISCC);
-#endif
 
       if ((smram_miscc & GFX_MEM_WIN_SIZE) == GFX_MEM_WIN_32M) {
 	 pI810->FbMapSize = 0x1000000;
@@ -1249,14 +886,12 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
       I810FreeRec(pScrn);
       return FALSE;
    }
-   xf86LoaderReqSymLists(I810fbSymbols, NULL);
 
    if (!xf86ReturnOptValBool(pI810->Options, OPTION_SW_CURSOR, FALSE)) {
       if (!xf86LoadSubModule(pScrn, "ramdac")) {
 	 I810FreeRec(pScrn);
 	 return FALSE;
       }
-      xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
    }
 
    if (xf86GetOptValInteger
@@ -1283,9 +918,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
 	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
 		    "Couldn't load shadowfb module:\n");
        }
-       else {
-	 xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
-       }
      }
      
      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "page flipping %s\n",
@@ -1317,19 +949,12 @@ I810PreInit(ScrnInfoPtr pScrn, int flags
 #ifdef XF86DRI
    /* Load the dri module if requested. */
    if (xf86ReturnOptValBool(pI810->Options, OPTION_DRI, FALSE)) {
-      if (xf86LoadSubModule(pScrn, "dri")) {
-	 xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
-      }
+      xf86LoadSubModule(pScrn, "dri");
    }
 #endif
 
    /*  We won't be using the VGA access after the probe */
    I810SetMMIOAccess(pI810);
-#if 0
-   xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
-   xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
-#endif
-
    return TRUE;
 }
 
@@ -1338,10 +963,8 @@ I810MapMMIO(ScrnInfoPtr pScrn)
 {
    int mmioFlags;
    I810Ptr pI810 = I810PTR(pScrn);
-#if XSERVER_LIBPCIACCESS
    struct pci_device *const device = pI810->PciInfo;
    int err;
-#endif
 
 #if !defined(__alpha__)
    mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT;
@@ -1349,7 +972,6 @@ I810MapMMIO(ScrnInfoPtr pScrn)
    mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT | VIDMEM_SPARSE;
 #endif
 
-#if XSERVER_LIBPCIACCESS
    err = pci_device_map_range (device,
 			       pI810->MMIOAddr,
 			       I810_REG_SIZE,
@@ -1362,13 +984,6 @@ I810MapMMIO(ScrnInfoPtr pScrn)
 		  strerror (err), err);
       return FALSE;
    }
-#else
-   pI810->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
-				   pI810->PciTag,
-				   pI810->MMIOAddr, I810_REG_SIZE);
-   if (!pI810->MMIOBase)
-      return FALSE;
-#endif
    return TRUE;
 }
 
@@ -1376,17 +991,12 @@ static Bool
 I810MapMem(ScrnInfoPtr pScrn)
 {
    I810Ptr pI810 = I810PTR(pScrn);
-#if XSERVER_LIBPCIACCESS
    struct pci_device *const device = pI810->PciInfo;
    int err;
-#else
-   long i;
-#endif
 
    if (!I810MapMMIO(pScrn))
       return FALSE;
 
-#if XSERVER_LIBPCIACCESS
    err = pci_device_map_range (device,
 			       pI810->LinearAddr,
 			       pI810->FbMapSize,
@@ -1399,15 +1009,6 @@ I810MapMem(ScrnInfoPtr pScrn)
 		  strerror (err), err);
       return FALSE;
    }
-#else
-   for (i = 2; i < pI810->FbMapSize; i <<= 1) ;
-
-   pI810->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-				 pI810->PciTag,
-				 pI810->LinearAddr, i);
-   if (!pI810->FbBase)
-      return FALSE;
-#endif
 
    pI810->LpRing->virtual_start = pI810->FbBase + pI810->LpRing->mem.Start;
 
@@ -1419,12 +1020,7 @@ I810UnmapMMIO(ScrnInfoPtr pScrn)
 {
    I810Ptr pI810 = I810PTR(pScrn);
 
-#if XSERVER_LIBPCIACCESS
    pci_device_unmap_range (pI810->PciInfo, pI810->MMIOBase, I810_REG_SIZE);
-#else
-   xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pI810->MMIOBase,
-		   I810_REG_SIZE);
-#endif
    pI810->MMIOBase = NULL;
 }
 
@@ -1433,12 +1029,7 @@ I810UnmapMem(ScrnInfoPtr pScrn)
 {
    I810Ptr pI810 = I810PTR(pScrn);
 
-#if XSERVER_LIBPCIACCESS
    pci_device_unmap_range (pI810->PciInfo, pI810->FbBase, pI810->FbMapSize);
-#else
-   xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pI810->FbBase,
-		   pI810->FbMapSize);
-#endif
    pI810->FbBase = NULL;
    I810UnmapMMIO(pScrn);
    return TRUE;
@@ -2323,7 +1914,7 @@ I810ScreenInit(int scrnIndex, ScreenPtr
    pI810 = I810PTR(pScrn);
    hwp = VGAHWPTR(pScrn);
 
-   pI810->LpRing = xcalloc(sizeof(I810RingBuffer),1);
+   pI810->LpRing = calloc(sizeof(I810RingBuffer),1);
    if (!pI810->LpRing) {
      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
 		"Could not allocate lpring data structure.\n");
@@ -2436,7 +2027,9 @@ I810ScreenInit(int scrnIndex, ScreenPtr
    }
 #endif
 
+#ifdef XFreeXDGA
    I810DGAInit(pScreen);
+#endif
 
    if (!xf86InitFBManager(pScreen, &(pI810->FbMemBox))) {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -2733,13 +2326,13 @@ I810CloseScreen(int scrnIndex, ScreenPtr
    vgaHWUnmapMem(pScrn);
 
    if (pI810->ScanlineColorExpandBuffers) {
-      xfree(pI810->ScanlineColorExpandBuffers);
+      free(pI810->ScanlineColorExpandBuffers);
       pI810->ScanlineColorExpandBuffers = NULL;
    }
 
    if (infoPtr) {
       if (infoPtr->ScanlineColorExpandBuffers)
-	 xfree(infoPtr->ScanlineColorExpandBuffers);
+	 free(infoPtr->ScanlineColorExpandBuffers);
       XAADestroyInfoRec(infoPtr);
       pI810->AccelInfoRec = NULL;
    }
@@ -2760,7 +2353,7 @@ I810CloseScreen(int scrnIndex, ScreenPtr
     */
    xf86GARTCloseScreen(scrnIndex);
 
-   xfree(pI810->LpRing);
+   free(pI810->LpRing);
    pI810->LpRing = NULL;
 
    pScrn->vtSema = FALSE;
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810.h new/xsrc/external/mit/xf86-video-intel/dist/src/i810.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810.h	2011-02-08 11:14:00.000000000 +0100
@@ -27,7 +27,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.41 2003/06/18 13:14:17 dawes Exp $ */
 
 /*
  * Authors:
@@ -51,9 +50,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "vgaHW.h"
 
 #include "xorg-server.h"
-#ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
-#endif
 
 #ifdef XF86DRI
 #include "xf86drm.h"
@@ -190,12 +187,7 @@ typedef struct _I810Rec {
    unsigned long MMIOAddr;
    IOADDRESS ioBase;
    EntityInfoPtr pEnt;
-#if XSERVER_LIBPCIACCESS
    struct pci_device *PciInfo;
-#else
-   pciVideoPtr PciInfo;
-   PCITAG PciTag;
-#endif
 
    I810RingBuffer *LpRing;
    unsigned int BR[20];
@@ -274,8 +266,6 @@ typedef struct _I810Rec {
    int  drmMinor;
 } I810Rec;
 
-extern const char *I810vbeSymbols[];
-
 #define I810PTR(p) ((I810Ptr)((p)->driverPrivate))
 
 #define I810_SELECT_FRONT	0
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c	2010-11-23 09:53:04.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c	2011-02-08 11:14:00.000000000 +0100
@@ -32,7 +32,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c,v 1.3 2001/12/04 21:17:56 tsi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -231,7 +230,7 @@ void I810InitMC(ScreenPtr pScreen)
  *  Set *num_priv to the number of 32bit words that make up the size of
  *  of the data that priv will point to.
  *
- *  *priv = (long *) xcalloc (elements, sizeof(element))
+ *  *priv = (long *) calloc (elements, sizeof(element))
  *  *num_priv = (elements * sizeof(element)) >> 2;
  *
  **************************************************************************/
@@ -257,7 +256,7 @@ int I810XvMCCreateContext (ScrnInfoPtr p
     return BadAlloc;
   }
 
-  *priv = xcalloc(1,sizeof(I810XvMCCreateContextRec));
+  *priv = calloc(1,sizeof(I810XvMCCreateContextRec));
   contextRec = (I810XvMCCreateContextRec *)*priv;
 
   if(!*priv) {
@@ -269,7 +268,7 @@ int I810XvMCCreateContext (ScrnInfoPtr p
   if(drmCreateContext(pI810->drmSubFD, &(contextRec->drmcontext) ) < 0) {
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
         "I810XvMCCreateContext: Unable to create DRMContext!\n");
-    xfree(*priv);
+    free(*priv);
     return BadAlloc;
   }
 
@@ -296,7 +295,7 @@ int I810XvMCCreateSurface (ScrnInfoPtr p
   I810Ptr pI810 = I810PTR(pScrn);
   int i;
 
-  *priv = (long *)xcalloc(2,sizeof(long));
+  *priv = (long *)calloc(2,sizeof(long));
 
   if(!*priv) {
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -342,7 +341,7 @@ int I810XvMCCreateSubpicture (ScrnInfoPt
   I810Ptr pI810 = I810PTR(pScrn);
   int i;
 
-  *priv = (long *)xcalloc(1,sizeof(long));
+  *priv = (long *)calloc(1,sizeof(long));
 
   if(!*priv) {
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_io.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_io.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_io.c	2008-08-02 07:12:35.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_io.c	2011-02-08 11:14:00.000000000 +0100
@@ -24,26 +24,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c,v 1.4 2002/01/25 21:56:04 tsi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors:
  *   Daryll Strauss <daryll@precisioninsight.com>
  *
@@ -55,8 +41,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
 #ifdef BUILD_FOR_I830
 #include "i830.h"
-#define pI810 pI830
-#define I810Ptr I830Ptr
+#define pI810 intel
+#define I810Ptr intel_screen_private *
 #define I810WriteControlPIO I830WriteControlPIO
 #define I810ReadControlPIO I830ReadControlPIO
 #define I810WriteStandardPIO I830WriteStandardPIO
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_memory.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_memory.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_memory.c	2008-08-02 07:12:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_memory.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v 1.27 2002/12/10 01:27:05 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -31,19 +30,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #endif
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors:
  *   Keith Whitwell <keith@tungstengraphics.com>
  *
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_reg.h new/xsrc/external/mit/xf86-video-intel/dist/src/i810_reg.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_reg.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_reg.h	2011-02-08 11:14:00.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v 1.13 2003/02/06 04:18:04 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -114,6 +113,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define BITBLT_STATUS          0x01
 
 #define CHDECMISC	0x10111
+#define DCC			0x10200
 #define C0DRB0			0x10200
 #define C0DRB1			0x10202
 #define C0DRB2			0x10204
@@ -982,13 +982,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # define DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS	0x003f0000
 # define DPLL_FPA01_P1_POST_DIV_SHIFT		16
 # define DPLL_FPA01_P1_POST_DIV_SHIFT_IGD	15
+/* IGDNG */
+# define DPLL_FPA0_P1_POST_DIV_SHIFT		16
+
 # define PLL_P2_DIVIDE_BY_4			(1 << 23) /* i830, required in DVO non-gang */
 # define PLL_P1_DIVIDE_BY_TWO			(1 << 21) /* i830 */
 # define PLL_REF_INPUT_DREFCLK			(0 << 13)
 # define PLL_REF_INPUT_TVCLKINA			(1 << 13) /* i830 */
+# define PLL_REF_INPUT_SUPER_SSC		(1 << 13) /* IGDNG: 120M SSC */
 # define PLL_REF_INPUT_TVCLKINBC		(2 << 13) /* SDVO TVCLKIN */
 # define PLLB_REF_INPUT_SPREADSPECTRUMIN	(3 << 13)
 # define PLL_REF_INPUT_MASK			(3 << 13)
+# define PLL_REF_INPUT_DMICLK			(5 << 13) /* IGDNG: DMI refclk */
 # define PLL_LOAD_PULSE_PHASE_SHIFT		9
 /*
  * Parallel to Serial Load Pulse phase selection.
@@ -998,6 +1003,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
  */
 # define PLL_LOAD_PULSE_PHASE_MASK		(0xf << PLL_LOAD_PULSE_PHASE_SHIFT)
 # define DISPLAY_RATE_SELECT_FPA1		(1 << 8)
+/* IGDNG */
+# define PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT	9
+# define PLL_REF_SDVO_HDMI_MULTIPLIER_MASK	(7 << 9)
+# define PLL_REF_SDVO_HDMI_MULTIPLIER(x)	(((x)-1)<< PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT)
+# define DPLL_FPA1_P1_POST_DIV_SHIFT		0
+# define DPLL_FPA1_P1_POST_DIV_MASK		0xff
 
 /**
  * SDVO multiplier for 945G/GM. Not used on 965.
@@ -1262,6 +1273,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # define CRT_HOTPLUG_DETECT_VOLTAGE_325MV	(0 << 2)
 # define CRT_HOTPLUG_DETECT_VOLTAGE_475MV	(1 << 2)
 # define CRT_HOTPLUG_MASK			(0x3fc)	/* Bits 9-2 */
+# define CRT_FORCE_HOTPLUG_MASK                 0xfffffe1f
 
 #define PORT_HOTPLUG_STAT	0x61114
 # define HDMIB_HOTPLUG_INT_STATUS		(1 << 29)
@@ -1664,15 +1676,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # define DAC_A_1_3_V			(0 << 4)
 # define DAC_A_1_1_V			(1 << 4)
 # define DAC_A_0_7_V			(2 << 4)
-# define DAC_A_OFF			(3 << 4)
+# define DAC_A_MASK			(3 << 4)
 # define DAC_B_1_3_V			(0 << 2)
 # define DAC_B_1_1_V			(1 << 2)
 # define DAC_B_0_7_V			(2 << 2)
-# define DAC_B_OFF			(3 << 2)
+# define DAC_B_MASK			(3 << 2)
 # define DAC_C_1_3_V			(0 << 0)
 # define DAC_C_1_1_V			(1 << 0)
 # define DAC_C_0_7_V			(2 << 0)
-# define DAC_C_OFF			(3 << 0)
+# define DAC_C_MASK			(3 << 0)
 /** @} */
 
 /**
@@ -2145,10 +2157,33 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define PIPEACONF_PIPE_LOCKED	(1<<25)
 #define PIPEACONF_PALETTE	0
 #define PIPEACONF_GAMMA 	(1<<24)
+/* IGDNG: gamma */
+#define PIPECONF_PALETTE_8BIT	(0<<24)
+#define PIPECONF_PALETTE_10BIT	(1<<24)
+#define PIPECONF_PALETTE_12BIT	(2<<24)
 #define PIPECONF_FORCE_BORDER	(1<<25)
 #define PIPECONF_PROGRESSIVE	(0 << 21)
 #define PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 << 21)
 #define PIPECONF_INTERLACE_FIELD_0_ONLY		(7 << 21)
+/* IGDNG */
+#define PIPECONF_MSA_TIMING_DELAY	(0<<18) /* for eDP */
+#define PIPECONF_NO_DYNAMIC_RATE_CHANGE	(0 << 16)
+#define PIPECONF_NO_ROTATION		(0<<14)
+#define PIPECONF_FULL_COLOR_RANGE	(0<<13)
+#define PIPECONF_CE_COLOR_RANGE		(1<<13)
+#define PIPECONF_COLOR_SPACE_RGB	(0<<11)
+#define PIPECONF_COLOR_SPACE_YUV601	(1<<11)
+#define PIPECONF_COLOR_SPACE_YUV709	(2<<11)
+#define PIPECONF_CONNECT_DEFAULT	(0<<9)
+#define PIPECONF_8BPP			(0<<5)
+#define PIPECONF_10BPP			(1<<5)
+#define PIPECONF_6BPP			(2<<5)
+#define PIPECONF_12BPP			(3<<5)
+#define PIPECONF_ENABLE_DITHER		(1<<4)
+#define PIPECONF_DITHER_SPATIAL		(0<<2)
+#define PIPECONF_DITHER_ST1		(1<<2)
+#define PIPECONF_DITHER_ST2		(2<<2)
+#define PIPECONF_DITHER_TEMPORAL	(3<<2)
 
 #define PIPEAGCMAXRED		0x70010
 #define PIPEAGCMAXGREEN		0x70014
@@ -2179,6 +2214,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # define SVBLANK_INT_STATUS	(1 << 2)
 # define VBLANK_INT_STATUS	(1 << 1)
 # define OREG_UPDATE_STATUS	(1 << 0)
+#define   PIPE_BPC_MASK                         (7 << 5) /* Ironlake */
+#define   PIPE_8BPC                             (0 << 5)
+#define   PIPE_10BPC                            (1 << 5)
+#define   PIPE_6BPC                             (2 << 5)
+#define   PIPE_12BPC                            (3 << 5)
+
 				 
 
 #define DSPARB			0x70030
@@ -2214,6 +2255,43 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define PIPE_PIXEL_MASK		0x00ffffff
 #define PIPE_PIXEL_SHIFT	0
 
+/*
+ * Computing GMCH M and N values.
+ *
+ * GMCH M/N = dot clock * bytes per pixel / ls_clk * # of lanes
+ *
+ * ls_clk (we assume) is the DP link clock (1.62 or 2.7 GHz)
+ *
+ * The GMCH value is used internally
+ */
+#define PIPEA_GMCH_DATA_M	0x70050
+
+/* Transfer unit size for display port - 1, default is 0x3f (for TU size 64) */
+#define PIPE_GMCH_DATA_M_TU_SIZE_MASK	(0x3f << 25)
+#define PIPE_GMCH_DATA_M_TU_SIZE_SHIFT	25
+
+#define PIPE_GMCH_DATA_M_MASK		(0xffffff)
+
+#define PIPEA_GMCH_DATA_N	0x70054
+#define PIPE_GMCH_DATA_N_MASK		(0xffffff)
+
+/*
+ * Computing Link M and N values.
+ *
+ * Link M / N = pixel_clock / ls_clk
+ *
+ * (the DP spec calls pixel_clock the 'strm_clk')
+ *
+ * The Link value is transmitted in the Main Stream
+ * Attributes and VB-ID.
+ */
+
+#define PIPEA_DP_LINK_M		0x70060
+#define PIPEA_DP_LINK_M_MASK	(0xffffff)
+
+#define PIPEA_DP_LINK_N		0x70064
+#define PIPEA_DP_LINK_N_MASK	(0xffffff)
+
 #define PIPEB_DSL		0x71000
 
 #define PIPEBCONF 0x71008
@@ -2231,6 +2309,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define PIPEBFRAMEHIGH		0x71040
 #define PIPEBFRAMEPIXEL		0x71044
 
+#define PIPEB_GMCH_DATA_M	0x71050
+#define PIPEB_GMCH_DATA_N	0x71054
+#define PIPEB_DP_LINK_M		0x71060
+#define PIPEB_DP_LINK_N		0x71064
+
 #define DSPACNTR		0x70180
 #define DSPBCNTR		0x71180
 #define DISPLAY_PLANE_ENABLE 			(1<<31)
@@ -2242,13 +2325,23 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define DISPPLANE_8BPP				(0x2<<26)
 #define DISPPLANE_15_16BPP			(0x4<<26)
 #define DISPPLANE_16BPP				(0x5<<26)
-#define DISPPLANE_32BPP_NO_ALPHA 		(0x6<<26)
-#define DISPPLANE_32BPP				(0x7<<26)
+#define DISPPLANE_32BPP_NO_ALPHA 		(0x6<<26) /* IGDNG: BGRX */
+#define DISPPLANE_32BPP				(0x7<<26) /* IGDNG: not support */
+/* IGDNG */
+#define DISPPLANE_32BPP_10			(0x8<<26) /* 2:10:10:10 */
+#define DISPPLANE_32BPP_BGRX			(0xa<<26)
+#define DISPPLANE_64BPP				(0xc<<26)
+#define DISPPLANE_32BPP_RGBX			(0xe<<26)
 #define DISPPLANE_STEREO_ENABLE			(1<<25)
 #define DISPPLANE_STEREO_DISABLE		0
 #define DISPPLANE_SEL_PIPE_MASK			(1<<24)
-#define DISPPLANE_SEL_PIPE_A			0
+#define DISPPLANE_SEL_PIPE_A			0	/* IGDNG: don't use */
 #define DISPPLANE_SEL_PIPE_B			(1<<24)
+#define DISPPLANE_NORMAL_RANGE			(0<<25)
+#define DISPPLANE_EXT_RANGE			(1<<25)
+/* IGDNG */
+#define DISPPLANE_CSC_BYPASS			(0<<24)
+#define DISPPLANE_CSC_PASSTHROUGH		(1<<24)
 #define DISPPLANE_SRC_KEY_ENABLE		(1<<22)
 #define DISPPLANE_SRC_KEY_DISABLE		0
 #define DISPPLANE_LINE_DOUBLE			(1<<20)
@@ -2260,11 +2353,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define DISPPLANE_ALPHA_TRANS_DISABLE		0
 #define DISPPLANE_SPRITE_ABOVE_DISPLAYA		0
 #define DISPPLANE_SPRITE_ABOVE_OVERLAY		(1)
+/* IGDNG */
+#define DISPPLANE_X_TILE			(1<<10)
+#define DISPPLANE_LINEAR			(0<<10)
+#define DISPPLANE_TRICKLE_FEED_DISABLE		(1<<14)
 
 #define DSPABASE		0x70184
+/* IGDNG */
+#define DSPALINOFF		0x70184
 #define DSPASTRIDE		0x70188
 
 #define DSPBBASE		0x71184
+/* IGDNG */
+#define DSPBLINOFF		0x71184
 #define DSPBADDR		DSPBBASE
 #define DSPBSTRIDE		0x71188
 
@@ -2876,4 +2977,529 @@ typedef enum {
 #define MCHBAR_RENDER_STANDBY	0x111B8
 #define RENDER_STANDBY_ENABLE	(1 << 30)
 
+/* IGDNG */
+
+/* warmup time in us */
+#define WARMUP_PCH_REF_CLK_SSC_MOD	1
+#define WARMUP_PCH_FDI_RECEIVER_PLL	25
+#define WARMUP_PCH_DPLL			50
+#define WARMUP_CPU_DP_PLL		20
+#define WARMUP_CPU_FDI_TRANSMITTER_PLL	10
+#define WARMUP_DMI_LATENCY		20
+#define FDI_TRAIN_PATTERN_1_TIME	0.5
+#define FDI_TRAIN_PATTERN_2_TIME	1.5
+#define FDI_ONE_IDLE_PATTERN_TIME	31
+
+#define CPU_VGACNTRL		0x41000
+
+#define DIGITAL_PORT_HOTPLUG_CNTRL	0x44030
+#define  DIGITAL_PORTA_HOTPLUG_ENABLE		(1 << 4)
+#define  DIGITAL_PORTA_SHORT_PULSE_2MS		(0 << 2)
+#define  DIGITAL_PORTA_SHORT_PULSE_4_5MS	(1 << 2)
+#define  DIGITAL_PORTA_SHORT_PULSE_6MS		(2 << 2)
+#define  DIGITAL_PORTA_SHORT_PULSE_100MS	(3 << 2)
+#define  DIGITAL_PORTA_NO_DETECT		(0 << 0)
+#define  DIGITAL_PORTA_LONG_PULSE_DETECT_MASK	(1 << 1)
+#define  DIGITAL_PORTA_SHORT_PULSE_DETECT_MASK	(1 << 0)
+
+/* refresh rate hardware control */
+#define RR_HW_CTL	0x45300
+#define  RR_HW_LOW_POWER_FRAMES_MASK	0xff
+#define  RR_HW_HIGH_POWER_FRAMES_MASK	0xff00
+
+#define FDI_PLL_BIOS_0			0x46000
+#define FDI_PLL_BIOS_1			0x46004
+#define FDI_PLL_BIOS_2			0x46008
+#define DISPLAY_PORT_PLL_BIOS_0		0x4600c
+#define DISPLAY_PORT_PLL_BIOS_1		0x46010
+#define DISPLAY_PORT_PLL_BIOS_2		0x46014
+
+#define FDI_PLL_FREQ_CTL	0x46030
+#define  FDI_PLL_FREQ_CHANGE_REQUEST	(1<<24)
+#define  FDI_PLL_FREQ_LOCK_LIMIT_MASK	0xfff00
+#define  FDI_PLL_FREQ_DISABLE_COUNT_LIMIT_MASK	0xff
+
+#define PIPEA_DATA_M1		0x60030
+#define  TU_SIZE(x)		(((x)-1) << 25) /* default size 64 */
+#define  TU_SIZE_MASK		0x7e000000
+#define  PIPEA_DATA_M1_OFFSET	0
+#define PIPEA_DATA_N1		0x60034
+#define  PIPEA_DATA_N1_OFFSET	0
+
+#define PIPEA_DATA_M2		0x60038
+#define  PIPEA_DATA_M2_OFFSET	0
+#define PIPEA_DATA_N2		0x6003c
+#define  PIPEA_DATA_N2_OFFSET	0
+
+#define PIPEA_LINK_M1		0x60040
+#define  PIPEA_LINK_M1_OFFSET	0
+#define PIPEA_LINK_N1		0x60044
+#define  PIPEA_LINK_N1_OFFSET	0
+
+#define PIPEA_LINK_M2		0x60048
+#define  PIPEA_LINK_M2_OFFSET	0
+#define PIPEA_LINK_N2		0x6004c
+#define  PIPEA_LINK_N2_OFFSET	0
+
+/* PIPEB timing regs are same start from 0x61000 */
+
+#define PIPEB_DATA_M1		0x61030
+#define  PIPEB_DATA_M1_OFFSET	0
+#define PIPEB_DATA_N1		0x61034
+#define  PIPEB_DATA_N1_OFFSET	0
+
+#define PIPEB_DATA_M2		0x61038
+#define  PIPEB_DATA_M2_OFFSET	0
+#define PIPEB_DATA_N2		0x6103c
+#define  PIPEB_DATA_N2_OFFSET	0
+
+#define PIPEB_LINK_M1		0x61040
+#define  PIPEB_LINK_M1_OFFSET	0
+#define PIPEB_LINK_N1		0x61044
+#define  PIPEB_LINK_N1_OFFSET	0
+
+#define PIPEB_LINK_M2		0x61048
+#define  PIPEB_LINK_M2_OFFSET	0
+#define PIPEB_LINK_N2		0x6104c
+#define  PIPEB_LINK_N2_OFFSET	0
+
+/* PIPECONF for pipe A/B addr is same */
+
+/* cusor A is only connected to pipe A,
+   cursor B is connected to pipe B. Otherwise no change. */
+
+/* Plane A/B, DSPACNTR/DSPBCNTR addr not changed */
+
+/* CPU panel fitter */
+#define PFA_CTL_1		0x68080
+#define PFB_CTL_1		0x68880
+#define  PF_ENABLE		(1<<31)
+#define PFA_WIN_SZ		0x68074
+#define PFB_WIN_SZ		0x68874
+#define PFA_WIN_POS		0x68070
+#define PFB_WIN_POS		0x68870
+
+#define PFA_WIN_POS		0x68070
+#define PFB_WIN_POS		0x68870
+#define PFA_WIN_SIZE		0x68074
+#define PFB_WIN_SIZE		0x68874
+
+/* legacy palette */
+#define LGC_PALETTE_A		0x4a000
+#define LGC_PALETTE_B		0x4a800
+
+/* interrupts */
+#define DE_MASTER_IRQ_CONTROL	(1 << 31)
+#define DE_SPRITEB_FLIP_DONE	(1 << 29)
+#define DE_SPRITEA_FLIP_DONE	(1 << 28)
+#define DE_PLANEB_FLIP_DONE	(1 << 27)
+#define DE_PLANEA_FLIP_DONE	(1 << 26)
+#define DE_PCU_EVENT		(1 << 25)
+#define DE_GTT_FAULT		(1 << 24)
+#define DE_POISON		(1 << 23)
+#define DE_PERFORM_COUNTER	(1 << 22)
+#define DE_PCH_EVENT		(1 << 21)
+#define DE_AUX_CHANNEL_A	(1 << 20)
+#define DE_DP_A_HOTPLUG		(1 << 19)
+#define DE_GSE			(1 << 18)
+#define DE_PIPEB_VBLANK		(1 << 15)
+#define DE_PIPEB_EVEN_FIELD	(1 << 14)
+#define DE_PIPEB_ODD_FIELD	(1 << 13)
+#define DE_PIPEB_LINE_COMPARE	(1 << 12)
+#define DE_PIPEB_VSYNC		(1 << 11)
+#define DE_PIPEB_FIFO_UNDERRUN	(1 << 8)
+#define DE_PIPEA_VBLANK		(1 << 7)
+#define DE_PIPEA_EVEN_FIELD	(1 << 6)
+#define DE_PIPEA_ODD_FIELD	(1 << 5)
+#define DE_PIPEA_LINE_COMPARE	(1 << 4)
+#define DE_PIPEA_VSYNC		(1 << 3)
+#define DE_PIPEA_FIFO_UNDERRUN	(1 << 0)
+
+#define DEISR	0x44000
+#define DEIMR	0x44004
+#define DEIIR	0x44008
+#define DEIER	0x4400c
+
+/* GT interrupt */
+#define GT_SYNC_STATUS		(1 << 2)
+#define GT_USER_INTERRUPT	(1 << 0)
+
+#define GTISR	0x44010
+#define GTIMR	0x44014
+#define GTIIR	0x44018
+#define GTIER	0x4401c
+
+
+#define DISP_ARB_CTL	0x45000
+#define DISP_TILE_SURFACE_SWIZZLING	(1<<13)
+
+/* PCH */
+
+/* south display engine interrupt */
+#define SDE_CRT_HOTPLUG		(1 << 11)
+#define SDE_PORTD_HOTPLUG	(1 << 10)
+#define SDE_PORTC_HOTPLUG	(1 << 9)
+#define SDE_PORTB_HOTPLUG	(1 << 8)
+#define SDE_SDVOB_HOTPLUG	(1 << 6)
+
+#define SDEISR	0xc4000
+#define SDEIMR	0xc4004
+#define SDEIIR	0xc4008
+#define SDEIER	0xc400c
+
+/* digital port hotplug */
+#define PCH_PORT_HOTPLUG	0xc4030
+#define PORTD_HOTPLUG_ENABLE		(1 << 20)
+#define PORTD_PULSE_DURATION_2ms	(0)
+#define PORTD_PULSE_DURATION_4_5ms	(1 << 18)
+#define PORTD_PULSE_DURATION_6ms	(2 << 18)
+#define PORTD_PULSE_DURATION_100ms	(3 << 18)
+#define PORTD_HOTPLUG_NO_DETECT		(0)
+#define PORTD_HOTPLUG_SHORT_DETECT	(1 << 16)
+#define PORTD_HOTPLUG_LONG_DETECT	(1 << 17)
+#define PORTC_HOTPLUG_ENABLE		(1 << 12)
+#define PORTC_PULSE_DURATION_2ms	(0)
+#define PORTC_PULSE_DURATION_4_5ms	(1 << 10)
+#define PORTC_PULSE_DURATION_6ms	(2 << 10)
+#define PORTC_PULSE_DURATION_100ms	(3 << 10)
+#define PORTC_HOTPLUG_NO_DETECT		(0)
+#define PORTC_HOTPLUG_SHORT_DETECT	(1 << 8)
+#define PORTC_HOTPLUG_LONG_DETECT	(1 << 9)
+#define PORTB_HOTPLUG_ENABLE		(1 << 4)
+#define PORTB_PULSE_DURATION_2ms	(0)
+#define PORTB_PULSE_DURATION_4_5ms	(1 << 2)
+#define PORTB_PULSE_DURATION_6ms	(2 << 2)
+#define PORTB_PULSE_DURATION_100ms	(3 << 2)
+#define PORTB_HOTPLUG_NO_DETECT		(0)
+#define PORTB_HOTPLUG_SHORT_DETECT	(1 << 0)
+#define PORTB_HOTPLUG_LONG_DETECT	(1 << 1)
+
+#define PCH_GPIOA		0xc5010
+#define PCH_GPIOB		0xc5014
+#define PCH_GPIOC		0xc5018
+#define PCH_GPIOD		0xc501c
+#define PCH_GPIOE		0xc5020
+#define PCH_GPIOF		0xc5024
+#define PCH_GMBUS0		0xc5100
+#define PCH_GMBUS1		0xc5104
+#define PCH_GMBUS2		0xc5108
+#define PCH_GMBUS3		0xc510c
+#define PCH_GMBUS4		0xc5110
+#define PCH_GMBUS5		0xc5120
+
+#define PCH_DPLL_A		0xc6014
+#define PCH_DPLL_B		0xc6018
+
+#define PCH_FPA0		0xc6040
+#define PCH_FPA1		0xc6044
+#define PCH_FPB0		0xc6048
+#define PCH_FPB1		0xc604c
+
+#define PCH_DPLL_TEST		0xc606c
+
+#define PCH_DREF_CONTROL	0xC6200
+#define  DREF_CONTROL_MASK	0x7fc3
+#define  DREF_CPU_SOURCE_OUTPUT_DISABLE		(0<<13)
+#define  DREF_CPU_SOURCE_OUTPUT_DOWNSPREAD	(2<<13)
+#define  DREF_CPU_SOURCE_OUTPUT_NONSPREAD	(3<<13)
+#define  DREF_SSC_SOURCE_DISABLE		(0<<11)
+#define  DREF_SSC_SOURCE_ENABLE			(2<<11)
+#define  DREF_SSC_SOURCE_MASK			(2<<11)
+#define  DREF_NONSPREAD_SOURCE_DISABLE		(0<<9)
+#define  DREF_NONSPREAD_CK505_ENABLE		(1<<9)
+#define  DREF_NONSPREAD_SOURCE_ENABLE		(2<<9)
+#define  DREF_NONSPREAD_SOURCE_MASK		(2<<9)
+#define  DREF_SUPERSPREAD_SOURCE_DISABLE	(0<<7)
+#define  DREF_SUPERSPREAD_SOURCE_ENABLE		(2<<7)
+#define  DREF_SSC4_DOWNSPREAD			(0<<6)
+#define  DREF_SSC4_CENTERSPREAD			(1<<6)
+#define  DREF_SSC1_DISABLE			(0<<1)
+#define  DREF_SSC1_ENABLE			(1<<1)
+#define  DREF_SSC4_DISABLE			(0)
+#define  DREF_SSC4_ENABLE			(1)
+
+#define PCH_RAWCLK_FREQ		0xc6204
+#define  FDL_TP1_TIMER_SHIFT	12
+#define  FDL_TP1_TIMER_MASK	(3<<12)
+#define  FDL_TP2_TIMER_SHIFT	10
+#define  FDL_TP2_TIMER_MASK	(3<<10)
+#define  RAWCLK_FREQ_MASK	0x3ff
+
+#define PCH_DPLL_TMR_CFG	0xc6208
+
+#define PCH_SSC4_PARMS		0xc6210
+#define PCH_SSC4_AUX_PARMS	0xc6214
+
+/* transcoder */
+
+#define TRANS_HTOTAL_A		0xe0000
+#define  TRANS_HTOTAL_SHIFT	16
+#define  TRANS_HACTIVE_SHIFT	0
+#define TRANS_HBLANK_A		0xe0004
+#define  TRANS_HBLANK_END_SHIFT	16
+#define  TRANS_HBLANK_START_SHIFT 0
+#define TRANS_HSYNC_A		0xe0008
+#define  TRANS_HSYNC_END_SHIFT	16
+#define  TRANS_HSYNC_START_SHIFT 0
+#define TRANS_VTOTAL_A		0xe000c
+#define  TRANS_VTOTAL_SHIFT	16
+#define  TRANS_VACTIVE_SHIFT	0
+#define TRANS_VBLANK_A		0xe0010
+#define  TRANS_VBLANK_END_SHIFT	16
+#define  TRANS_VBLANK_START_SHIFT 0
+#define TRANS_VSYNC_A		0xe0014
+#define  TRANS_VSYNC_END_SHIFT	16
+#define  TRANS_VSYNC_START_SHIFT 0
+
+#define TRANSA_DATA_M1		0xe0030
+#define TRANSA_DATA_N1		0xe0034
+#define TRANSA_DATA_M2		0xe0038
+#define TRANSA_DATA_N2		0xe003c
+#define TRANSA_DP_LINK_M1	0xe0040
+#define TRANSA_DP_LINK_N1	0xe0044
+#define TRANSA_DP_LINK_M2	0xe0048
+#define TRANSA_DP_LINK_N2	0xe004c
+
+#define TRANS_HTOTAL_B		0xe1000
+#define TRANS_HBLANK_B		0xe1004
+#define TRANS_HSYNC_B		0xe1008
+#define TRANS_VTOTAL_B		0xe100c
+#define TRANS_VBLANK_B		0xe1010
+#define TRANS_VSYNC_B		0xe1014
+
+#define TRANSB_DATA_M1		0xe1030
+#define TRANSB_DATA_N1		0xe1034
+#define TRANSB_DATA_M2		0xe1038
+#define TRANSB_DATA_N2		0xe103c
+#define TRANSB_DP_LINK_M1	0xe1040
+#define TRANSB_DP_LINK_N1	0xe1044
+#define TRANSB_DP_LINK_M2	0xe1048
+#define TRANSB_DP_LINK_N2	0xe104c
+
+#define TRANSACONF		0xf0008
+#define TRANSBCONF		0xf1008
+#define  TRANS_DISABLE		(0<<31)
+#define  TRANS_ENABLE		(1<<31)
+#define  TRANS_STATE_MASK	(1<<30)
+#define  TRANS_STATE_DISABLE	(0<<30)
+#define  TRANS_STATE_ENABLE	(1<<30)
+#define  TRANS_FSYNC_DELAY_HB1	(0<<27)
+#define  TRANS_FSYNC_DELAY_HB2	(1<<27)
+#define  TRANS_FSYNC_DELAY_HB3	(2<<27)
+#define  TRANS_FSYNC_DELAY_HB4	(3<<27)
+#define  TRANS_DP_AUDIO_ONLY	(1<<26)
+#define  TRANS_DP_VIDEO_AUDIO	(0<<26)
+#define  TRANS_PROGRESSIVE	(0<<21)
+#define  TRANS_8BPC		(0<<5)
+#define  TRANS_10BPC		(1<<5)
+#define  TRANS_6BPC		(2<<5)
+#define  TRANS_12BPC		(3<<5)
+
+#define FDI_RXA_CHICKEN		0xc200c
+#define FDI_RXB_CHICKEN		0xc2010
+#define  FDI_RX_PHASE_SYNC_POINTER_ENABLE	(1)
+
+/* CPU: FDI_TX */
+#define FDI_TXA_CTL		0x60100
+#define FDI_TXB_CTL		0x61100
+#define  FDI_TX_DISABLE		(0<<31)
+#define  FDI_TX_ENABLE		(1<<31)
+#define  FDI_LINK_TRAIN_PATTERN_1	(0<<28)
+#define  FDI_LINK_TRAIN_PATTERN_2	(1<<28)
+#define  FDI_LINK_TRAIN_PATTERN_IDLE	(2<<28)
+#define  FDI_LINK_TRAIN_NONE		(3<<28)
+#define  FDI_LINK_TRAIN_VOLTAGE_0_4V	(0<<25)
+#define  FDI_LINK_TRAIN_VOLTAGE_0_6V	(1<<25)
+#define  FDI_LINK_TRAIN_VOLTAGE_0_8V	(2<<25)
+#define  FDI_LINK_TRAIN_VOLTAGE_1_2V	(3<<25)
+#define  FDI_LINK_TRAIN_PRE_EMPHASIS_NONE (0<<22)
+#define  FDI_LINK_TRAIN_PRE_EMPHASIS_1_5X (1<<22)
+#define  FDI_LINK_TRAIN_PRE_EMPHASIS_2X	  (2<<22)
+#define  FDI_LINK_TRAIN_PRE_EMPHASIS_3X	  (3<<22)
+#define  FDI_DP_PORT_WIDTH_X1		(0<<19)
+#define  FDI_DP_PORT_WIDTH_X2		(1<<19)
+#define  FDI_DP_PORT_WIDTH_X3		(2<<19)
+#define  FDI_DP_PORT_WIDTH_X4		(3<<19)
+#define	 FDI_DP_PORT_WIDTH_MASK		(7<<19)
+#define  FDI_TX_ENHANCE_FRAME_ENABLE	(1<<18)
+/* IGDNG: hardwired to 1 */
+#define  FDI_TX_PLL_ENABLE		(1<<14)
+/* both Tx and Rx */
+#define  FDI_SCRAMBLING_ENABLE		(0<<7)
+#define  FDI_SCRAMBLING_DISABLE		(1<<7)
+
+/* FDI_RX, FDI_X is hard-wired to Transcoder_X */
+#define FDI_RXA_CTL		0xf000c
+#define FDI_RXB_CTL		0xf100c
+#define  FDI_RX_ENABLE		(1<<31)
+#define  FDI_RX_DISABLE		(0<<31)
+/* train, dp width same as FDI_TX */
+#define  FDI_DP_PORT_WIDTH_X8		(7<<19)
+#define  FDI_8BPC			(0<<16)
+#define  FDI_10BPC			(1<<16)
+#define  FDI_6BPC			(2<<16)
+#define  FDI_12BPC			(3<<16)
+#define  FDI_BPC_MASK			(3<<16)
+#define  FDI_LINK_REVERSE_OVERWRITE	(1<<15)
+#define  FDI_DMI_LINK_REVERSE_MASK	(1<<14)
+#define  FDI_RX_PLL_ENABLE		(1<<13)
+#define  FDI_FS_ERR_CORRECT_ENABLE	(1<<11)
+#define  FDI_FE_ERR_CORRECT_ENABLE	(1<<10)
+#define  FDI_FS_ERR_REPORT_ENABLE	(1<<9)
+#define  FDI_FE_ERR_REPORT_ENABLE	(1<<8)
+#define  FDI_RX_ENHANCE_FRAME_ENABLE	(1<<6)
+#define  FDI_SEL_RAWCLK			(0<<4)
+#define  FDI_SEL_PCDCLK			(1<<4)
+
+#define FDI_RXA_MISC		0xf0010
+#define FDI_RXB_MISC		0xf1010
+#define FDI_RXA_TUSIZE1		0xf0030
+#define FDI_RXA_TUSIZE2		0xf0038
+#define FDI_RXB_TUSIZE1		0xf1030
+#define FDI_RXB_TUSIZE2		0xf1038
+
+/* FDI_RX interrupt register format */
+#define FDI_RX_INTER_LANE_ALIGN		(1<<10)
+#define FDI_RX_SYMBOL_LOCK		(1<<9) /* train 2 */
+#define FDI_RX_BIT_LOCK			(1<<8) /* train 1 */
+#define FDI_RX_TRAIN_PATTERN_2_FAIL	(1<<7)
+#define FDI_RX_FS_CODE_ERR		(1<<6)
+#define FDI_RX_FE_CODE_ERR		(1<<5)
+#define FDI_RX_SYMBOL_ERR_RATE_ABOVE	(1<<4)
+#define FDI_RX_HDCP_LINK_FAIL		(1<<3)
+#define FDI_RX_PIXEL_FIFO_OVERFLOW	(1<<2)
+#define FDI_RX_CROSS_CLOCK_OVERFLOW	(1<<1)
+#define FDI_RX_SYMBOL_QUEUE_OVERFLOW	(1<<0)
+
+#define FDI_RXA_IIR		0xf0014
+#define FDI_RXA_IMR		0xf0018
+#define FDI_RXB_IIR		0xf1014
+#define FDI_RXB_IMR		0xf1018
+
+#define FDI_PLL_CTL_1		0xfe000
+#define FDI_PLL_CTL_2		0xfe004
+
+/* CRT */
+#define PCH_ADPA		0xe1100
+#define  ADPA_TRANS_SELECT_MASK	(1<<30)
+#define  ADPA_TRANS_A_SELECT	0
+#define  ADPA_TRANS_B_SELECT	(1<<30)
+/* HPD is here */
+#define  ADPA_CRT_HOTPLUG_MASK	0x03ff0000 /* bit 25-16 */
+#define	 ADPA_CRT_HOTPLUG_MONITOR_NONE	(0<<24)
+#define  ADPA_CRT_HOTPLUG_MONITOR_MASK	(3<<24)
+#define  ADPA_CRT_HOTPLUG_MONITOR_COLOR	(3<<24)
+#define  ADPA_CRT_HOTPLUG_MONITOR_MONO	(2<<24)
+#define  ADPA_CRT_HOTPLUG_ENABLE	(1<<23)
+#define  ADPA_CRT_HOTPLUG_PERIOD_64	(0<<22)
+#define  ADPA_CRT_HOTPLUG_PERIOD_128	(1<<22)
+#define  ADPA_CRT_HOTPLUG_WARMUP_5MS	(0<<21)
+#define  ADPA_CRT_HOTPLUG_WARMUP_10MS	(1<<21)
+#define  ADPA_CRT_HOTPLUG_SAMPLE_2S	(0<<20)
+#define  ADPA_CRT_HOTPLUG_SAMPLE_4S	(1<<20)
+#define  ADPA_CRT_HOTPLUG_VOLTAGE_40	(0<<18)
+#define  ADPA_CRT_HOTPLUG_VOLTAGE_50	(1<<18)
+#define  ADPA_CRT_HOTPLUG_VOLTAGE_60	(2<<18)
+#define  ADPA_CRT_HOTPLUG_VOLTAGE_70	(3<<18)
+#define  ADPA_CRT_HOTPLUG_VOLREF_325MV	(0<<17)
+#define  ADPA_CRT_HOTPLUG_VOLREF_475MV	(1<<17)
+#define  ADPA_CRT_HOTPLUG_FORCE_TRIGGER	(1<<16)
+/* polarity control not changed */
+
+/* or SDVOB */
+#define HDMIB	0xe1140
+#define  PORT_ENABLE	(1 << 31)
+#define  TRANSCODER_A	(0)
+#define  TRANSCODER_B	(1 << 30)
+#define  COLOR_FORMAT_8bpc	(0)
+#define  COLOR_FORMAT_12bpc	(3 << 26)
+#define  SDVOB_HOTPLUG_ENABLE	(1 << 23)
+#define  SDVO_ENCODING		(0)
+#define  TMDS_ENCODING		(2 << 10)
+#define  NULL_PACKET_VSYNC_ENABLE	(1 << 9)
+#define  SDVOB_BORDER_ENABLE	(1 << 7)
+#define  AUDIO_ENABLE		(1 << 6)
+#define  VSYNC_ACTIVE_HIGH	(1 << 4)
+#define  HSYNC_ACTIVE_HIGH	(1 << 3)
+#define  PORT_DETECTED		(1 << 2)
+
+#define HDMIC	0xe1150
+#define HDMID	0xe1160
+#define PCH_LVDS		0xe1180
+#define   LVDS_DETECTED (1 << 1)
+
+#define PCH_DP_B 0xe4100
+#define PCH_DP_C 0xe4200
+#define PCH_DP_D 0xe4200
+
+#define BLC_PWM_CPU_CTL2	0x48250
+#define  PWM_ENABLE		(1 << 31)
+#define  PWM_PIPE_A		(0 << 29)
+#define  PWM_PIPE_B		(1 << 29)
+#define BLC_PWM_CPU_CTL		0x48254
+
+#define BLC_PWM_PCH_CTL1	0xc8250
+#define  PWM_PCH_ENABLE		(1 << 31)
+#define  PWM_POLARITY_ACTIVE_LOW	(1 << 29)
+#define  PWM_POLARITY_ACTIVE_HIGH	(0 << 29)
+#define  PWM_POLARITY_ACTIVE_LOW2	(1 << 28)
+#define  PWM_POLARITY_ACTIVE_HIGH2	(0 << 28)
+
+#define BLC_PWM_PCH_CTL2	0xc8254
+
+#define PCH_PP_STATUS		0xc7200
+#define PCH_PP_CONTROL		0xc7204
+#define  EDP_FORCE_VDD		(1 << 3)
+#define  EDP_BLC_ENABLE		(1 << 2)
+#define  PANEL_POWER_RESET	(1 << 1)
+#define  PANEL_POWER_OFF	(0 << 0)
+#define  PANEL_POWER_ON		(1 << 0)
+#define PCH_PP_ON_DELAYS	0xc7208
+#define  EDP_PANEL		(1 << 30)
+#define PCH_PP_OFF_DELAYS	0xc720c
+#define PCH_PP_DIVISOR		0xc7210
+
+#define DE_POWER1		0x42400
+#define WM0_PIPE_A		0x45100
+#define WM0_PIPE_B		0x45104
+#define WM1			0x45108
+#define WM2			0x4510C
+#define WM3			0x45110
+#define WM1S			0x45120
+
+
+
+#define AUD_CONFIG              0x62000
+#define AUD_DEBUG               0x62010
+#define AUD_VID_DID             0x62020
+#define AUD_RID                 0x62024
+#define AUD_SUBN_CNT            0x62028
+#define AUD_FUNC_GRP            0x62040
+#define AUD_SUBN_CNT2           0x62044
+#define AUD_GRP_CAP             0x62048
+#define AUD_PWRST               0x6204c
+#define AUD_SUPPWR              0x62050
+#define AUD_SID                 0x62054
+#define AUD_OUT_CWCAP           0x62070
+#define AUD_OUT_PCMSIZE         0x62074
+#define AUD_OUT_STR             0x62078
+#define AUD_OUT_DIG_CNVT        0x6207c
+#define AUD_OUT_CH_STR          0x62080
+#define AUD_OUT_STR_DESC        0x62084
+#define AUD_PINW_CAP            0x620a0
+#define AUD_PIN_CAP             0x620a4
+#define AUD_PINW_CONNLNG        0x620a8
+#define AUD_PINW_CONNLST        0x620ac
+#define AUD_PINW_CNTR           0x620b0
+#define AUD_PINW_UNSOLRESP      0x620b8
+#define AUD_CNTL_ST             0x620b4
+#define AUD_PINW_CONFIG         0x620bc
+#define AUD_HDMIW_STATUS        0x620d4
+#define AUD_HDMIW_HDMIEDID      0x6210c
+#define AUD_HDMIW_INFOFR        0x62118
+#define AUD_CONV_CHCNT          0x62120
+#define AUD_CTS_ENABLE          0x62128
+
+#define VIDEO_DIP_CTL           0x61170
+
 #endif /* _I810_REG_H */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c	2010-11-23 09:53:04.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c	2011-02-08 11:14:00.000000000 +0100
@@ -23,7 +23,6 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CO
 THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_video.c,v 1.26 2003/11/10 18:22:22 tsi Exp $ */
 
 /*
  * i810_video.c: i810 Xv driver. Based on the mga Xv driver by Mark Vojkovich.
@@ -175,7 +174,7 @@ void I810InitVideo(ScreenPtr pScreen)
 	    adaptors = &newAdaptor;
 	} else {
 	    newAdaptors =  /* need to free this someplace */
-		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+		malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
 	    if(newAdaptors) {
 		memcpy(newAdaptors, adaptors, num_adaptors * 
 					sizeof(XF86VideoAdaptorPtr));
@@ -190,7 +189,7 @@ void I810InitVideo(ScreenPtr pScreen)
         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
 
     if(newAdaptors)
-	xfree(newAdaptors);
+	free(newAdaptors);
 }
 
 /* *INDENT-OFF* */
@@ -384,7 +383,7 @@ I810SetupImageVideo(ScreenPtr pScreen)
     XF86VideoAdaptorPtr adapt;
     I810PortPrivPtr pPriv;
 
-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
 			    sizeof(I810PortPrivRec) +
 			    sizeof(DevUnion))))
 	return NULL;
@@ -1086,7 +1085,7 @@ I810PutImage(
     if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
 	REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 	/* draw these */
-	xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);
+	xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
     }
 
     I810DisplayVideo(pScrn, id, width, height, dstPitch, 
@@ -1226,18 +1225,18 @@ I810AllocateSurface(
     surface->width = w;
     surface->height = h;
 
-    if(!(surface->pitches = xalloc(sizeof(int)))) {
+    if(!(surface->pitches = malloc(sizeof(int)))) {
 	xf86FreeOffscreenLinear(linear);
 	return BadAlloc;
     }
-    if(!(surface->offsets = xalloc(sizeof(int)))) {
-	xfree(surface->pitches);
+    if(!(surface->offsets = malloc(sizeof(int)))) {
+	free(surface->pitches);
 	xf86FreeOffscreenLinear(linear);
 	return BadAlloc;
     }
-    if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
-	xfree(surface->pitches);
-	xfree(surface->offsets);
+    if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
+	free(surface->pitches);
+	free(surface->offsets);
 	xf86FreeOffscreenLinear(linear);
 	return BadAlloc;
     }
@@ -1287,9 +1286,9 @@ I810FreeSurface(
 	I810StopSurface(surface);
     }
     xf86FreeOffscreenLinear(pPriv->linear);
-    xfree(surface->pitches);
-    xfree(surface->offsets);
-    xfree(surface->devPrivate.ptr);
+    free(surface->pitches);
+    free(surface->offsets);
+    free(surface->devPrivate.ptr);
 
     return Success;
 }
@@ -1402,7 +1401,7 @@ I810InitOffscreenImages(ScreenPtr pScree
     XF86OffscreenImagePtr offscreenImages;
 
     /* need to free this someplace */
-    if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) {
+    if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec)))) {
       return;
     }
 
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i810_wmark.c new/xsrc/external/mit/xf86-video-intel/dist/src/i810_wmark.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i810_wmark.c	2008-08-02 07:12:43.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i810_wmark.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,4 +1,3 @@
-
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -25,20 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_wmark.c,v 1.7 2002/09/11 00:29:32 dawes Exp $ */
-
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
 
 /*
  * Authors:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_3d.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_3d.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_3d.c	2008-08-02 07:12:44.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_3d.c	2011-02-08 11:14:00.000000000 +0100
@@ -34,219 +34,192 @@
 
 #include "i830_reg.h"
 
-void I830EmitInvarientState( ScrnInfoPtr pScrn )
+void I830EmitInvarientState(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   BEGIN_BATCH(58);
+	assert(intel->in_batch_atomic);
 
-   OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(0));
-   OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(1));
-   OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(2));
-   OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(3));
-
-   OUT_BATCH(_3DSTATE_DFLT_DIFFUSE_CMD);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_DFLT_SPEC_CMD);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_DFLT_Z_CMD);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_FOG_MODE_CMD);
-   OUT_BATCH(FOGFUNC_ENABLE |
-	     FOG_LINEAR_CONST | 
-	     FOGSRC_INDEX_Z | 
-	     ENABLE_FOG_DENSITY);
-   OUT_BATCH(0);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
-	     MAP_UNIT(0) |
-	     DISABLE_TEX_STREAM_BUMP |
-	     ENABLE_TEX_STREAM_COORD_SET |
-	     TEX_STREAM_COORD_SET(0) |
-	     ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(0));
-   OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
-	     MAP_UNIT(1) |
-	     DISABLE_TEX_STREAM_BUMP |
-	     ENABLE_TEX_STREAM_COORD_SET |
-	     TEX_STREAM_COORD_SET(1) |
-	     ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(1));
-   OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
-	     MAP_UNIT(2) |
-	     DISABLE_TEX_STREAM_BUMP |
-	     ENABLE_TEX_STREAM_COORD_SET |
-	     TEX_STREAM_COORD_SET(2) |
-	     ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(2));
-   OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
-	     MAP_UNIT(3) |
-	     DISABLE_TEX_STREAM_BUMP |
-	     ENABLE_TEX_STREAM_COORD_SET |
-	     TEX_STREAM_COORD_SET(3) |
-	     ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(3));
-
-   OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
-   OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(0));
-   OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
-   OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(1));
-   OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
-   OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(2));
-   OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
-   OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(3));
-
-   OUT_BATCH(_3DSTATE_RASTER_RULES_CMD |
-	     ENABLE_POINT_RASTER_RULE |
-	     OGL_POINT_RASTER_RULE |
-	     ENABLE_LINE_STRIP_PROVOKE_VRTX |
-	     ENABLE_TRI_FAN_PROVOKE_VRTX |
-	     ENABLE_TRI_STRIP_PROVOKE_VRTX |
-	     LINE_STRIP_PROVOKE_VRTX(1) |
-	     TRI_FAN_PROVOKE_VRTX(2) | 
-	     TRI_STRIP_PROVOKE_VRTX(2));
-
-   OUT_BATCH(_3DSTATE_SCISSOR_ENABLE_CMD |
-	     DISABLE_SCISSOR_RECT);
-
-   OUT_BATCH(_3DSTATE_SCISSOR_RECT_0_CMD);
-   OUT_BATCH(0);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_VERTEX_TRANSFORM);
-   OUT_BATCH(DISABLE_VIEWPORT_TRANSFORM | DISABLE_PERSPECTIVE_DIVIDE);
-
-   OUT_BATCH(_3DSTATE_W_STATE_CMD);
-   OUT_BATCH(MAGIC_W_STATE_DWORD1);
-   OUT_BATCH(0x3f800000 /* 1.0 in IEEE float */ );
-
-   OUT_BATCH(_3DSTATE_COLOR_FACTOR_CMD);
-   OUT_BATCH(0x80808080);	/* .5 required in alpha for GL_DOT3_RGBA_EXT */
-
-   OUT_BATCH(_3DSTATE_MAP_COORD_SETBIND_CMD);
-   OUT_BATCH(TEXBIND_SET3(TEXCOORDSRC_VTXSET_3) |
-	     TEXBIND_SET2(TEXCOORDSRC_VTXSET_2) |
-	     TEXBIND_SET1(TEXCOORDSRC_VTXSET_1) |
-	     TEXBIND_SET0(TEXCOORDSRC_VTXSET_0));
-
-   /* copy from mesa */
-   OUT_BATCH(_3DSTATE_INDPT_ALPHA_BLEND_CMD |
-	     DISABLE_INDPT_ALPHA_BLEND |
-	     ENABLE_ALPHA_BLENDFUNC |
-	     ABLENDFUNC_ADD);
-
-   OUT_BATCH(_3DSTATE_FOG_COLOR_CMD |
-	     FOG_COLOR_RED(0) |
-	     FOG_COLOR_GREEN(0) |
-	     FOG_COLOR_BLUE(0));
-
-   OUT_BATCH(_3DSTATE_CONST_BLEND_COLOR_CMD);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_MODES_1_CMD |
-	     ENABLE_COLR_BLND_FUNC |
-	     BLENDFUNC_ADD |
-	     ENABLE_SRC_BLND_FACTOR |
-	     SRC_BLND_FACT(BLENDFACTOR_ONE) |
-	     ENABLE_DST_BLND_FACTOR |
-	     DST_BLND_FACT(BLENDFACTOR_ZERO));
-   OUT_BATCH(_3DSTATE_MODES_2_CMD |
-	     ENABLE_GLOBAL_DEPTH_BIAS |
-	     GLOBAL_DEPTH_BIAS(0) |
-	     ENABLE_ALPHA_TEST_FUNC|
-	     ALPHA_TEST_FUNC(0) | /* always */
-	     ALPHA_REF_VALUE(0));
-   OUT_BATCH(_3DSTATE_MODES_3_CMD |
-	     ENABLE_DEPTH_TEST_FUNC |
-	     DEPTH_TEST_FUNC(0x2) | /* COMPAREFUNC_LESS */
-	     ENABLE_ALPHA_SHADE_MODE |
-	     ALPHA_SHADE_MODE(SHADE_MODE_LINEAR) |
-	     ENABLE_FOG_SHADE_MODE |
-	     FOG_SHADE_MODE(SHADE_MODE_LINEAR) |
-	     ENABLE_SPEC_SHADE_MODE |
-	     SPEC_SHADE_MODE(SHADE_MODE_LINEAR) |
-	     ENABLE_COLOR_SHADE_MODE |
-	     COLOR_SHADE_MODE(SHADE_MODE_LINEAR) |
-	     ENABLE_CULL_MODE | CULLMODE_NONE);
-
-   OUT_BATCH(_3DSTATE_MODES_4_CMD |
-	     ENABLE_LOGIC_OP_FUNC |
-	     LOGIC_OP_FUNC(LOGICOP_COPY) |
-	     ENABLE_STENCIL_TEST_MASK |
-	     STENCIL_TEST_MASK(0xff) |
-	     ENABLE_STENCIL_WRITE_MASK |
-	     STENCIL_WRITE_MASK(0xff));
-
-   OUT_BATCH(_3DSTATE_STENCIL_TEST_CMD |
-	     ENABLE_STENCIL_PARMS |
-	     STENCIL_FAIL_OP(0) | /* STENCILOP_KEEP */
-	     STENCIL_PASS_DEPTH_FAIL_OP(0) | /* STENCILOP_KEEP */
-	     STENCIL_PASS_DEPTH_PASS_OP(0) | /* STENCILOP_KEEP */
-	     ENABLE_STENCIL_TEST_FUNC |
-	     STENCIL_TEST_FUNC(0) | /* COMPAREFUNC_ALWAYS */
-	     ENABLE_STENCIL_REF_VALUE |
-	     STENCIL_REF_VALUE(0));
-
-   OUT_BATCH(_3DSTATE_MODES_5_CMD |
-	     FLUSH_TEXTURE_CACHE |
-	     ENABLE_SPRITE_POINT_TEX |
-	     SPRITE_POINT_TEX_OFF |
-	     ENABLE_FIXED_LINE_WIDTH |
-	     FIXED_LINE_WIDTH(0x2) |       /* 1.0 */
-	     ENABLE_FIXED_POINT_WIDTH |
-	     FIXED_POINT_WIDTH(1));
-
-   OUT_BATCH(_3DSTATE_ENABLES_1_CMD |
-	     DISABLE_LOGIC_OP |
-	     DISABLE_STENCIL_TEST |
-	     DISABLE_DEPTH_BIAS |
-	     DISABLE_SPEC_ADD |
-	     DISABLE_FOG |
-	     DISABLE_ALPHA_TEST |
-	     ENABLE_COLOR_BLEND |
-	     DISABLE_DEPTH_TEST);
-   OUT_BATCH(_3DSTATE_ENABLES_2_CMD |
-	     DISABLE_STENCIL_WRITE |
-	     ENABLE_TEX_CACHE |
-	     DISABLE_DITHER |
-	     ENABLE_COLOR_MASK |
-	     ENABLE_COLOR_WRITE |
-	     DISABLE_DEPTH_WRITE);
-
-   OUT_BATCH(_3DSTATE_STIPPLE);
-
-   /* Set default blend state */
-   OUT_BATCH(_3DSTATE_MAP_BLEND_OP_CMD(0) |
-	     TEXPIPE_COLOR |
-	     ENABLE_TEXOUTPUT_WRT_SEL |
-	     TEXOP_OUTPUT_CURRENT |
-	     DISABLE_TEX_CNTRL_STAGE |
-	     TEXOP_SCALE_1X |
-	     TEXOP_MODIFY_PARMS |
-	     TEXOP_LAST_STAGE | TEXBLENDOP_ARG1);
-   OUT_BATCH(_3DSTATE_MAP_BLEND_OP_CMD(0) |
-	     TEXPIPE_ALPHA |
-	     ENABLE_TEXOUTPUT_WRT_SEL |
-	     TEXOP_OUTPUT_CURRENT |
-	     TEXOP_SCALE_1X |
-	     TEXOP_MODIFY_PARMS | TEXBLENDOP_ARG1);
-   OUT_BATCH(_3DSTATE_MAP_BLEND_ARG_CMD(0) |
-	     TEXPIPE_COLOR |
-	     TEXBLEND_ARG1 |
-	     TEXBLENDARG_MODIFY_PARMS |
-	     TEXBLENDARG_DIFFUSE);
-   OUT_BATCH(_3DSTATE_MAP_BLEND_ARG_CMD(0) |
-	     TEXPIPE_ALPHA |
-	     TEXBLEND_ARG1 |
-	     TEXBLENDARG_MODIFY_PARMS |
-	     TEXBLENDARG_DIFFUSE);
-
-   OUT_BATCH(_3DSTATE_AA_CMD |
-	     AA_LINE_ECAAR_WIDTH_ENABLE |
-	     AA_LINE_ECAAR_WIDTH_1_0 |
-	     AA_LINE_REGION_WIDTH_ENABLE |
-	     AA_LINE_REGION_WIDTH_1_0 |
-	     AA_LINE_DISABLE);
-
-   ADVANCE_BATCH();
+	OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(0));
+	OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(1));
+	OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(2));
+	OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(3));
+
+	OUT_BATCH(_3DSTATE_DFLT_DIFFUSE_CMD);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_DFLT_SPEC_CMD);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_DFLT_Z_CMD);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_FOG_MODE_CMD);
+	OUT_BATCH(FOGFUNC_ENABLE |
+		  FOG_LINEAR_CONST | FOGSRC_INDEX_Z | ENABLE_FOG_DENSITY);
+	OUT_BATCH(0);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
+		  MAP_UNIT(0) |
+		  DISABLE_TEX_STREAM_BUMP |
+		  ENABLE_TEX_STREAM_COORD_SET |
+		  TEX_STREAM_COORD_SET(0) |
+		  ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(0));
+	OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
+		  MAP_UNIT(1) |
+		  DISABLE_TEX_STREAM_BUMP |
+		  ENABLE_TEX_STREAM_COORD_SET |
+		  TEX_STREAM_COORD_SET(1) |
+		  ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(1));
+	OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
+		  MAP_UNIT(2) |
+		  DISABLE_TEX_STREAM_BUMP |
+		  ENABLE_TEX_STREAM_COORD_SET |
+		  TEX_STREAM_COORD_SET(2) |
+		  ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(2));
+	OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD |
+		  MAP_UNIT(3) |
+		  DISABLE_TEX_STREAM_BUMP |
+		  ENABLE_TEX_STREAM_COORD_SET |
+		  TEX_STREAM_COORD_SET(3) |
+		  ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(3));
+
+	OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
+	OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(0));
+	OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
+	OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(1));
+	OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
+	OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(2));
+	OUT_BATCH(_3DSTATE_MAP_COORD_TRANSFORM);
+	OUT_BATCH(DISABLE_TEX_TRANSFORM | TEXTURE_SET(3));
+
+	OUT_BATCH(_3DSTATE_RASTER_RULES_CMD |
+		  ENABLE_POINT_RASTER_RULE |
+		  OGL_POINT_RASTER_RULE |
+		  ENABLE_LINE_STRIP_PROVOKE_VRTX |
+		  ENABLE_TRI_FAN_PROVOKE_VRTX |
+		  ENABLE_TRI_STRIP_PROVOKE_VRTX |
+		  LINE_STRIP_PROVOKE_VRTX(1) |
+		  TRI_FAN_PROVOKE_VRTX(2) | TRI_STRIP_PROVOKE_VRTX(2));
+
+	OUT_BATCH(_3DSTATE_SCISSOR_ENABLE_CMD | DISABLE_SCISSOR_RECT);
+
+	OUT_BATCH(_3DSTATE_SCISSOR_RECT_0_CMD);
+	OUT_BATCH(0);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_VERTEX_TRANSFORM);
+	OUT_BATCH(DISABLE_VIEWPORT_TRANSFORM | DISABLE_PERSPECTIVE_DIVIDE);
+
+	OUT_BATCH(_3DSTATE_W_STATE_CMD);
+	OUT_BATCH(MAGIC_W_STATE_DWORD1);
+	OUT_BATCH(0x3f800000 /* 1.0 in IEEE float */ );
+
+	OUT_BATCH(_3DSTATE_COLOR_FACTOR_CMD);
+	OUT_BATCH(0x80808080);	/* .5 required in alpha for GL_DOT3_RGBA_EXT */
+
+	OUT_BATCH(_3DSTATE_MAP_COORD_SETBIND_CMD);
+	OUT_BATCH(TEXBIND_SET3(TEXCOORDSRC_VTXSET_3) |
+		  TEXBIND_SET2(TEXCOORDSRC_VTXSET_2) |
+		  TEXBIND_SET1(TEXCOORDSRC_VTXSET_1) |
+		  TEXBIND_SET0(TEXCOORDSRC_VTXSET_0));
+
+	/* copy from mesa */
+	OUT_BATCH(_3DSTATE_INDPT_ALPHA_BLEND_CMD |
+		  DISABLE_INDPT_ALPHA_BLEND |
+		  ENABLE_ALPHA_BLENDFUNC | ABLENDFUNC_ADD);
+
+	OUT_BATCH(_3DSTATE_FOG_COLOR_CMD |
+		  FOG_COLOR_RED(0) | FOG_COLOR_GREEN(0) | FOG_COLOR_BLUE(0));
+
+	OUT_BATCH(_3DSTATE_CONST_BLEND_COLOR_CMD);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_MODES_1_CMD |
+		  ENABLE_COLR_BLND_FUNC |
+		  BLENDFUNC_ADD |
+		  ENABLE_SRC_BLND_FACTOR |
+		  SRC_BLND_FACT(BLENDFACTOR_ONE) |
+		  ENABLE_DST_BLND_FACTOR | DST_BLND_FACT(BLENDFACTOR_ZERO));
+	OUT_BATCH(_3DSTATE_MODES_2_CMD | ENABLE_GLOBAL_DEPTH_BIAS | GLOBAL_DEPTH_BIAS(0) | ENABLE_ALPHA_TEST_FUNC | ALPHA_TEST_FUNC(0) |	/* always */
+		  ALPHA_REF_VALUE(0));
+	OUT_BATCH(_3DSTATE_MODES_3_CMD |
+		  ENABLE_DEPTH_TEST_FUNC |
+		  DEPTH_TEST_FUNC(0x2) |	/* COMPAREFUNC_LESS */
+		  ENABLE_ALPHA_SHADE_MODE |
+		  ALPHA_SHADE_MODE(SHADE_MODE_LINEAR) |
+		  ENABLE_FOG_SHADE_MODE |
+		  FOG_SHADE_MODE(SHADE_MODE_LINEAR) |
+		  ENABLE_SPEC_SHADE_MODE |
+		  SPEC_SHADE_MODE(SHADE_MODE_LINEAR) |
+		  ENABLE_COLOR_SHADE_MODE |
+		  COLOR_SHADE_MODE(SHADE_MODE_LINEAR) |
+		  ENABLE_CULL_MODE | CULLMODE_NONE);
+
+	OUT_BATCH(_3DSTATE_MODES_4_CMD |
+		  ENABLE_LOGIC_OP_FUNC |
+		  LOGIC_OP_FUNC(LOGICOP_COPY) |
+		  ENABLE_STENCIL_TEST_MASK |
+		  STENCIL_TEST_MASK(0xff) |
+		  ENABLE_STENCIL_WRITE_MASK | STENCIL_WRITE_MASK(0xff));
+
+	OUT_BATCH(_3DSTATE_STENCIL_TEST_CMD |
+		  ENABLE_STENCIL_PARMS |
+		  STENCIL_FAIL_OP(0) |	/* STENCILOP_KEEP */
+		  STENCIL_PASS_DEPTH_FAIL_OP(0) |	/* STENCILOP_KEEP */
+		  STENCIL_PASS_DEPTH_PASS_OP(0) |	/* STENCILOP_KEEP */
+		  ENABLE_STENCIL_TEST_FUNC |
+		  STENCIL_TEST_FUNC(0) |	/* COMPAREFUNC_ALWAYS */
+		  ENABLE_STENCIL_REF_VALUE |
+		  STENCIL_REF_VALUE(0));
+
+	OUT_BATCH(_3DSTATE_MODES_5_CMD |
+		  FLUSH_TEXTURE_CACHE |
+		  ENABLE_SPRITE_POINT_TEX | SPRITE_POINT_TEX_OFF |
+		  ENABLE_FIXED_LINE_WIDTH | FIXED_LINE_WIDTH(0x2) | /* 1.0 */
+		  ENABLE_FIXED_POINT_WIDTH | FIXED_POINT_WIDTH(1));
+
+	OUT_BATCH(_3DSTATE_ENABLES_1_CMD |
+		  DISABLE_LOGIC_OP |
+		  DISABLE_STENCIL_TEST |
+		  DISABLE_DEPTH_BIAS |
+		  DISABLE_SPEC_ADD |
+		  DISABLE_FOG |
+		  DISABLE_ALPHA_TEST | ENABLE_COLOR_BLEND | DISABLE_DEPTH_TEST);
+	OUT_BATCH(_3DSTATE_ENABLES_2_CMD |
+		  DISABLE_STENCIL_WRITE |
+		  ENABLE_TEX_CACHE |
+		  DISABLE_DITHER |
+		  ENABLE_COLOR_MASK | ENABLE_COLOR_WRITE | DISABLE_DEPTH_WRITE);
+
+	OUT_BATCH(_3DSTATE_STIPPLE);
+
+	/* Set default blend state */
+	OUT_BATCH(_3DSTATE_MAP_BLEND_OP_CMD(0) |
+		  TEXPIPE_COLOR |
+		  ENABLE_TEXOUTPUT_WRT_SEL |
+		  TEXOP_OUTPUT_CURRENT |
+		  DISABLE_TEX_CNTRL_STAGE |
+		  TEXOP_SCALE_1X |
+		  TEXOP_MODIFY_PARMS | TEXOP_LAST_STAGE | TEXBLENDOP_ARG1);
+	OUT_BATCH(_3DSTATE_MAP_BLEND_OP_CMD(0) |
+		  TEXPIPE_ALPHA |
+		  ENABLE_TEXOUTPUT_WRT_SEL |
+		  TEXOP_OUTPUT_CURRENT |
+		  TEXOP_SCALE_1X | TEXOP_MODIFY_PARMS | TEXBLENDOP_ARG1);
+	OUT_BATCH(_3DSTATE_MAP_BLEND_ARG_CMD(0) |
+		  TEXPIPE_COLOR |
+		  TEXBLEND_ARG1 |
+		  TEXBLENDARG_MODIFY_PARMS | TEXBLENDARG_DIFFUSE);
+	OUT_BATCH(_3DSTATE_MAP_BLEND_ARG_CMD(0) |
+		  TEXPIPE_ALPHA |
+		  TEXBLEND_ARG1 |
+		  TEXBLENDARG_MODIFY_PARMS | TEXBLENDARG_DIFFUSE);
+
+	OUT_BATCH(_3DSTATE_AA_CMD |
+		  AA_LINE_ECAAR_WIDTH_ENABLE |
+		  AA_LINE_ECAAR_WIDTH_1_0 |
+		  AA_LINE_REGION_WIDTH_ENABLE |
+		  AA_LINE_REGION_WIDTH_1_0 | AA_LINE_DISABLE);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_accel.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_accel.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_accel.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_accel.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,12 +1,3 @@
-/*
- * XXX So far, for GXxor this is about 40% of the speed of SW, but CPU
- * utilisation falls from 95% to < 5%.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -33,327 +24,102 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_accel.c,v 1.8 2003/04/24 18:00:24 eich Exp $ */
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
+ * Authors:
+ *   Keith Whitwell <keith@tungstengraphics.com>
  *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
  */
 
 /*
- * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
- *
+ * XXX So far, for GXxor this is about 40% of the speed of SW, but CPU
+ * utilisation falls from 95% to < 5%.
  */
 
-#include <errno.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
-#include "xaarop.h"
 #include "i830.h"
 #include "i810_reg.h"
-#include "i830_debug.h"
 #include "i830_ring.h"
 #include "i915_drm.h"
 
-unsigned long
-intel_get_pixmap_offset(PixmapPtr pPix)
-{
-#if defined(I830_USE_EXA) || defined(I830_USE_UXA)
-    ScreenPtr pScreen = pPix->drawable.pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    if (pI830->accel == ACCEL_EXA)
-	return exaGetPixmapOffset(pPix);
-#endif
-    return (unsigned long)pPix->devPrivate.ptr - (unsigned long)pI830->FbBase;
-}
-
-unsigned long
-intel_get_pixmap_pitch(PixmapPtr pPix)
-{
-#ifdef I830_USE_EXA
-    ScreenPtr pScreen = pPix->drawable.pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    if (pI830->accel == ACCEL_EXA)
-	return exaGetPixmapPitch(pPix);
-#endif
-    return (unsigned long)pPix->devKind;
-}
-
-int
-I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
+unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-   I830RingBuffer *ring = &pI830->ring;
-   int iters = 0;
-   unsigned int start = 0;
-   unsigned int now = 0;
-   int last_head = 0;
-   unsigned int first = 0;
-
-   /* If your system hasn't moved the head pointer in 2 seconds, I'm going to
-    * call it crashed.
-    */
-   if (timeout_millis == 0)
-      timeout_millis = 2000;
-
-   if (I810_DEBUG & DEBUG_VERBOSE_ACCEL) {
-      ErrorF("I830WaitLpRing %d\n", n);
-      first = GetTimeInMillis();
-   }
-
-   while (ring->space < n) {
-      ring->head = INREG(LP_RING + RING_HEAD) & I830_HEAD_MASK;
-      ring->space = ring->head - (ring->tail + 8);
-
-      if (ring->space < 0)
-	 ring->space += ring->mem->size;
-
-      iters++;
-      now = GetTimeInMillis();
-      if (start == 0 || now < start || ring->head != last_head) {
-	 if (I810_DEBUG & DEBUG_VERBOSE_ACCEL)
-	    if (now > start)
-	       ErrorF("space: %d wanted %d\n", ring->space, n);
-	 start = now;
-	 last_head = ring->head;
-      } else if (now - start > timeout_millis) {
-	 ErrorF("Error in I830WaitLpRing(), timeout for %d seconds\n",
-		timeout_millis/1000);
-	 if (IS_I965G(pI830))
-	     i965_dump_error_state(pScrn);
-	 else
-	     i830_dump_error_state(pScrn);
-	 ErrorF("space: %d wanted %d\n", ring->space, n);
-#ifdef XF86DRI
-	 if (pI830->directRenderingType == DRI_XF86DRI) {
-	    DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
-	    DRICloseScreen(screenInfo.screens[pScrn->scrnIndex]);
-	 }
-#endif
-#ifdef I830_USE_XAA
-	 pI830->AccelInfoRec = NULL;	/* Stops recursive behavior */
-#endif
-#ifdef I830_USE_EXA
-	 pI830->EXADriverPtr = NULL;
-#endif
-#ifdef I830_USE_UXA
-	pI830->uxa_driver = NULL;
-#endif
-	 FatalError("lockup\n");
-      }
-
-      DELAY(10);
-   }
-
-   if (I810_DEBUG & DEBUG_VERBOSE_ACCEL) {
-      now = GetTimeInMillis();
-      if (now - first) {
-	 ErrorF("Elapsed %u ms\n", now - first);
-	 ErrorF("space: %d wanted %d\n", ring->space, n);
-      }
-   }
-
-   return iters;
+	return (unsigned long)pixmap->devKind;
 }
 
-void
-I830Sync(ScrnInfoPtr pScrn)
+void i830_debug_flush(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
-      ErrorF("I830Sync\n");
-
-   if (pI830->accel == ACCEL_NONE)
-       return;
-
-#ifdef XF86DRI
-   /* VT switching tries to do this.
-    */
-   if (!pI830->LockHeld && pI830->directRenderingType == DRI_XF86DRI) {
-      return;
-   }
-#endif
-
-   I830EmitFlush(pScrn);
-
-   intel_batch_flush(pScrn, TRUE);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   if (pI830->directRenderingType > DRI_NONE) {
-       struct drm_i915_irq_emit emit;
-       struct drm_i915_irq_wait wait;
-       int ret;
-
-       /* Most of the uses of I830Sync while using GEM should actually be
-	* using set_domain on a specific buffer.  We're not there yet, so fake
-	* it up using irq_emit/wait.  It's still better than spinning on
-	* register reads for idle.
-	*/
-       emit.irq_seq = &wait.irq_seq;
-       ret = drmCommandWriteRead(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
-			    sizeof(emit));
-       if (ret != 0)
-	   FatalError("Failure to emit IRQ: %s\n", strerror(-ret));
-
-       do {
-	   ret = drmCommandWrite(pI830->drmSubFD, DRM_I830_IRQ_WAIT, &wait,
-				 sizeof(wait));
-       } while (ret == -EINTR);
-
-       if (ret != 0)
-	   FatalError("Failure to wait for IRQ: %s\n", strerror(-ret));
-
-       if (!pI830->memory_manager)
-	   i830_refresh_ring(pScrn);
-   } else if (!pI830->use_drm_mode) {
-       i830_wait_ring_idle(pScrn);
-   }
+	if (intel->debug_flush & DEBUG_FLUSH_CACHES)
+		intel_batch_emit_flush(scrn);
 
-   pI830->nextColorExpandBuf = 0;
-}
-
-void
-I830EmitFlush(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   int flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
-
-   if (IS_I965G(pI830))
-      flags = 0;
-
-   {
-       BEGIN_BATCH(1);
-       OUT_BATCH(MI_FLUSH | flags);
-       ADVANCE_BATCH();
-   }
-}
-
-Bool
-I830SelectBuffer(ScrnInfoPtr pScrn, int buffer)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   switch (buffer) {
-#ifdef XF86DRI
-   case I830_SELECT_BACK:
-      pI830->bufferOffset = pI830->back_buffer->offset;
-      if (pI830->back_buffer->tiling == TILE_YMAJOR)
-	 return FALSE;
-      break;
-   case I830_SELECT_DEPTH:
-      pI830->bufferOffset = pI830->depth_buffer->offset;
-      if (pI830->depth_buffer->tiling == TILE_YMAJOR)
-	 return FALSE;
-      break;
-#endif
-   default:
-   case I830_SELECT_FRONT:
-      pI830->bufferOffset = pScrn->fbOffset;
-      break;
-   }
-
-   if (I810_DEBUG & DEBUG_VERBOSE_ACCEL)
-      ErrorF("I830SelectBuffer %d --> offset %x\n",
-	     buffer, pI830->bufferOffset);
-   return TRUE;
+	if (intel->debug_flush & DEBUG_FLUSH_BATCHES)
+		intel_batch_submit(scrn, FALSE);
 }
 
 /* The following function sets up the supported acceleration. Call it
  * from the FbInit() function in the SVGA driver, or before ScreenInit
  * in a monolithic server.
  */
-Bool
-I830AccelInit(ScreenPtr pScreen)
+Bool I830AccelInit(ScreenPtr screen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    /* Limits are described in the BLT engine chapter under Graphics Data Size
-     * Limitations, and the descriptions of SURFACE_STATE, 3DSTATE_BUFFER_INFO,
-     * 3DSTATE_DRAWING_RECTANGLE, 3DSTATE_MAP_INFO, and 3DSTATE_MAP_INFO.
-     *
-     * i845 through i965 limits 2D rendering to 65536 lines and pitch of 32768.
-     *
-     * i965 limits 3D surface to (2*element size)-aligned offset if un-tiled.
-     * i965 limits 3D surface to 4kB-aligned offset if tiled.
-     * i965 limits 3D surfaces to w,h of ?,8192.
-     * i965 limits 3D surface to pitch of 1B - 128kB.
-     * i965 limits 3D surface pitch alignment to 1 or 2 times the element size.
-     * i965 limits 3D surface pitch alignment to 512B if tiled.
-     * i965 limits 3D destination drawing rect to w,h of 8192,8192.
-     *
-     * i915 limits 3D textures to 4B-aligned offset if un-tiled.
-     * i915 limits 3D textures to ~4kB-aligned offset if tiled.
-     * i915 limits 3D textures to width,height of 2048,2048.
-     * i915 limits 3D textures to pitch of 16B - 8kB, in dwords.
-     * i915 limits 3D destination to ~4kB-aligned offset if tiled.
-     * i915 limits 3D destination to pitch of 16B - 8kB, in dwords, if un-tiled.
-     * i915 limits 3D destination to pitch 64B-aligned if used with depth.
-     * i915 limits 3D destination to pitch of 512B - 8kB, in tiles, if tiled.
-     * i915 limits 3D destination to POT aligned pitch if tiled.
-     * i915 limits 3D destination drawing rect to w,h of 2048,2048.
-     *
-     * i845 limits 3D textures to 4B-aligned offset if un-tiled.
-     * i845 limits 3D textures to ~4kB-aligned offset if tiled.
-     * i845 limits 3D textures to width,height of 2048,2048.
-     * i845 limits 3D textures to pitch of 4B - 8kB, in dwords.
-     * i845 limits 3D destination to 4B-aligned offset if un-tiled.
-     * i845 limits 3D destination to ~4kB-aligned offset if tiled.
-     * i845 limits 3D destination to pitch of 8B - 8kB, in dwords.
-     * i845 limits 3D destination drawing rect to w,h of 2048,2048.
-     *
-     * For the tiled issues, the only tiled buffer we draw to should be
-     * the front, which will have an appropriate pitch/offset already set up,
-     * so EXA doesn't need to worry.
-     */
-    if (IS_I965G(pI830)) {
-	pI830->accel_pixmap_offset_alignment = 4 * 2;
-	pI830->accel_pixmap_pitch_alignment = 64;
-	pI830->accel_max_x = 8192;
-	pI830->accel_max_y = 8192;
-    } else {
-	pI830->accel_pixmap_offset_alignment = 4;
-	pI830->accel_pixmap_pitch_alignment = 64;
-	pI830->accel_max_x = 2048;
-	pI830->accel_max_y = 2048;
-    }
-    /* Bump the pitch so that we can tile any pixmap we create. */
-    if (pI830->directRenderingType >= DRI_DRI2)
-	pI830->accel_pixmap_pitch_alignment = 512;
-
-    switch (pI830->accel) {
-    case ACCEL_UXA:
-#ifdef I830_USE_UXA
-	return i830_uxa_init(pScreen);
-#else
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "UXA not built in, falling back to EXA.\n");
-	return I830EXAInit(pScreen);
-#endif
-#ifdef I830_USE_EXA
-    case ACCEL_EXA:
-	return I830EXAInit(pScreen);
-#endif
-#ifdef I830_USE_XAA
-    case ACCEL_XAA:
-	return I830XAAInit(pScreen);
-#endif
-    case ACCEL_UNINIT:
-    case ACCEL_NONE:
-	break;
-    }
-    return FALSE;
+	/* Limits are described in the BLT engine chapter under Graphics Data Size
+	 * Limitations, and the descriptions of SURFACE_STATE, 3DSTATE_BUFFER_INFO,
+	 * 3DSTATE_DRAWING_RECTANGLE, 3DSTATE_MAP_INFO, and 3DSTATE_MAP_INFO.
+	 *
+	 * i845 through i965 limits 2D rendering to 65536 lines and pitch of 32768.
+	 *
+	 * i965 limits 3D surface to (2*element size)-aligned offset if un-tiled.
+	 * i965 limits 3D surface to 4kB-aligned offset if tiled.
+	 * i965 limits 3D surfaces to w,h of ?,8192.
+	 * i965 limits 3D surface to pitch of 1B - 128kB.
+	 * i965 limits 3D surface pitch alignment to 1 or 2 times the element size.
+	 * i965 limits 3D surface pitch alignment to 512B if tiled.
+	 * i965 limits 3D destination drawing rect to w,h of 8192,8192.
+	 *
+	 * i915 limits 3D textures to 4B-aligned offset if un-tiled.
+	 * i915 limits 3D textures to ~4kB-aligned offset if tiled.
+	 * i915 limits 3D textures to width,height of 2048,2048.
+	 * i915 limits 3D textures to pitch of 16B - 8kB, in dwords.
+	 * i915 limits 3D destination to ~4kB-aligned offset if tiled.
+	 * i915 limits 3D destination to pitch of 16B - 8kB, in dwords, if un-tiled.
+	 * i915 limits 3D destination to pitch 64B-aligned if used with depth.
+	 * i915 limits 3D destination to pitch of 512B - 8kB, in tiles, if tiled.
+	 * i915 limits 3D destination to POT aligned pitch if tiled.
+	 * i915 limits 3D destination drawing rect to w,h of 2048,2048.
+	 *
+	 * i845 limits 3D textures to 4B-aligned offset if un-tiled.
+	 * i845 limits 3D textures to ~4kB-aligned offset if tiled.
+	 * i845 limits 3D textures to width,height of 2048,2048.
+	 * i845 limits 3D textures to pitch of 4B - 8kB, in dwords.
+	 * i845 limits 3D destination to 4B-aligned offset if un-tiled.
+	 * i845 limits 3D destination to ~4kB-aligned offset if tiled.
+	 * i845 limits 3D destination to pitch of 8B - 8kB, in dwords.
+	 * i845 limits 3D destination drawing rect to w,h of 2048,2048.
+	 *
+	 * For the tiled issues, the only tiled buffer we draw to should be
+	 * the front, which will have an appropriate pitch/offset already set up,
+	 * so UXA doesn't need to worry.
+	 */
+	if (IS_I965G(intel)) {
+		intel->accel_pixmap_offset_alignment = 4 * 2;
+		intel->accel_pixmap_pitch_alignment = 64;
+		intel->accel_max_x = 8192;
+		intel->accel_max_y = 8192;
+	} else {
+		intel->accel_pixmap_offset_alignment = 4;
+		intel->accel_pixmap_pitch_alignment = 64;
+		intel->accel_max_x = 2048;
+		intel->accel_max_y = 2048;
+	}
+
+	return i830_uxa_init(screen);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.c	2011-02-08 11:14:00.000000000 +0100
@@ -32,185 +32,244 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <errno.h>
 
 #include "xf86.h"
 #include "i830.h"
 #include "i830_ring.h"
 #include "i915_drm.h"
 
-static int
-intel_nondrm_exec(dri_bo *bo, unsigned int used, void *priv)
-{
-    ScrnInfoPtr pScrn = priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+#define DUMP_BATCHBUFFERS NULL /* "/tmp/i915-batchbuffers.dump" */
 
-    BEGIN_LP_RING(4);
-    OUT_RING(MI_BATCH_BUFFER_START | (2 << 6));
-    OUT_RING(bo->offset);
-    OUT_RING(MI_NOOP);
-    OUT_RING(MI_NOOP);
-    ADVANCE_LP_RING();
+static void intel_end_vertex(intel_screen_private *intel)
+{
+	if (intel->vertex_bo) {
+		if (intel->vertex_used)
+			dri_bo_subdata(intel->vertex_bo, 0, intel->vertex_used*4, intel->vertex_ptr);
 
-    return 0;
+		dri_bo_unreference(intel->vertex_bo);
+		intel->vertex_bo = NULL;
+	}
 }
 
-static int
-intel_nondrm_exec_i830(dri_bo *bo, unsigned int used, void *priv)
+void intel_next_vertex(intel_screen_private *intel)
 {
-    ScrnInfoPtr pScrn = priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_end_vertex(intel);
 
-    BEGIN_LP_RING(4);
-    OUT_RING(MI_BATCH_BUFFER);
-    OUT_RING(bo->offset);
-    OUT_RING(bo->offset + pI830->batch_used - 4);
-    OUT_RING(MI_NOOP);
-    ADVANCE_LP_RING();
-
-    return 0;
+	intel->vertex_bo =
+		dri_bo_alloc(intel->bufmgr, "vertex", sizeof (intel->vertex_ptr), 4096);
+	intel->vertex_used = 0;
 }
 
-/**
- * Creates a fence value representing a request to be passed.
- *
- * Stub implementation that should be avoided when DRM functions are available.
- */
-static unsigned int
-intel_nondrm_emit(void *priv)
+static void intel_next_batch(ScrnInfoPtr scrn)
 {
-    static unsigned int fence = 0;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	/* The 865 has issues with larger-than-page-sized batch buffers. */
+	if (IS_I865G(intel))
+		intel->batch_bo =
+		    dri_bo_alloc(intel->bufmgr, "batch", 4096, 4096);
+	else
+		intel->batch_bo =
+		    dri_bo_alloc(intel->bufmgr, "batch", 4096 * 4, 4096);
 
-    /* Match DRM in not using half the range. The fake bufmgr relies on this. */
-    if (++fence >= 0x8000000)
-	fence = 1;
+	intel->batch_used = 0;
 
-    return fence;
+	/* We don't know when another client has executed, so we have
+	 * to reinitialize our 3D state per batch.
+	 */
+	intel->last_3d = LAST_3D_OTHER;
 }
 
-/**
- * Waits on a fence representing a request to be passed.
- *
- * Stub implementation that should be avoided when DRM functions are available.
- */
-static void
-intel_nondrm_wait(unsigned int fence, void *priv)
+void intel_batch_init(ScrnInfoPtr scrn)
 {
-    ScrnInfoPtr pScrn = priv;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    i830_wait_ring_idle(pScrn);
+	intel->batch_emit_start = 0;
+	intel->batch_emitting = 0;
+
+	intel_next_batch(scrn);
 }
 
-static void
-intel_next_batch(ScrnInfoPtr pScrn)
+void intel_batch_teardown(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (intel->batch_bo != NULL) {
+		dri_bo_unreference(intel->batch_bo);
+		intel->batch_bo = NULL;
+	}
+
+	if (intel->last_batch_bo != NULL) {
+		dri_bo_unreference(intel->last_batch_bo);
+		intel->last_batch_bo = NULL;
+	}
+
+	if (intel->vertex_bo) {
+		dri_bo_unreference(intel->vertex_bo);
+		intel->vertex_bo = NULL;
+	}
 
-    /* The 865 has issues with larger-than-page-sized batch buffers. */
-    if (IS_I865G(pI830))
-	pI830->batch_bo = dri_bo_alloc(pI830->bufmgr, "batch", 4096, 4096);
-    else
-	pI830->batch_bo = dri_bo_alloc(pI830->bufmgr, "batch", 4096 * 4, 4096);
+	while (!list_is_empty(&intel->batch_pixmaps))
+		list_del(intel->batch_pixmaps.next);
 
-    if (dri_bo_map(pI830->batch_bo, 1) != 0)
-	FatalError("Failed to map batchbuffer: %s\n", strerror(errno));
+	while (!list_is_empty(&intel->flush_pixmaps))
+		list_del(intel->flush_pixmaps.next);
 
-    pI830->batch_used = 0;
-    pI830->batch_ptr = pI830->batch_bo->virtual;
+	while (!list_is_empty(&intel->in_flight)) {
+		struct intel_pixmap *entry;
 
-    /* If we are using DRI2, we don't know when another client has executed,
-     * so we have to reinitialize our 3D state per batch.
-     */
-    if (pI830->directRenderingType == DRI_DRI2)
-	pI830->last_3d = LAST_3D_OTHER;
+		entry = list_first_entry(&intel->in_flight,
+					 struct intel_pixmap,
+					 in_flight);
+
+		dri_bo_unreference(entry->bo);
+		list_del(&entry->in_flight);
+		free(entry);
+	}
 }
 
-void
-intel_batch_init(ScrnInfoPtr pScrn)
+void intel_batch_do_flush(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    pI830->batch_emit_start = 0;
-    pI830->batch_emitting = 0;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    intel_next_batch(pScrn);
+	while (!list_is_empty(&intel->flush_pixmaps))
+		list_del(intel->flush_pixmaps.next);
 
-    if (pI830->directRenderingType <= DRI_NONE) {
-	if (IS_I830(pI830) || IS_845G(pI830)) {
-	    intel_bufmgr_fake_set_exec_callback(pI830->bufmgr,
-						intel_nondrm_exec_i830,
-						pScrn);
-	} else {
-	    intel_bufmgr_fake_set_exec_callback(pI830->bufmgr,
-						intel_nondrm_exec,
-						pScrn);
-	}
-	intel_bufmgr_fake_set_fence_callback(pI830->bufmgr,
-					     intel_nondrm_emit,
-					     intel_nondrm_wait,
-					     pScrn);
-    }
+	intel->need_mi_flush = FALSE;
 }
 
-void
-intel_batch_teardown(ScrnInfoPtr pScrn)
+void intel_batch_emit_flush(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int flags;
+
+	assert (!intel->in_batch_atomic);
+
+	/* Big hammer, look to the pipelined flushes in future. */
+	flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
+	if (IS_I965G(intel))
+		flags = 0;
+
+	BEGIN_BATCH(1);
+	OUT_BATCH(MI_FLUSH | flags);
+	ADVANCE_BATCH();
 
-    if (pI830->batch_ptr != NULL) {
-	dri_bo_unmap(pI830->batch_bo);
-	dri_bo_unreference(pI830->batch_bo);
-	pI830->batch_ptr = NULL;
-    }
+	intel_batch_do_flush(scrn);
 }
 
-void
-intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed)
+void intel_batch_submit(ScrnInfoPtr scrn, int flush)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int ret;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int ret;
 
-    if (pI830->batch_used == 0)
-	return;
+	assert (!intel->in_batch_atomic);
 
-    /* If we're not using GEM, then emit a flush after each batch buffer */
-    if (pI830->memory_manager == NULL && !flushed) {
-	int flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
+	if (intel->vertex_flush)
+		intel->vertex_flush(intel);
+	intel_end_vertex(intel);
 
-	if (IS_I965G(pI830))
-	    flags = 0;
+	if (flush)
+		intel_batch_emit_flush(scrn);
 
-	*(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = MI_FLUSH | flags;
-	pI830->batch_used += 4;
-    }
-	
-    /* Emit a padding dword if we aren't going to be quad-word aligned. */
-    if ((pI830->batch_used & 4) == 0) {
-	*(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = MI_NOOP;
-	pI830->batch_used += 4;
-    }
+	if (intel->batch_used == 0)
+		return;
 
-    /* Mark the end of the batchbuffer. */
-    *(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = MI_BATCH_BUFFER_END;
-    pI830->batch_used += 4;
+	/* Mark the end of the batchbuffer. */
+	OUT_BATCH(MI_BATCH_BUFFER_END);
+	/* Emit a padding dword if we aren't going to be quad-word aligned. */
+	if (intel->batch_used & 1)
+		OUT_BATCH(MI_NOOP);
 
-    dri_bo_unmap(pI830->batch_bo);
-    pI830->batch_ptr = NULL;
+	if (DUMP_BATCHBUFFERS) {
+	    FILE *file = fopen(DUMP_BATCHBUFFERS, "a");
+	    if (file) {
+		fwrite (intel->batch_ptr, intel->batch_used*4, 1, file);
+		fclose(file);
+	    }
+	}
+
+	ret = dri_bo_subdata(intel->batch_bo, 0, intel->batch_used*4, intel->batch_ptr);
+	if (ret == 0)
+		ret = dri_bo_exec(intel->batch_bo, intel->batch_used*4,
+				  NULL, 0, 0xffffffff);
+	if (ret != 0) {
+		static int once;
+
+		if (!once) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+				   "Failed to submit batch buffer, expect rendering corruption "
+				   "or even a frozen display: %s.\n",
+				   strerror(-ret));
+			once = 1;
+		}
+	}
+
+	while (!list_is_empty(&intel->batch_pixmaps)) {
+		struct intel_pixmap *entry;
+
+		entry = list_first_entry(&intel->batch_pixmaps,
+					 struct intel_pixmap,
+					 batch);
+
+		entry->busy = -1;
+		entry->batch_write = 0;
+		list_del(&entry->batch);
+	}
+
+	intel->need_mi_flush |= !list_is_empty(&intel->flush_pixmaps);
+	while (!list_is_empty(&intel->flush_pixmaps))
+		list_del(intel->flush_pixmaps.next);
+
+	while (!list_is_empty(&intel->in_flight)) {
+		struct intel_pixmap *entry;
+
+		entry = list_first_entry(&intel->in_flight,
+					 struct intel_pixmap,
+					 in_flight);
+
+		dri_bo_unreference(entry->bo);
+		list_del(&entry->in_flight);
+		free(entry);
+	}
+
+	/* Save a ref to the last batch emitted, which we use for syncing
+	 * in debug code.
+	 */
+	dri_bo_unreference(intel->last_batch_bo);
+	intel->last_batch_bo = intel->batch_bo;
+	intel->batch_bo = NULL;
 
-    ret = dri_bo_exec(pI830->batch_bo, pI830->batch_used, NULL, 0, 0xffffffff);
-    if (ret != 0)
-	FatalError("Failed to submit batchbuffer: %s\n", strerror(-ret));
+	intel_next_batch(scrn);
+
+	if (intel->debug_flush & DEBUG_FLUSH_WAIT)
+		intel_batch_wait_last(scrn);
+
+	if (intel->batch_flush_notify)
+		intel->batch_flush_notify(scrn);
+}
+
+/** Waits on the last emitted batchbuffer to be completed. */
+void intel_batch_wait_last(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	/* Map it CPU write, which guarantees it's done.  This is a completely
+	 * non performance path, so we don't need anything better.
+	 */
+	drm_intel_gem_bo_map_gtt(intel->last_batch_bo);
+	drm_intel_gem_bo_unmap_gtt(intel->last_batch_bo);
+}
+
+void intel_sync(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    dri_bo_unreference(pI830->batch_bo);
-    intel_next_batch(pScrn);
+	if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
+		ErrorF("I830Sync\n");
 
-    /* Mark that we need to flush whatever potential rendering we've done in the
-     * blockhandler.  We could set this less often, but it's probably not worth
-     * the work.
-     */
-    if (pI830->memory_manager != NULL)
-	pI830->need_mi_flush = TRUE;
+	if (!scrn->vtSema || !intel->batch_bo || !intel->batch_ptr)
+		return;
 
-    if (pI830->batch_flush_notify)
-	pI830->batch_flush_notify (pScrn);
+	intel_batch_submit(scrn, TRUE);
+	intel_batch_wait_last(scrn);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.h	2011-02-08 11:14:00.000000000 +0100
@@ -32,98 +32,131 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
 #define BATCH_RESERVED		16
 
-void intel_batch_init(ScrnInfoPtr pScrn);
-void intel_batch_teardown(ScrnInfoPtr pScrn);
-void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed);
 
-static inline int
-intel_batch_space(I830Ptr pI830)
+void intel_batch_init(ScrnInfoPtr scrn);
+void intel_batch_teardown(ScrnInfoPtr scrn);
+void intel_batch_emit_flush(ScrnInfoPtr scrn);
+void intel_batch_do_flush(ScrnInfoPtr scrn);
+void intel_batch_submit(ScrnInfoPtr scrn, int flush);
+void intel_batch_wait_last(ScrnInfoPtr scrn);
+
+static inline int intel_batch_space(intel_screen_private *intel)
 {
-    return (pI830->batch_bo->size - BATCH_RESERVED) - (pI830->batch_used);
+	return (intel->batch_bo->size - BATCH_RESERVED) - (4*intel->batch_used);
 }
 
-static inline void
-intel_batch_require_space(ScrnInfoPtr pScrn, I830Ptr pI830, GLuint sz)
+static inline int intel_vertex_space(intel_screen_private *intel)
 {
-    assert(sz < pI830->batch_bo->size - 8);
-    if (intel_batch_space(pI830) < sz)
-	intel_batch_flush(pScrn, FALSE);
+	return intel->vertex_bo ? intel->vertex_bo->size - (4*intel->vertex_used) : 0;
 }
 
 static inline void
-intel_batch_start_atomic(ScrnInfoPtr pScrn, unsigned int sz)
+intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, GLuint sz)
+{
+	assert(sz < intel->batch_bo->size - 8);
+	if (intel_batch_space(intel) < sz)
+		intel_batch_submit(scrn, FALSE);
+}
+
+static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, unsigned int sz)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    assert(!pI830->in_batch_atomic);
-    intel_batch_require_space(pScrn, pI830, sz * 4);
+	assert(!intel->in_batch_atomic);
+	intel_batch_require_space(scrn, intel, sz * 4);
 
-    pI830->in_batch_atomic = TRUE;
-    pI830->batch_atomic_limit = pI830->batch_used + sz * 4;
+	intel->in_batch_atomic = TRUE;
+	intel->batch_atomic_limit = intel->batch_used + sz;
 }
 
-static inline void
-intel_batch_end_atomic(ScrnInfoPtr pScrn)
+static inline void intel_batch_end_atomic(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    assert(pI830->in_batch_atomic);
-    assert(pI830->batch_used <= pI830->batch_atomic_limit);
-    pI830->in_batch_atomic = FALSE;
+	assert(intel->in_batch_atomic);
+	assert(intel->batch_used <= intel->batch_atomic_limit);
+	intel->in_batch_atomic = FALSE;
+}
+
+static inline void intel_batch_emit_dword(intel_screen_private *intel, uint32_t dword)
+{
+	intel->batch_ptr[intel->batch_used++] = dword;
+}
+
+static inline void intel_batch_align(intel_screen_private *intel, uint32_t align)
+{
+	uint32_t delta;
+
+	align /= 4;
+	assert(align);
+
+	if ((delta = intel->batch_used & (align - 1))) {
+		delta = align - delta;
+		memset (intel->batch_ptr + intel->batch_used, 0, 4*delta);
+		intel->batch_used += delta;
+	}
 }
 
 static inline void
-intel_batch_emit_dword(I830Ptr pI830, uint32_t dword)
+intel_batch_emit_reloc(intel_screen_private *intel,
+		       dri_bo * bo,
+		       uint32_t read_domains,
+		       uint32_t write_domains, uint32_t delta, int needs_fence)
 {
-    assert(pI830->batch_ptr != NULL);
-    assert(intel_batch_space(pI830) >= 4);
-    *(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = dword;
-    pI830->batch_used += 4;
+	if (needs_fence)
+		drm_intel_bo_emit_reloc_fence(intel->batch_bo,
+					      intel->batch_used * 4,
+					      bo, delta,
+					      read_domains, write_domains);
+	else
+		drm_intel_bo_emit_reloc(intel->batch_bo, intel->batch_used * 4,
+					bo, delta,
+					read_domains, write_domains);
+
+	intel_batch_emit_dword(intel, bo->offset + delta);
 }
 
 static inline void
-intel_batch_emit_reloc (I830Ptr  pI830,
-			dri_bo  *bo,
-			uint32_t read_domains,
-			uint32_t write_domains,
-			uint32_t delta)
-{
-    assert(intel_batch_space(pI830) >= 4);
-    *(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = bo->offset + delta;
-    dri_bo_emit_reloc(pI830->batch_bo, read_domains, write_domains, delta,
-		      pI830->batch_used, bo);
-    pI830->batch_used += 4;
+intel_batch_mark_pixmap_domains(intel_screen_private *intel,
+				struct intel_pixmap *priv,
+				uint32_t read_domains, uint32_t write_domain)
+{
+	assert (read_domains);
+	assert (write_domain == 0 || write_domain == read_domains);
+
+	if (list_is_empty(&priv->batch))
+		list_add(&priv->batch, &intel->batch_pixmaps);
+	if (write_domain && list_is_empty(&priv->flush))
+		list_add(&priv->flush, &intel->flush_pixmaps);
+
+	priv->batch_write |= write_domain != 0;
+	priv->busy = 1;
 }
 
 static inline void
-intel_batch_emit_reloc_pixmap(I830Ptr pI830, PixmapPtr pPixmap,
+intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pixmap,
 			      uint32_t read_domains, uint32_t write_domain,
-			      uint32_t delta)
+			      uint32_t delta, int needs_fence)
 {
-#if I830_USE_UXA || I830_USE_EXA
-    dri_bo *bo = i830_get_pixmap_bo(pPixmap);
-#endif
-    uint32_t offset;
-    assert(pI830->batch_ptr != NULL);
-    assert(intel_batch_space(pI830) >= 4);
-#if I830_USE_UXA || I830_USE_EXA
-    if (bo) {
-	intel_batch_emit_reloc(pI830, bo, read_domains, write_domain, delta);
-	return;
-    }
-#endif
-    offset = intel_get_pixmap_offset(pPixmap);
-    *(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = offset + delta;
-    pI830->batch_used += 4;
+	struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap);
+
+	intel_batch_mark_pixmap_domains(intel, priv, read_domains,
+	    write_domain);
+	intel_batch_emit_reloc(intel, priv->bo, read_domains,
+	    write_domain, delta, needs_fence);
 }
 
-#define OUT_BATCH(dword) intel_batch_emit_dword(pI830, dword)
+#define ALIGN_BATCH(align) intel_batch_align(intel, align);
+#define OUT_BATCH(dword) intel_batch_emit_dword(intel, dword)
 
 #define OUT_RELOC(bo, read_domains, write_domains, delta) \
-	intel_batch_emit_reloc (pI830, bo, read_domains, write_domains, delta)
+	intel_batch_emit_reloc(intel, bo, read_domains, write_domains, delta, 0)
+
+#define OUT_RELOC_PIXMAP(pixmap, reads, write, delta)	\
+	intel_batch_emit_reloc_pixmap(intel, pixmap, reads, write, delta, 0)
 
-#define OUT_RELOC_PIXMAP(pPixmap, reads, write, delta)	\
-	intel_batch_emit_reloc_pixmap(pI830, pPixmap, reads, write, delta)
+#define OUT_RELOC_PIXMAP_FENCED(pixmap, reads, write, delta)	\
+	intel_batch_emit_reloc_pixmap(intel, pixmap, reads, write, delta, 1)
 
 union intfloat {
 	float f;
@@ -138,33 +171,44 @@ union intfloat {
 
 #define BEGIN_BATCH(n)							\
 do {									\
-    if (pI830->batch_emitting != 0)					\
-	FatalError("%s: BEGIN_BATCH called without closing "		\
-		   "ADVANCE_BATCH\n", __FUNCTION__);			\
-    intel_batch_require_space(pScrn, pI830, (n) * 4);			\
-    pI830->batch_emitting = (n) * 4;					\
-    pI830->batch_emit_start = pI830->batch_used;			\
+	if (intel->batch_emitting != 0)					\
+		FatalError("%s: BEGIN_BATCH called without closing "	\
+			   "ADVANCE_BATCH\n", __FUNCTION__);		\
+	assert(!intel->in_batch_atomic);				\
+	intel_batch_require_space(scrn, intel, (n) * 4);		\
+	intel->batch_emitting = (n);					\
+	intel->batch_emit_start = intel->batch_used;			\
 } while (0)
 
 #define ADVANCE_BATCH() do {						\
-    if (pI830->batch_emitting == 0)					\
-	FatalError("%s: ADVANCE_BATCH called with no matching "		\
-		   "BEGIN_BATCH\n", __FUNCTION__);			\
-    if (pI830->batch_used > pI830->batch_emit_start + pI830->batch_emitting) \
-	FatalError("%s: ADVANCE_BATCH: exceeded allocation %d/%d\n ",	\
-		   __FUNCTION__,					\
-		   pI830->batch_used - pI830->batch_emit_start,		\
-		   pI830->batch_emitting);				\
-    if (pI830->batch_used < pI830->batch_emit_start + pI830->batch_emitting) \
-	FatalError("%s: ADVANCE_BATCH: under-used allocation %d/%d\n ", \
-		   __FUNCTION__,					\
-		   pI830->batch_used - pI830->batch_emit_start,		\
-		   pI830->batch_emitting);				\
-    if ((pI830->batch_emitting > 8) && (I810_DEBUG & DEBUG_ALWAYS_SYNC)) { \
-	/* Note: not actually syncing, just flushing each batch. */	\
-	intel_batch_flush(pScrn, FALSE);					\
-    }									\
-    pI830->batch_emitting = 0;						\
+	if (intel->batch_emitting == 0)					\
+		FatalError("%s: ADVANCE_BATCH called with no matching "	\
+			   "BEGIN_BATCH\n", __FUNCTION__);		\
+	if (intel->batch_used >						\
+	    intel->batch_emit_start + intel->batch_emitting)		\
+		FatalError("%s: ADVANCE_BATCH: exceeded allocation %d/%d\n ", \
+			   __FUNCTION__,				\
+			   intel->batch_used - intel->batch_emit_start,	\
+			   intel->batch_emitting);			\
+	if (intel->batch_used < intel->batch_emit_start +		\
+	    intel->batch_emitting)					\
+		FatalError("%s: ADVANCE_BATCH: under-used allocation %d/%d\n ", \
+			   __FUNCTION__,				\
+			   intel->batch_used - intel->batch_emit_start,	\
+			   intel->batch_emitting);			\
+	if ((intel->batch_emitting > 8) &&				\
+	    (I810_DEBUG & DEBUG_ALWAYS_SYNC)) {				\
+		/* Note: not actually syncing, just flushing each batch. */ \
+		intel_batch_submit(scrn, FALSE);			\
+	}								\
+	intel->batch_emitting = 0;					\
 } while (0)
 
+void intel_next_vertex(intel_screen_private *intel);
+static inline void intel_vertex_emit(intel_screen_private *intel, float v)
+{
+	intel->vertex_ptr[intel->vertex_used++] = v;
+}
+#define OUT_VERTEX(v) intel_vertex_emit(intel, v)
+
 #endif /* _INTEL_BATCHBUFFER_H */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c	2011-01-22 19:57:36.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c	2011-02-08 11:14:00.000000000 +0100
@@ -26,7 +26,7 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#undef VERSION	/* XXX edid.h has a VERSION too */
+#undef VERSION			/* XXX edid.h has a VERSION too */
 #endif
 
 #include <stdio.h>
@@ -43,34 +43,61 @@
 #define INTEL_BIOS_16(_addr)	(bios[_addr] |			\
 				 (bios[_addr + 1] << 8))
 #define INTEL_BIOS_32(_addr)	(bios[_addr] |			\
-				 (bios[_addr + 1] << 8)		\
-				 (bios[_addr + 2] << 16)	\
+				 (bios[_addr + 1] << 8) |	\
+				 (bios[_addr + 2] << 16) |	\
 				 (bios[_addr + 3] << 24))
 
-static void *
-find_section(struct bdb_header *bdb, int section_id)
+#define		SLAVE_ADDR1	0x70
+#define		SLAVE_ADDR2	0x72
+static void *find_section(struct bdb_header *bdb, int section_id)
 {
-    unsigned char *base = (unsigned char *)bdb;
-    int index = 0;
-    uint16_t total, current_size;
-    unsigned char current_id;
-
-    /* skip to first section */
-    index += bdb->header_size;
-    total = bdb->bdb_size;
-
-    /* walk the sections looking for section_id */
-    while (index < total) {
-	current_id = *(base + index);
-	index++;
-	current_size = *((uint16_t *)(base + index));
-	index += 2;
-	if (current_id == section_id)
-	    return base + index;
-	index += current_size;
-    }
+	unsigned char *base = (unsigned char *)bdb;
+	int index = 0;
+	uint16_t total, current_size;
+	unsigned char current_id;
+
+	/* skip to first section */
+	index += bdb->header_size;
+	total = bdb->bdb_size;
+
+	/* walk the sections looking for section_id */
+	while (index < total) {
+		current_id = *(base + index);
+		index++;
+		current_size = *((uint16_t *) (base + index));
+		index += 2;
+		if (current_id == section_id)
+			return base + index;
+		index += current_size;
+	}
+
+	return NULL;
+}
+
+static void
+fill_detail_timing_data(DisplayModePtr fixed_mode, unsigned char *timing_ptr)
+{
+	fixed_mode->HDisplay = _H_ACTIVE(timing_ptr);
+	fixed_mode->VDisplay = _V_ACTIVE(timing_ptr);
+	fixed_mode->HSyncStart = fixed_mode->HDisplay + _H_SYNC_OFF(timing_ptr);
+	fixed_mode->HSyncEnd = fixed_mode->HSyncStart +
+	    _H_SYNC_WIDTH(timing_ptr);
+	fixed_mode->HTotal = fixed_mode->HDisplay + _H_BLANK(timing_ptr);
+	fixed_mode->VSyncStart = fixed_mode->VDisplay + _V_SYNC_OFF(timing_ptr);
+	fixed_mode->VSyncEnd = fixed_mode->VSyncStart +
+	    _V_SYNC_WIDTH(timing_ptr);
+	fixed_mode->VTotal = fixed_mode->VDisplay + _V_BLANK(timing_ptr);
+	fixed_mode->Clock = _PIXEL_CLOCK(timing_ptr) / 1000;
+	fixed_mode->type = M_T_PREFERRED;
+
+	/* Some VBTs have bogus h/vtotal values */
+	if (fixed_mode->HSyncEnd > fixed_mode->HTotal)
+		fixed_mode->HTotal = fixed_mode->HSyncEnd + 1;
+	if (fixed_mode->VSyncEnd > fixed_mode->VTotal)
+		fixed_mode->VTotal = fixed_mode->VSyncEnd + 1;
+
+	xf86SetModeDefaultName(fixed_mode);
 
-    return NULL;
 }
 
 /**
@@ -81,118 +108,219 @@ find_section(struct bdb_header *bdb, int
  * offsets, such that this parsing fails.  Thus, almost any other method for
  * detecting the panel mode is preferable.
  */
-static void
-parse_panel_data(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_integrated_panel_data(intel_screen_private *intel, struct bdb_header *bdb)
 {
-    struct bdb_lvds_options *lvds_options;
-    struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
-    int timing_offset;
-    DisplayModePtr fixed_mode;
-    unsigned char *timing_ptr;
-
-    /* Defaults if we can't find VBT info */
-    pI830->lvds_dither = 0;
-
-    lvds_options = find_section(bdb, BDB_LVDS_OPTIONS);
-    if (!lvds_options)
-	return;
-
-    pI830->lvds_dither = lvds_options->pixel_dither;
-    if (lvds_options->panel_type == 0xff)
-	return;
-
-    lvds_lfp_data_ptrs = find_section(bdb, BDB_LVDS_LFP_DATA_PTRS);
-    if (!lvds_lfp_data_ptrs)
-	return;
-
-    timing_offset =
-	lvds_lfp_data_ptrs->ptr[lvds_options->panel_type].dvo_timing_offset;
-    timing_ptr = (unsigned char *)bdb + timing_offset;
-
-    if (pI830->skip_panel_detect)
-	return;
-
-    fixed_mode = xnfalloc(sizeof(DisplayModeRec));
-    memset(fixed_mode, 0, sizeof(*fixed_mode));
-
-    /* Since lvds_bdb_2_fp_edid_dtd is just an EDID detailed timing
-     * block, pull the contents out using EDID macros.
-     */
-    fixed_mode->HDisplay   = _H_ACTIVE(timing_ptr);
-    fixed_mode->VDisplay   = _V_ACTIVE(timing_ptr);
-    fixed_mode->HSyncStart = fixed_mode->HDisplay +
-	_H_SYNC_OFF(timing_ptr);
-    fixed_mode->HSyncEnd   = fixed_mode->HSyncStart +
-	_H_SYNC_WIDTH(timing_ptr);
-    fixed_mode->HTotal     = fixed_mode->HDisplay +
-	_H_BLANK(timing_ptr);
-    fixed_mode->VSyncStart = fixed_mode->VDisplay +
-	_V_SYNC_OFF(timing_ptr);
-    fixed_mode->VSyncEnd   = fixed_mode->VSyncStart +
-	_V_SYNC_WIDTH(timing_ptr);
-    fixed_mode->VTotal     = fixed_mode->VDisplay +
-	_V_BLANK(timing_ptr);
-    fixed_mode->Clock      = _PIXEL_CLOCK(timing_ptr) / 1000;
-    fixed_mode->type       = M_T_PREFERRED;
-
-    /* Some VBTs have bogus h/vtotal values */
-    if (fixed_mode->HSyncEnd > fixed_mode->HTotal)
-	fixed_mode->HTotal = fixed_mode->HSyncEnd + 1;
-    if (fixed_mode->VSyncEnd > fixed_mode->VTotal)
-	fixed_mode->VTotal = fixed_mode->VSyncEnd + 1;
+	struct bdb_lvds_options *lvds_options;
+	struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
+	struct bdb_lvds_lfp_data *lvds_data;
+	struct bdb_lvds_lfp_data_entry *entry;
+	DisplayModePtr fixed_mode;
+	unsigned char *timing_ptr;
+	int lfp_data_size;
+	int dvo_offset;
+
+	/* Defaults if we can't find VBT info */
+	intel->lvds_dither = 0;
+
+	lvds_options = find_section(bdb, BDB_LVDS_OPTIONS);
+	if (!lvds_options)
+		return;
+
+	intel->lvds_dither = lvds_options->pixel_dither;
+	if (lvds_options->panel_type == 0xff)
+		return;
+
+	lvds_data = find_section(bdb, BDB_LVDS_LFP_DATA);
+	if (!lvds_data) {
+		return;
+	}
+
+	lvds_lfp_data_ptrs = find_section(bdb, BDB_LVDS_LFP_DATA_PTRS);
+	if (!lvds_lfp_data_ptrs)
+		return;
+
+	lfp_data_size = lvds_lfp_data_ptrs->ptr[1].dvo_timing_offset -
+	    lvds_lfp_data_ptrs->ptr[0].dvo_timing_offset;
+	dvo_offset = lvds_lfp_data_ptrs->ptr[0].dvo_timing_offset -
+	    lvds_lfp_data_ptrs->ptr[0].fp_timing_offset;
+	entry = (struct bdb_lvds_lfp_data_entry *)((uint8_t *) lvds_data->data +
+						   (lfp_data_size *
+						    lvds_options->panel_type));
+	timing_ptr = (unsigned char *)entry + dvo_offset;
+	if (intel->skip_panel_detect)
+		return;
+
+	fixed_mode = xnfalloc(sizeof(DisplayModeRec));
+	memset(fixed_mode, 0, sizeof(*fixed_mode));
+
+	/* Since lvds_bdb_2_fp_edid_dtd is just an EDID detailed timing
+	 * block, pull the contents out using EDID macros.
+	 */
+	fill_detail_timing_data(fixed_mode, timing_ptr);
+	intel->lvds_fixed_mode = fixed_mode;
+}
 
-    xf86SetModeDefaultName(fixed_mode);
+static void parse_sdvo_panel_data(intel_screen_private *intel, struct bdb_header *bdb)
+{
+	DisplayModePtr fixed_mode;
+	struct bdb_sdvo_lvds_options *sdvo_lvds_options;
+	unsigned char *timing_ptr;
+
+	intel->sdvo_lvds_fixed_mode = NULL;
+
+	sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);
+	if (sdvo_lvds_options == NULL)
+		return;
+
+	timing_ptr = find_section(bdb, BDB_SDVO_PANEL_DTDS);
+	if (timing_ptr == NULL)
+		return;
+
+	fixed_mode = xnfalloc(sizeof(DisplayModeRec));
+	if (fixed_mode == NULL)
+		return;
+
+	memset(fixed_mode, 0, sizeof(*fixed_mode));
+	fill_detail_timing_data(fixed_mode, timing_ptr +
+				(sdvo_lvds_options->panel_type *
+				 DET_TIMING_INFO_LEN));
+	intel->sdvo_lvds_fixed_mode = fixed_mode;
 
-    pI830->lvds_fixed_mode = fixed_mode;
 }
 
-static void
-parse_general_features(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_panel_data(intel_screen_private *intel, struct bdb_header *bdb)
 {
-    struct bdb_general_features *general;
+	parse_integrated_panel_data(intel, bdb);
+	parse_sdvo_panel_data(intel, bdb);
+}
 
-    /* Set sensible defaults in case we can't find the general block */
-    pI830->tv_present = 1;
+static void parse_general_features(intel_screen_private *intel, struct bdb_header *bdb)
+{
+	struct bdb_general_features *general;
 
-    general = find_section(bdb, BDB_GENERAL_FEATURES);
-    if (!general)
-	return;
+	/* Set sensible defaults in case we can't find the general block */
+	intel->tv_present = 1;
 
-    pI830->tv_present = general->int_tv_support;
-    pI830->lvds_use_ssc = general->enable_ssc;
-    if (pI830->lvds_use_ssc) {
-	if (IS_I85X(pI830))
-	    pI830->lvds_ssc_freq = general->ssc_freq ? 66 : 48;
-	else
-	    pI830->lvds_ssc_freq = general->ssc_freq ? 100 : 96;
-    }
+	general = find_section(bdb, BDB_GENERAL_FEATURES);
+	if (!general)
+		return;
+
+	intel->tv_present = general->int_tv_support;
+	intel->lvds_use_ssc = general->enable_ssc;
+	if (intel->lvds_use_ssc) {
+		if (IS_I85X(intel))
+			intel->lvds_ssc_freq = general->ssc_freq ? 66 : 48;
+		else if (IS_IGDNG(intel))
+			intel->lvds_ssc_freq = general->ssc_freq ? 100 : 120;
+		else
+			intel->lvds_ssc_freq = general->ssc_freq ? 100 : 96;
+	}
 }
 
-static void
-parse_driver_feature(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_driver_feature(intel_screen_private *intel, struct bdb_header *bdb)
 {
-    struct bdb_driver_feature *feature;
+	struct bdb_driver_feature *feature;
 
-    /* For mobile chip, set default as true */
-    if (IS_MOBILE(pI830) && !IS_I830(pI830))
-	pI830->integrated_lvds = TRUE;
+	/* For mobile chip, set default as true */
+	if (IS_MOBILE(intel) && !IS_I830(intel))
+		intel->integrated_lvds = TRUE;
+
+	/* skip pre-9xx chips which is broken to parse this block. */
+	if (!IS_I9XX(intel))
+		return;
+
+	/* XXX Disable this parsing, as it looks doesn't work for all
+	   VBIOS. Reenable it if we could find out the reliable VBT parsing
+	   for LVDS config later. */
+	if (1)
+		return;
+
+	feature = find_section(bdb, BDB_DRIVER_FEATURES);
+	if (!feature)
+		return;
 
-    /* skip pre-9xx chips which is broken to parse this block. */
-    if (!IS_I9XX(pI830))
-	return;
+	if (feature->lvds_config != BDB_DRIVER_INT_LVDS)
+		intel->integrated_lvds = FALSE;
+}
 
-    /* XXX Disable this parsing, as it looks doesn't work for all
-       VBIOS. Reenable it if we could find out the reliable VBT parsing
-       for LVDS config later. */
-    if (1)
-	return;
+static
+void parse_sdvo_mapping(ScrnInfoPtr scrn, struct bdb_header *bdb)
+{
+	unsigned int block_size;
+	uint16_t *block_ptr;
+	struct bdb_general_definitions *defs;
+	struct child_device_config *child;
+	int i, child_device_num, count;
+	struct sdvo_device_mapping *p_mapping;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	defs = find_section(bdb, BDB_GENERAL_DEFINITIONS);
+	if (!defs) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "can't find the general definition blocks\n");
+		return;
+	}
+	/* Get the block size of general defintion block */
+	block_ptr = (uint16_t *) ((char *)defs - 2);
+	block_size = *block_ptr;
+	child_device_num = (block_size - sizeof(*defs)) / sizeof(*child);
+	count = 0;
+
+	for (i = 0; i < child_device_num; i++) {
+		child = &defs->devices[i];
+		if (!child->device_type) {
+			/* skip invalid child device type */
+			continue;
+		}
+		if (child->slave_addr == SLAVE_ADDR1 ||
+		    child->slave_addr == SLAVE_ADDR2) {
+			if (child->dvo_port != DEVICE_PORT_DVOB &&
+			    child->dvo_port != DEVICE_PORT_DVOC) {
+				/* skip the incorrect sdvo port */
+				xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+					   "Incorrect SDVO port\n");
+				continue;
+			}
+			xf86DrvMsg(scrn->scrnIndex, X_INFO,
+				   "the SDVO device with slave addr %x "
+				   "is found on DVO %x port\n",
+				   child->slave_addr, child->dvo_port);
+			/* fill the primary dvo port */
+			p_mapping =
+			    &(intel->sdvo_mappings[child->dvo_port - 1]);
+			if (!p_mapping->initialized) {
+				p_mapping->dvo_port = child->dvo_port;
+				p_mapping->dvo_wiring = child->dvo_wiring;
+				p_mapping->initialized = 1;
+				p_mapping->slave_addr = child->slave_addr;
+			} else {
+				xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+					   "One DVO port is shared by two slave "
+					   "address. Maybe it can't be handled\n");
+			}
+			/* If there exists the slave2_addr, maybe it is a sdvo
+			 * device that contain multiple inputs. And it can't
+			 * handled by SDVO driver.
+			 * Ignore the dvo mapping of slave2_addr
+			 * of course its mapping info won't be added.
+			 */
+			if (child->slave2_addr) {
+				xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+					   "Two DVO ports uses the same slave address."
+					   "Maybe it can't be handled by SDVO driver\n");
+			}
+			count++;
+		} else {
+			/* if the slave address is neither 0x70 nor 0x72, skip it. */
+			continue;
+		}
+	}
+	/* If the count is zero, it indicates that no sdvo device is found */
+	if (!count)
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "No SDVO device is found in VBT\n");
 
-    feature = find_section(bdb, BDB_DRIVER_FEATURES);
-    if (!feature)
 	return;
-
-    if (feature->lvds_config != BDB_DRIVER_INT_LVDS)
-	pI830->integrated_lvds = FALSE;
 }
 
 #define INTEL_VBIOS_SIZE (64 * 1024)	/* XXX */
@@ -207,80 +335,62 @@ parse_driver_feature(I830Ptr pI830, stru
  *
  * Returns 0 on success, nonzero on failure.
  */
-int
-i830_bios_init(ScrnInfoPtr pScrn)
+int i830_bios_init(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct vbt_header *vbt;
-    struct bdb_header *bdb;
-    int vbt_off, bdb_off;
-    unsigned char *bios;
-    int ret;
-    int size;
-
-#if XSERVER_LIBPCIACCESS
-    size = pI830->PciInfo->rom_size;
-    if (size == 0) {
-	size = INTEL_VBIOS_SIZE;
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "libpciaccess reported 0 rom size, guessing %dkB\n",
-		   size / 1024);
-    }
-#else
-    size = INTEL_VBIOS_SIZE;
-#endif
-    bios = xalloc(size);
-    if (bios == NULL)
-	return -1;
-
-#if XSERVER_LIBPCIACCESS
-    ret = pci_device_read_rom (pI830->PciInfo, bios);
-    if (ret != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-                  "libpciaccess failed to read %dkB video BIOS: %s\n",
-                  size / 1024,
-#ifndef __linux__
-	          strerror(ret));
-#else
-                  strerror(-ret));
-#endif
-	xfree (bios);
-	return -1;
-    }
-#else
-    /* xf86ReadPciBIOS returns the length read */
-    ret = xf86ReadPciBIOS(0, pI830->PciTag, 0, bios, size);
-    if (ret <= 0) {
-	xfree (bios);
-	return -1;
-    }
-#endif
-
-    vbt_off = INTEL_BIOS_16(0x1a);
-    if (vbt_off >= size) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Bad VBT offset: 0x%x\n",
-		   vbt_off);
-	xfree(bios);
-	return -1;
-    }
-
-    vbt = (struct vbt_header *)(bios + vbt_off);
-
-    if (memcmp(vbt->signature, "$VBT", 4) != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Bad VBT signature\n");
-	xfree(bios);
-	return -1;
-    }
-
-    /* Now that we've found the VBIOS, go scour the VBTs */
-    bdb_off = vbt_off + vbt->bdb_offset;
-    bdb = (struct bdb_header *)(bios + bdb_off);
-
-    parse_general_features(pI830, bdb);
-    parse_panel_data(pI830, bdb);
-    parse_driver_feature(pI830, bdb);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct vbt_header *vbt;
+	struct bdb_header *bdb;
+	int vbt_off, bdb_off;
+	unsigned char *bios;
+	int ret;
+	int size;
+
+	size = intel->PciInfo->rom_size;
+	if (size == 0) {
+		size = INTEL_VBIOS_SIZE;
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "libpciaccess reported 0 rom size, guessing %dkB\n",
+			   size / 1024);
+	}
+	bios = malloc(size);
+	if (bios == NULL)
+		return -1;
+
+	ret = pci_device_read_rom(intel->PciInfo, bios);
+	if (ret != 0) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "libpciaccess failed to read %dkB video BIOS: %s\n",
+			   size / 1024, strerror(-ret));
+		free(bios);
+		return -1;
+	}
+
+	vbt_off = INTEL_BIOS_16(0x1a);
+	if (vbt_off >= size) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Bad VBT offset: 0x%x\n",
+			   vbt_off);
+		free(bios);
+		return -1;
+	}
+
+	vbt = (struct vbt_header *)(bios + vbt_off);
+
+	if (memcmp(vbt->signature, "$VBT", 4) != 0) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Bad VBT signature\n");
+		free(bios);
+		return -1;
+	}
+
+	/* Now that we've found the VBIOS, go scour the VBTs */
+	bdb_off = vbt_off + vbt->bdb_offset;
+	bdb = (struct bdb_header *)(bios + bdb_off);
+
+	parse_general_features(intel, bdb);
+	parse_panel_data(intel, bdb);
+	parse_driver_feature(intel, bdb);
+	parse_sdvo_mapping(scrn, bdb);
 
-    xfree(bios);
+	free(bios);
 
-    return 0;
+	return 0;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.h	2011-02-08 11:14:00.000000000 +0100
@@ -34,22 +34,22 @@
 #endif
 
 struct vbt_header {
-    char signature[20];			/**< Always starts with 'VBT$' */
-    uint16_t version;			/**< decimal */
-    uint16_t header_size;		/**< in bytes */
-    uint16_t vbt_size;			/**< in bytes */
-    uint8_t vbt_checksum;
-    uint8_t reserved0;
-    uint32_t bdb_offset;		/**< from beginning of VBT */
-    uint32_t aim_offset[4];		/**< from beginning of VBT */
-} __attribute__((packed));
+	char signature[20];		/**< Always starts with 'VBT$' */
+	uint16_t version;		/**< decimal */
+	uint16_t header_size;		/**< in bytes */
+	uint16_t vbt_size;		/**< in bytes */
+	uint8_t vbt_checksum;
+	uint8_t reserved0;
+	uint32_t bdb_offset;		/**< from beginning of VBT */
+	uint32_t aim_offset[4];		/**< from beginning of VBT */
+} __attribute__ ((packed));
 
 struct bdb_header {
-    char signature[16];			/**< Always 'BIOS_DATA_BLOCK' */
-    uint16_t version;			/**< decimal */
-    uint16_t header_size;		/**< in bytes */
-    uint16_t bdb_size;			/**< in bytes */
-} __attribute__((packed));
+	char signature[16];		/**< Always 'BIOS_DATA_BLOCK' */
+	uint16_t version;		/**< decimal */
+	uint16_t header_size;		/**< in bytes */
+	uint16_t bdb_size;		/**< in bytes */
+} __attribute__ ((packed));
 
 /*
  * There are several types of BIOS data blocks (BDBs), each block has
@@ -76,7 +76,7 @@ struct bdb_header {
 #define BDB_DRIVER_ROTATION	 18
 #define BDB_DISPLAY_REMOVE	 19
 #define BDB_OEM_CUSTOM		 20
-#define BDB_EFP_LIST		 21 /* workarounds for VGA hsync/vsync */
+#define BDB_EFP_LIST		 21	/* workarounds for VGA hsync/vsync */
 #define BDB_SDVO_LVDS_OPTIONS	 22
 #define BDB_SDVO_PANEL_DTDS	 23
 #define BDB_SDVO_LVDS_PNP_IDS	 24
@@ -87,51 +87,51 @@ struct bdb_header {
 #define BDB_LVDS_LFP_DATA	 42
 #define BDB_LVDS_BACKLIGHT	 43
 #define BDB_LVDS_POWER		 44
-#define BDB_SKIP		254 /* VBIOS private block, ignore */
+#define BDB_SKIP		254	/* VBIOS private block, ignore */
 
 struct bdb_general_features {
-        /* bits 1 */
+	/* bits 1 */
 	unsigned char panel_fitting:2;
 	unsigned char flexaim:1;
 	unsigned char msg_enable:1;
 	unsigned char clear_screen:3;
 	unsigned char color_flip:1;
 
-        /* bits 2 */
+	/* bits 2 */
 	unsigned char download_ext_vbt:1;
 	unsigned char enable_ssc:1;
 	unsigned char ssc_freq:1;
 	unsigned char enable_lfp_on_override:1;
 	unsigned char disable_ssc_ddt:1;
-	unsigned char rsvd8:3; /* finish byte */
+	unsigned char rsvd8:3;	/* finish byte */
 
-        /* bits 3 */
+	/* bits 3 */
 	unsigned char disable_smooth_vision:1;
 	unsigned char single_dvi:1;
-	unsigned char rsvd9:6; /* finish byte */
+	unsigned char rsvd9:6;	/* finish byte */
 
-        /* bits 4 */
+	/* bits 4 */
 	unsigned char legacy_monitor_detect;
 
-        /* bits 5 */
+	/* bits 5 */
 	unsigned char int_crt_support:1;
 	unsigned char int_tv_support:1;
-	unsigned char rsvd11:6; /* finish byte */
-} __attribute__((packed));
+	unsigned char rsvd11:6;	/* finish byte */
+} __attribute__ ((packed));
 
-#define GPIO_PIN_NONE		0x00 /* "N/A" */
-#define	GPIO_PIN_I2C		0x01 /* "I2C GPIO pins" */
-#define	GPIO_PIN_CRT_DDC	0x02 /* "Analog CRT DDC GPIO pins" */
+#define GPIO_PIN_NONE		0x00	/* "N/A" */
+#define	GPIO_PIN_I2C		0x01	/* "I2C GPIO pins" */
+#define	GPIO_PIN_CRT_DDC	0x02	/* "Analog CRT DDC GPIO pins" */
 /* 915+ */
-#define	GPIO_PIN_LVDS		0x03 /* "Integrated LVDS DDC GPIO pins" */
-#define	GPIO_PIN_SDVO_I2C	0x05 /* "sDVO I2C GPIO pins" */
-#define	GPIO_PIN_SDVO_DDC1	0x1D /* "SDVO DDC1 GPIO pins" */
-#define	GPIO_PIN_SDVO_DDC2	0x2D /* "SDVO DDC2 GPIO pins" */
+#define	GPIO_PIN_LVDS		0x03	/* "Integrated LVDS DDC GPIO pins" */
+#define	GPIO_PIN_SDVO_I2C	0x05	/* "sDVO I2C GPIO pins" */
+#define	GPIO_PIN_SDVO_DDC1	0x1D	/* "SDVO DDC1 GPIO pins" */
+#define	GPIO_PIN_SDVO_DDC2	0x2D	/* "SDVO DDC2 GPIO pins" */
 /* pre-915 */
-#define	GPIO_PIN_DVI_LVDS	0x03 /* "DVI/LVDS DDC GPIO pins" */
-#define	GPIO_PIN_ADD_I2C	0x05 /* "ADDCARD I2C GPIO pins" */
-#define	GPIO_PIN_ADD_DDC	0x04 /* "ADDCARD DDC GPIO pins" */
-#define	GPIO_PIN_ADD_DDC_I2C	0x06 /* "ADDCARD DDC/I2C GPIO pins" */
+#define	GPIO_PIN_DVI_LVDS	0x03	/* "DVI/LVDS DDC GPIO pins" */
+#define	GPIO_PIN_ADD_I2C	0x05	/* "ADDCARD I2C GPIO pins" */
+#define	GPIO_PIN_ADD_DDC	0x04	/* "ADDCARD DDC GPIO pins" */
+#define	GPIO_PIN_ADD_DDC_I2C	0x06	/* "ADDCARD DDC/I2C GPIO pins" */
 
 /* Pre 915 */
 #define DEVICE_TYPE_NONE	0x00
@@ -181,40 +181,40 @@ struct bdb_general_features {
 #define DEVICE_WIRE_DVOB_MASTER	0x0d
 #define DEVICE_WIRE_DVOC_MASTER	0x0e
 
-#define DEVICE_PORT_DVOA	0x00 /* none on 845+ */
+#define DEVICE_PORT_DVOA	0x00	/* none on 845+ */
 #define DEVICE_PORT_DVOB	0x01
 #define DEVICE_PORT_DVOC	0x02
 
 struct child_device_config {
-    uint16_t handle;
-    uint16_t device_type; /* See DEVICE_TYPE_* above */
-    uint8_t device_id[10];
-    uint16_t addin_offset;
-    uint8_t dvo_port; /* See DEVICE_PORT_* above */
-    uint8_t i2c_pin;
-    uint8_t slave_addr;
-    uint8_t ddc_pin;
-    uint16_t edid_ptr;
-    uint8_t dvo_cfg; /* See DEVICE_CFG_* above */
-    uint8_t dvo2_port;
-    uint8_t i2c2_pin;
-    uint8_t slave2_addr;
-    uint8_t ddc2_pin;
-    uint8_t capabilities;
-    uint8_t dvo_wiring; /* See DEVICE_WIRE_* above */
-    uint8_t dvo2_wiring;
-    uint16_t extended_type;
-    uint8_t dvo_function;
-} __attribute__((packed));
+	uint16_t handle;
+	uint16_t device_type;	/* See DEVICE_TYPE_* above */
+	uint8_t device_id[10];
+	uint16_t addin_offset;
+	uint8_t dvo_port;	/* See DEVICE_PORT_* above */
+	uint8_t i2c_pin;
+	uint8_t slave_addr;
+	uint8_t ddc_pin;
+	uint16_t edid_ptr;
+	uint8_t dvo_cfg;	/* See DEVICE_CFG_* above */
+	uint8_t dvo2_port;
+	uint8_t i2c2_pin;
+	uint8_t slave2_addr;
+	uint8_t ddc2_pin;
+	uint8_t capabilities;
+	uint8_t dvo_wiring;	/* See DEVICE_WIRE_* above */
+	uint8_t dvo2_wiring;
+	uint16_t extended_type;
+	uint8_t dvo_function;
+} __attribute__ ((packed));
 
 struct bdb_general_definitions {
-	unsigned char crt_ddc_gmbus_pin; /* see GPIO_PIN_* above */
+	unsigned char crt_ddc_gmbus_pin;	/* see GPIO_PIN_* above */
 
 	/* DPMS bits */
 	unsigned char dpms_acpi:1;
 	unsigned char skip_boot_crt_detect:1;
 	unsigned char dpms_aim:1;
-	unsigned char rsvd1:5; /* finish byte */
+	unsigned char rsvd1:5;	/* finish byte */
 
 	/* boot device bits */
 	unsigned char boot_display[2];
@@ -228,109 +228,109 @@ struct bdb_general_definitions {
 	 * TV and LVDS are missing, so be careful when interpreting
 	 * [4] and [5].
 	 */
-	struct child_device_config devices[6];
+	struct child_device_config devices[0];
 	/* may be another device block here on some platforms */
-} __attribute__((packed));
+} __attribute__ ((packed));
 
 #define DEVICE_CHILD_SIZE 7
 
 struct bdb_child_devices {
-    uint8_t child_structure_size;
-    struct child_device_config children[DEVICE_CHILD_SIZE];
-} __attribute__((packed));
+	uint8_t child_structure_size;
+	struct child_device_config children[DEVICE_CHILD_SIZE];
+} __attribute__ ((packed));
 
 struct bdb_lvds_options {
-    uint8_t panel_type;
-    uint8_t rsvd1;
-    /* LVDS capabilities, stored in a dword */
-    uint8_t pfit_mode:2;
-    uint8_t pfit_text_mode_enhanced:1;
-    uint8_t pfit_gfx_mode_enhanced:1;
-    uint8_t pfit_ratio_auto:1;
-    uint8_t pixel_dither:1;
-    uint8_t lvds_edid:1;
-    uint8_t rsvd2:1;
-    uint8_t rsvd4;
-} __attribute__((packed));
+	uint8_t panel_type;
+	uint8_t rsvd1;
+	/* LVDS capabilities, stored in a dword */
+	uint8_t pfit_mode:2;
+	uint8_t pfit_text_mode_enhanced:1;
+	uint8_t pfit_gfx_mode_enhanced:1;
+	uint8_t pfit_ratio_auto:1;
+	uint8_t pixel_dither:1;
+	uint8_t lvds_edid:1;
+	uint8_t rsvd2:1;
+	uint8_t rsvd4;
+} __attribute__ ((packed));
 
 /* 915+ only */
 struct bdb_tv_features {
-    /* need to verify bit ordering */
-    uint16_t under_over_scan_via_yprpb:2;
-    uint16_t rsvd1:10;
-    uint16_t under_over_scan_via_dvi:2;
-    uint16_t add_overscan_mode:1;
-    uint16_t rsvd2:1;
-} __attribute__((packed));
+	/* need to verify bit ordering */
+	uint16_t under_over_scan_via_yprpb:2;
+	uint16_t rsvd1:10;
+	uint16_t under_over_scan_via_dvi:2;
+	uint16_t add_overscan_mode:1;
+	uint16_t rsvd2:1;
+} __attribute__ ((packed));
 
 struct lvds_fp_timing {
-    uint16_t x_res;
-    uint16_t y_res;
-    uint32_t lvds_reg;
-    uint32_t lvds_reg_val;
-    uint32_t pp_on_reg;
-    uint32_t pp_on_reg_val;
-    uint32_t pp_off_reg;
-    uint32_t pp_off_reg_val;
-    uint32_t pp_cycle_reg;
-    uint32_t pp_cycle_reg_val;
-    uint32_t pfit_reg;
-    uint32_t pfit_reg_val;
-    uint16_t terminator;
-} __attribute__((packed));
+	uint16_t x_res;
+	uint16_t y_res;
+	uint32_t lvds_reg;
+	uint32_t lvds_reg_val;
+	uint32_t pp_on_reg;
+	uint32_t pp_on_reg_val;
+	uint32_t pp_off_reg;
+	uint32_t pp_off_reg_val;
+	uint32_t pp_cycle_reg;
+	uint32_t pp_cycle_reg_val;
+	uint32_t pfit_reg;
+	uint32_t pfit_reg_val;
+	uint16_t terminator;
+} __attribute__ ((packed));
 
 struct lvds_dvo_timing {
-    uint16_t dclk;		/**< In 10khz */
-    uint8_t hactive;
-    uint8_t hblank;
-    uint8_t high_h;		/**< 7:4 = hactive 11:8, 3:0 = hblank 11:8 */
-    uint8_t vactive;
-    uint8_t vblank;
-    uint8_t high_v;		/**< 7:4 = vactive 11:8, 3:0 = vblank 11:8 */
-    uint8_t hsync_off;
-    uint8_t hsync_pulse_width;
-    uint8_t vsync_off;
-    uint8_t high_hsync_off;	/**< 7:6 = hsync off 9:8 */
-    uint8_t h_image;
-    uint8_t v_image;
-    uint8_t max_hv;
-    uint8_t h_border;
-    uint8_t v_border;
-    uint8_t flags;
-} __attribute__((packed));
+	uint16_t dclk;		/**< In 10khz */
+	uint8_t hactive;
+	uint8_t hblank;
+	uint8_t high_h;		/**< 7:4 = hactive 11:8, 3:0 = hblank 11:8 */
+	uint8_t vactive;
+	uint8_t vblank;
+	uint8_t high_v;		/**< 7:4 = vactive 11:8, 3:0 = vblank 11:8 */
+	uint8_t hsync_off;
+	uint8_t hsync_pulse_width;
+	uint8_t vsync_off;
+	uint8_t high_hsync_off;	/**< 7:6 = hsync off 9:8 */
+	uint8_t h_image;
+	uint8_t v_image;
+	uint8_t max_hv;
+	uint8_t h_border;
+	uint8_t v_border;
+	uint8_t flags;
+} __attribute__ ((packed));
 
 struct lvds_pnp_id {
-    uint16_t mfg_name;
-    uint16_t product_code;
-    uint32_t serial;
-    uint8_t mfg_week;
-    uint8_t mfg_year;
-} __attribute__((packed));;
+	uint16_t mfg_name;
+	uint16_t product_code;
+	uint32_t serial;
+	uint8_t mfg_week;
+	uint8_t mfg_year;
+} __attribute__ ((packed));;
 
 /* LFP pointer table contains entries to the struct below */
 struct bdb_lvds_lfp_data_ptr {
-    uint16_t fp_timing_offset; /* offsets are from start of bdb */
-    uint8_t fp_table_size;
-    uint16_t dvo_timing_offset;
-    uint8_t dvo_table_size;
-    uint16_t panel_pnp_id_offset;
-    uint8_t pnp_table_size;
-} __attribute__((packed));
+	uint16_t fp_timing_offset;	/* offsets are from start of bdb */
+	uint8_t fp_table_size;
+	uint16_t dvo_timing_offset;
+	uint8_t dvo_table_size;
+	uint16_t panel_pnp_id_offset;
+	uint8_t pnp_table_size;
+} __attribute__ ((packed));
 
 struct bdb_lvds_lfp_data_ptrs {
-    uint8_t lvds_entries;
-    struct bdb_lvds_lfp_data_ptr ptr[16];
-} __attribute__((packed));
+	uint8_t lvds_entries;
+	struct bdb_lvds_lfp_data_ptr ptr[16];
+} __attribute__ ((packed));
 
 struct bdb_lvds_lfp_data_entry {
-    struct lvds_fp_timing fp_timing;
-    struct lvds_dvo_timing dvo_timing;
-    struct lvds_pnp_id pnp_id;
-} __attribute__((packed));
+	struct lvds_fp_timing fp_timing;
+	struct lvds_dvo_timing dvo_timing;
+	struct lvds_pnp_id pnp_id;
+} __attribute__ ((packed));
 
 struct bdb_lvds_lfp_data {
-    struct bdb_lvds_lfp_data_entry data[16];
-} __attribute__((packed));
+	struct bdb_lvds_lfp_data_entry data[16];
+} __attribute__ ((packed));
 
 #define BACKLIGHT_TYPE_NONE 0
 #define BACKLIGHT_TYPE_I2C 1
@@ -342,58 +342,96 @@ struct bdb_lvds_lfp_data {
 #define BACKLIGHT_GMBUS_1MHZ	3
 
 struct backlight_info {
-    uint8_t inverter_type:2; /* see BACKLIGHT_TYPE_* above */
-    uint8_t inverter_polarity:1; /* 1 means 0 is max, 255 is min */
-    uint8_t gpio_pins:3; /* see GPIO_PIN_* above */
-    uint8_t gmbus_speed:2;
-    uint16_t pwm_frequency; /* in Hz */
-    uint8_t min_brightness;
-    /* Next two are only for 915+ systems */
-    uint8_t i2c_addr;
-    uint8_t i2c_cmd;
+	uint8_t inverter_type:2;	/* see BACKLIGHT_TYPE_* above */
+	uint8_t inverter_polarity:1;	/* 1 means 0 is max, 255 is min */
+	uint8_t gpio_pins:3;	/* see GPIO_PIN_* above */
+	uint8_t gmbus_speed:2;
+	uint16_t pwm_frequency;	/* in Hz */
+	uint8_t min_brightness;
+	/* Next two are only for 915+ systems */
+	uint8_t i2c_addr;
+	uint8_t i2c_cmd;
 } __attribute((packed));
 
 struct bdb_backlight_control {
-    uint8_t row_size;
-    struct backlight_info lfps[16];
-} __attribute__((packed));
+	uint8_t row_size;
+	struct backlight_info lfps[16];
+} __attribute__ ((packed));
 
 struct bdb_bia {
-    uint8_t bia_enable:1;
-    uint8_t bia_level:3;
-    uint8_t rsvd1:3;
-    uint8_t als_enable:1;
-    uint8_t als_response_data[20];
+	uint8_t bia_enable:1;
+	uint8_t bia_level:3;
+	uint8_t rsvd1:3;
+	uint8_t als_enable:1;
+	uint8_t als_response_data[20];
 } __attribute((packed));
 
 struct aimdb_header {
-    char    signature[16];
-    char    oem_device[20];
-    uint16_t  aimdb_version;
-    uint16_t  aimdb_header_size;
-    uint16_t  aimdb_size;
-} __attribute__((packed));
+	char signature[16];
+	char oem_device[20];
+	uint16_t aimdb_version;
+	uint16_t aimdb_header_size;
+	uint16_t aimdb_size;
+} __attribute__ ((packed));
 
 struct aimdb_block {
-    uint8_t   aimdb_id;
-    uint16_t  aimdb_size;
-} __attribute__((packed));
+	uint8_t aimdb_id;
+	uint16_t aimdb_size;
+} __attribute__ ((packed));
 
 struct vch_panel_data {
-    uint16_t	fp_timing_offset;
-    uint8_t	fp_timing_size;
-    uint16_t	dvo_timing_offset;
-    uint8_t	dvo_timing_size;
-    uint16_t	text_fitting_offset;
-    uint8_t	text_fitting_size;
-    uint16_t	graphics_fitting_offset;
-    uint8_t	graphics_fitting_size;
-} __attribute__((packed));
+	uint16_t fp_timing_offset;
+	uint8_t fp_timing_size;
+	uint16_t dvo_timing_offset;
+	uint8_t dvo_timing_size;
+	uint16_t text_fitting_offset;
+	uint8_t text_fitting_size;
+	uint16_t graphics_fitting_offset;
+	uint8_t graphics_fitting_size;
+} __attribute__ ((packed));
 
 struct vch_bdb_22 {
-    struct aimdb_block	    aimdb_block;
-    struct vch_panel_data   panels[16];
-} __attribute__((packed));
+	struct aimdb_block aimdb_block;
+	struct vch_panel_data panels[16];
+} __attribute__ ((packed));
+
+#define BLC_INVERTER_TYPE_NONE 0
+#define BLC_INVERTER_TYPE_I2C 1
+#define BLC_INVERTER_TYPE_PWM 2
+
+#define BLC_GPIO_NONE 0
+#define BLC_GPIO_I2C 1
+#define BLC_GPIO_CRT_DDC 2
+#define BLC_GPIO_DVI_DDC 3
+#define BLC_GPIO_SDVO_I2C 5
+
+struct blc_struct {
+	uint8_t inverter_type:2;
+	uint8_t inverter_polarity:1;	/* 1 means inverted (0 = max brightness) */
+	uint8_t gpio_pins:3;
+	uint8_t gmbus_speed:2;
+	uint16_t pwm_freq;	/* in Hz */
+	uint8_t min_brightness;	/* (0-255) */
+	uint8_t i2c_slave_addr;
+	uint8_t i2c_cmd;
+} __attribute__ ((packed));
+
+struct bdb_lvds_backlight {
+	uint8_t blcstruct_size;
+	struct blc_struct panels[16];
+} __attribute__ ((packed));
+
+struct bdb_lvds_power {
+	uint8_t dpst_enabled:1;
+	uint8_t pwr_prefs:3;
+	uint8_t rsvd1:3;
+	uint8_t als_enabled:1;
+	uint16_t als_backlight1;
+	uint16_t als_backlight2;
+	uint16_t als_backlight3;
+	uint16_t als_backlight4;
+	uint16_t als_backlight5;
+} __attribute__ ((packed));
 
 #define BDB_DRIVER_NO_LVDS	0
 #define BDB_DRIVER_INT_LVDS	1
@@ -401,43 +439,59 @@ struct vch_bdb_22 {
 #define BDB_DRIVER_EDP		3
 
 struct bdb_driver_feature {
-    uint8_t	boot_dev_algorithm:1;
-    uint8_t	block_display_switch:1;
-    uint8_t	allow_display_switch:1;
-    uint8_t	hotplug_dvo:1;
-    uint8_t	dual_view_zoom:1;
-    uint8_t	int15h_hook:1;
-    uint8_t	sprite_in_clone:1;
-    uint8_t	primary_lfp_id:1;
-
-    uint16_t	boot_mode_x;
-    uint16_t	boot_mode_y;
-    uint8_t	boot_mode_bpp;
-    uint8_t	boot_mode_refresh;
-
-    uint16_t	enable_lfp_primary:1;
-    uint16_t	selective_mode_pruning:1;
-    uint16_t	dual_frequency:1;
-    uint16_t	render_clock_freq:1; /* 0: high freq; 1: low freq */
-    uint16_t	nt_clone_support:1;
-    uint16_t	power_scheme_ui:1; /* 0: CUI; 1: 3rd party */
-    uint16_t	sprite_display_assign:1; /* 0: secondary; 1: primary */
-    uint16_t	cui_aspect_scaling:1;
-    uint16_t	preserve_aspect_ratio:1;
-    uint16_t	sdvo_device_power_down:1;
-    uint16_t	crt_hotplug:1;
-    uint16_t	lvds_config:2;
-    uint16_t	reserved:3;
-
-    uint8_t	static_display:1;
-    uint8_t	reserved2:7;
-    uint16_t	legacy_crt_max_x;
-    uint16_t	legacy_crt_max_y;
-    uint8_t	legacy_crt_max_refresh;
-} __attribute__((packed));
+	uint8_t boot_dev_algorithm:1;
+	uint8_t block_display_switch:1;
+	uint8_t allow_display_switch:1;
+	uint8_t hotplug_dvo:1;
+	uint8_t dual_view_zoom:1;
+	uint8_t int15h_hook:1;
+	uint8_t sprite_in_clone:1;
+	uint8_t primary_lfp_id:1;
+
+	uint16_t boot_mode_x;
+	uint16_t boot_mode_y;
+	uint8_t boot_mode_bpp;
+	uint8_t boot_mode_refresh;
+
+	uint16_t enable_lfp_primary:1;
+	uint16_t selective_mode_pruning:1;
+	uint16_t dual_frequency:1;
+	uint16_t render_clock_freq:1;	/* 0: high freq; 1: low freq */
+	uint16_t nt_clone_support:1;
+	uint16_t power_scheme_ui:1;	/* 0: CUI; 1: 3rd party */
+	uint16_t sprite_display_assign:1;	/* 0: secondary; 1: primary */
+	uint16_t cui_aspect_scaling:1;
+	uint16_t preserve_aspect_ratio:1;
+	uint16_t sdvo_device_power_down:1;
+	uint16_t crt_hotplug:1;
+	uint16_t lvds_config:2;
+	uint16_t reserved:3;
+
+	uint8_t static_display:1;
+	uint8_t reserved2:7;
+	uint16_t legacy_crt_max_x;
+	uint16_t legacy_crt_max_y;
+	uint8_t legacy_crt_max_refresh;
+} __attribute__ ((packed));
+
+struct bdb_sdvo_lvds_options {
+	uint8_t panel_backlight;
+	uint8_t h40_set_panel_type;
+	uint8_t panel_type;
+	uint8_t ssc_clk_freq;
+	uint16_t als_low_trip;
+	uint16_t als_high_trip;
+	uint8_t sclalarcoeff_tab_row_num;
+	uint8_t sclalarcoeff_tab_row_size;
+	uint8_t coefficient[8];
+	uint8_t panel_misc_bits_1;
+	uint8_t panel_misc_bits_2;
+	uint8_t panel_misc_bits_3;
+	uint8_t panel_misc_bits_4;
+} __attribute__ ((packed));
 
 #ifndef REG_DUMPER
-int i830_bios_init(ScrnInfoPtr pScrn);
+int i830_bios_init(ScrnInfoPtr scrn);
 #endif
 
 /*
@@ -459,12 +513,12 @@ int i830_bios_init(ScrnInfoPtr pScrn);
  */
 
 /* GR18 bits are set on display switch and hotkey events */
-#define GR18_DRIVER_SWITCH_EN	(1<<7) /* 0: VBIOS control, 1: driver control */
-#define GR18_HOTKEY_MASK	0x78 /* See also SWF4 15:0 */
+#define GR18_DRIVER_SWITCH_EN	(1<<7)	/* 0: VBIOS control, 1: driver control */
+#define GR18_HOTKEY_MASK	0x78	/* See also SWF4 15:0 */
 #define   GR18_HK_NONE		(0x0<<3)
 #define   GR18_HK_LFP_STRETCH	(0x1<<3)
 #define   GR18_HK_TOGGLE_DISP	(0x2<<3)
-#define   GR18_HK_DISP_SWITCH	(0x4<<3) /* see SWF14 15:0 for what to enable */
+#define   GR18_HK_DISP_SWITCH	(0x4<<3)	/* see SWF14 15:0 for what to enable */
 #define   GR18_HK_POPUP_DISABLED (0x6<<3)
 #define   GR18_HK_POPUP_ENABLED	(0x7<<3)
 #define   GR18_HK_PFIT		(0x8<<3)
@@ -486,7 +540,7 @@ int i830_bios_init(ScrnInfoPtr pScrn);
 
 #define SWF10_VBIOS_BLC_I2C_EN	(1<<29)
 #define SWF10_GTT_OVERRIDE_EN	(1<<28)
-#define SWF10_LFP_DPMS_OVR	(1<<27) /* override DPMS on display switch */
+#define SWF10_LFP_DPMS_OVR	(1<<27)	/* override DPMS on display switch */
 #define SWF10_ACTIVE_TOGGLE_LIST_MASK (7<<24)
 #define   SWF10_OLD_TOGGLE	0x0
 #define   SWF10_TOGGLE_LIST_1	0x1
@@ -525,7 +579,7 @@ int i830_bios_init(ScrnInfoPtr pScrn);
 #define SWF11_DISPLAY_HOLDOFF	(1<<13)
 #define SWF11_DPMS_REDUCED	(1<<12)
 #define SWF11_IS_VBE_MODE	(1<<11)
-#define SWF11_PIPEB_ACCESS	(1<<10) /* 0 here means pipe a */
+#define SWF11_PIPEB_ACCESS	(1<<10)	/* 0 here means pipe a */
 #define SWF11_DPMS_MASK		0x07
 #define   SWF11_DPMS_OFF	(1<<2)
 #define   SWF11_DPMS_SUSPEND	(1<<1)
@@ -538,7 +592,7 @@ int i830_bios_init(ScrnInfoPtr pScrn);
 #define SWF14_POPUP_EN		(1<<28)
 #define SWF14_DISPLAY_HOLDOFF	(1<<27)
 #define SWF14_DISP_DETECT_EN	(1<<26)
-#define SWF14_DOCKING_STATUS_DOCKED (1<<25) /* 0 here means undocked */
+#define SWF14_DOCKING_STATUS_DOCKED (1<<25)	/* 0 here means undocked */
 #define SWF14_DRIVER_STATUS	(1<<24)
 #define SWF14_OS_TYPE_WIN9X	(1<<23)
 #define SWF14_OS_TYPE_WINNT	(1<<22)
@@ -548,8 +602,8 @@ int i830_bios_init(ScrnInfoPtr pScrn);
 #define   SWF14_PM_ACPI		(0x3 << 16)
 #define   SWF14_PM_APM_12	(0x2 << 16)
 #define   SWF14_PM_APM_11	(0x1 << 16)
-#define SWF14_HK_REQUEST_MASK	0x0000ffff /* see GR18 6:3 for event type */
-          /* if GR18 indicates a display switch */
+#define SWF14_HK_REQUEST_MASK	0x0000ffff	/* see GR18 6:3 for event type */
+	  /* if GR18 indicates a display switch */
 #define   SWF14_DS_PIPEB_LFP2_EN (1<<15)
 #define   SWF14_DS_PIPEB_EFP2_EN (1<<14)
 #define   SWF14_DS_PIPEB_TV2_EN  (1<<13)
@@ -566,9 +620,9 @@ int i830_bios_init(ScrnInfoPtr pScrn);
 #define   SWF14_DS_PIPEA_EFP_EN  (1<<2)
 #define   SWF14_DS_PIPEA_TV_EN   (1<<1)
 #define   SWF14_DS_PIPEA_CRT_EN  (1<<0)
-          /* if GR18 indicates a panel fitting request */
-#define   SWF14_PFIT_EN		(1<<0) /* 0 means disable */
-          /* if GR18 indicates an APM change request */
+	  /* if GR18 indicates a panel fitting request */
+#define   SWF14_PFIT_EN		(1<<0)	/* 0 means disable */
+	  /* if GR18 indicates an APM change request */
 #define   SWF14_APM_HIBERNATE	0x4
 #define   SWF14_APM_SUSPEND	0x3
 #define   SWF14_APM_STANDBY	0x1
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_common.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_common.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_common.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_common.h	2011-02-08 11:14:00.000000000 +0100
@@ -26,8 +26,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_common.h,v 1.1 2002/09/11 00:29:32 dawes Exp $ */
-
 #ifndef _I830_COMMON_H_
 #define _I830_COMMON_H_
 
@@ -36,7 +34,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define I830_NR_TEX_REGIONS 255	/* maximum due to use of chars for next/prev */
 #define I830_LOG_MIN_TEX_REGION_SIZE 14
 
-
 /* Driver specific DRM command indices
  * NOTE: these are not OS specific, but they are driver specific
  */
@@ -57,43 +54,42 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DRM_I830_GET_VBLANK_PIPE	  0x0e
 #define DRM_I830_HWS_PAGE_ADDR		  0x11
 
-
 typedef struct {
-   enum {
-      I830_INIT_DMA = 0x01,
-      I830_CLEANUP_DMA = 0x02,
-      I830_RESUME_DMA = 0x03
-   } func;
-   unsigned int mmio_offset;
-   int sarea_priv_offset;
-   unsigned int ring_start;
-   unsigned int ring_end;
-   unsigned int ring_size;
-   unsigned int front_offset;
-   unsigned int back_offset;
-   unsigned int depth_offset;
-   unsigned int w;
-   unsigned int h;
-   unsigned int pitch; /* Pitch of front buffer in units of pixels */
-   unsigned int pitch_bits;
-   unsigned int back_pitch;
-   unsigned int depth_pitch;
-   unsigned int cpp;
-   unsigned int chipset;
+	enum {
+		I830_INIT_DMA = 0x01,
+		I830_CLEANUP_DMA = 0x02,
+		I830_RESUME_DMA = 0x03
+	} func;
+	unsigned int mmio_offset;
+	int sarea_priv_offset;
+	unsigned int ring_start;
+	unsigned int ring_end;
+	unsigned int ring_size;
+	unsigned int front_offset;
+	unsigned int back_offset;
+	unsigned int depth_offset;
+	unsigned int w;
+	unsigned int h;
+	unsigned int pitch;	/* Pitch of front buffer in units of pixels */
+	unsigned int pitch_bits;
+	unsigned int back_pitch;
+	unsigned int depth_pitch;
+	unsigned int cpp;
+	unsigned int chipset;
 } drmI830Init;
 
 typedef struct {
-	drmTextureRegion texList[I830_NR_TEX_REGIONS+1];
-        int last_upload;	/* last time texture was uploaded */
-        int last_enqueue;	/* last time a buffer was enqueued */
+	drmTextureRegion texList[I830_NR_TEX_REGIONS + 1];
+	int last_upload;	/* last time texture was uploaded */
+	int last_enqueue;	/* last time a buffer was enqueued */
 	volatile int last_dispatch;	/* age of the most recently dispatched buffer */
 	int ctxOwner;		/* last context to upload state */
 	int texAge;
-        int pf_enabled;		/* is pageflipping allowed? */
-        int pf_active;               
-        int pf_current_page;	/* which buffer is being displayed? */
-        int perf_boxes;	        /* performance boxes to be displayed */   
-	int width, height;      /* screen size in pixels */
+	int pf_enabled;		/* is pageflipping allowed? */
+	int pf_active;
+	int pf_current_page;	/* which buffer is being displayed? */
+	int perf_boxes;		/* performance boxes to be displayed */
+	int width, height;	/* screen size in pixels */
 
 	drm_handle_t front_handle;
 	int front_offset;
@@ -112,17 +108,17 @@ typedef struct {
 	int tex_size;
 	int log_tex_granularity;
 	int pitch;
-	int rotation;           /* 0, 90, 180 or 270 */
+	int rotation;		/* 0, 90, 180 or 270 */
 	int rotated_offset;
 	int rotated_size;
 	int rotated_pitch;
 	int virtualX, virtualY;
 
-        unsigned int front_tiled;
-        unsigned int back_tiled;
-        unsigned int depth_tiled;
-        unsigned int rotated_tiled;
-        unsigned int rotated2_tiled;
+	unsigned int front_tiled;
+	unsigned int back_tiled;
+	unsigned int depth_tiled;
+	unsigned int rotated_tiled;
+	unsigned int rotated2_tiled;
 
 	int pipeA_x;
 	int pipeA_y;
@@ -151,31 +147,30 @@ typedef struct {
 
 /* Flags for perf_boxes
  */
-#define I830_BOX_RING_EMPTY    0x1 /* populated by kernel */
-#define I830_BOX_FLIP          0x2 /* populated by kernel */
-#define I830_BOX_WAIT          0x4 /* populated by kernel & client */
-#define I830_BOX_TEXTURE_LOAD  0x8 /* populated by kernel */
-#define I830_BOX_LOST_CONTEXT  0x10 /* populated by client */
-
+#define I830_BOX_RING_EMPTY    0x1	/* populated by kernel */
+#define I830_BOX_FLIP          0x2	/* populated by kernel */
+#define I830_BOX_WAIT          0x4	/* populated by kernel & client */
+#define I830_BOX_TEXTURE_LOAD  0x8	/* populated by kernel */
+#define I830_BOX_LOST_CONTEXT  0x10	/* populated by client */
 
 typedef struct {
-   	int start;		/* agp offset */
+	int start;		/* agp offset */
 	int used;		/* nr bytes in use */
 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
-        int DR4;		/* window origin for GFX_OP_DRAWRECT_INFO*/
+	int DR4;		/* window origin for GFX_OP_DRAWRECT_INFO */
 	int num_cliprects;	/* mulitpass with multiple cliprects? */
-        drm_clip_rect_t *cliprects; /* pointer to userspace cliprects */
+	drm_clip_rect_t *cliprects;	/* pointer to userspace cliprects */
 } drmI830BatchBuffer;
 
 typedef struct {
-   	char *buf;		/* agp offset */
-	int sz; 		/* nr bytes in use */
+	char *buf;		/* agp offset */
+	int sz;			/* nr bytes in use */
 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
-        int DR4;		/* window origin for GFX_OP_DRAWRECT_INFO*/
+	int DR4;		/* window origin for GFX_OP_DRAWRECT_INFO */
 	int num_cliprects;	/* mulitpass with multiple cliprects? */
-        drm_clip_rect_t *cliprects; /* pointer to userspace cliprects */
+	drm_clip_rect_t *cliprects;	/* pointer to userspace cliprects */
 } drmI830CmdBuffer;
- 
+
 typedef struct {
 	int *irq_seq;
 } drmI830IrqEmit;
@@ -190,7 +185,7 @@ typedef struct {
 } drmI830GetParam;
 
 #define I830_PARAM_IRQ_ACTIVE     1
-#define I830_PARAM_ALLOW_BATCHBUFFER   2 
+#define I830_PARAM_ALLOW_BATCHBUFFER   2
 
 typedef struct {
 	int param;
@@ -201,7 +196,6 @@ typedef struct {
 #define I830_SETPARAM_TEX_LRU_LOG_GRANULARITY   2
 #define I830_SETPARAM_ALLOW_BATCHBUFFER         3
 
-
 /* A memory manager for regions of shared memory:
  */
 #define I830_MEM_REGION_AGP 1
@@ -221,7 +215,7 @@ typedef struct {
 typedef struct {
 	int region;
 	int size;
-	int start;	
+	int start;
 } drmI830MemInitHeap;
 
 typedef struct {
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_crt.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_crt.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_crt.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_crt.c	2011-02-08 11:14:00.000000000 +0100
@@ -29,6 +29,8 @@
 #include "config.h"
 #endif
 
+#include <unistd.h>
+
 #include "xf86.h"
 #include "i830.h"
 #include "xf86Modes.h"
@@ -37,11 +39,16 @@
 static void
 i830_crt_dpms(xf86OutputPtr output, int mode)
 {
-    ScrnInfoPtr	    pScrn = output->scrn;
-    I830Ptr	    pI830 = I830PTR(pScrn);
-    uint32_t	    temp;
+    ScrnInfoPtr	    scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    uint32_t	    temp, reg;
+
+    if (IS_IGDNG(intel))
+	reg = PCH_ADPA;
+    else
+	reg = ADPA;
 
-    temp = INREG(ADPA);
+    temp = INREG(reg);
     temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
     temp &= ~ADPA_DAC_ENABLE;
 
@@ -60,32 +67,34 @@ i830_crt_dpms(xf86OutputPtr output, int
 	break;
     }
 
-    OUTREG(ADPA, temp);
+    OUTREG(reg, temp);
 }
 
 static void
 i830_crt_save (xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    uint32_t reg = IS_IGDNG(intel) ? PCH_ADPA : ADPA;
 
-    pI830->saveADPA = INREG(ADPA);
+    intel->saveADPA = INREG(reg);
 }
 
 static void
 i830_crt_restore (xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    uint32_t reg = IS_IGDNG(intel) ? PCH_ADPA : ADPA;
 
-    OUTREG(ADPA, pI830->saveADPA);
+    OUTREG(reg, intel->saveADPA);
 }
 
 static int
 i830_crt_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     int		maxclock;
 
     if (pMode->Flags & V_DBLSCAN)
@@ -94,7 +103,7 @@ i830_crt_mode_valid(xf86OutputPtr output
     if (pMode->Clock < 25000)
 	return MODE_CLOCK_LOW;
 
-    if (!IS_I9XX(pI830))
+    if (!IS_I9XX(intel))
 	maxclock = 350000;
     else
 	maxclock = 400000;
@@ -116,22 +125,29 @@ static void
 i830_crt_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 		  DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private   *intel = intel_get_screen_private(scrn);
     xf86CrtcPtr		    crtc = output->crtc;
     I830CrtcPrivatePtr	    i830_crtc = crtc->driver_private;
     int			    dpll_md_reg;
     uint32_t		    adpa, dpll_md;
+    uint32_t		    adpa_reg;
 
     if (i830_crtc->pipe == 0) 
 	dpll_md_reg = DPLL_A_MD;
     else
 	dpll_md_reg = DPLL_B_MD;
+
+    if (IS_IGDNG(intel))
+	adpa_reg = PCH_ADPA;
+    else
+	adpa_reg = ADPA;
+
     /*
      * Disable separate mode multiplier used when cloning SDVO to CRT
      * XXX this needs to be adjusted when we really are cloning
      */
-    if (IS_I965G(pI830))
+    if (IS_I965G(intel) && !IS_IGDNG(intel))
     {
 	dpll_md = INREG(dpll_md_reg);
 	OUTREG(dpll_md_reg, dpll_md & ~DPLL_MD_UDI_MULTIPLIER_MASK);
@@ -146,15 +162,55 @@ i830_crt_mode_set(xf86OutputPtr output,
     if (i830_crtc->pipe == 0)
     {
 	adpa |= ADPA_PIPE_A_SELECT;
-	OUTREG(BCLRPAT_A, 0);
+	if (!IS_IGDNG(intel))
+	    OUTREG(BCLRPAT_A, 0);
     }
     else
     {
 	adpa |= ADPA_PIPE_B_SELECT;
-	OUTREG(BCLRPAT_B, 0);
+	if (!IS_IGDNG(intel))
+	    OUTREG(BCLRPAT_B, 0);
     }
 
-    OUTREG(ADPA, adpa);
+    OUTREG(adpa_reg, adpa);
+}
+
+static Bool intel_igdng_crt_detect_hotplug(xf86OutputPtr output)
+{
+    ScrnInfoPtr			scrn = output->scrn;
+    intel_screen_private	*intel = intel_get_screen_private(scrn);
+    uint32_t adpa;
+    Bool ret;
+
+    adpa = INREG(PCH_ADPA);
+
+    adpa &= ~ADPA_CRT_HOTPLUG_MASK;
+
+    adpa |= (ADPA_CRT_HOTPLUG_PERIOD_64 |
+	     ADPA_CRT_HOTPLUG_WARMUP_5MS |
+	     ADPA_CRT_HOTPLUG_SAMPLE_2S |
+	     ADPA_CRT_HOTPLUG_VOLTAGE_50 | /* default */
+	     ADPA_CRT_HOTPLUG_VOLREF_325MV);
+    OUTREG(PCH_ADPA, adpa);
+
+    usleep(6000); /* warmup */
+    
+    adpa |= ADPA_CRT_HOTPLUG_FORCE_TRIGGER;
+
+    OUTREG(PCH_ADPA, adpa);
+
+    while (INREG(PCH_ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER)
+      ;
+
+    /* Check the status to see if both blue and green are on now */
+    adpa = INREG(PCH_ADPA) & ADPA_CRT_HOTPLUG_MONITOR_MASK;
+    if (adpa == ADPA_CRT_HOTPLUG_MONITOR_COLOR ||
+	adpa ==	ADPA_CRT_HOTPLUG_MONITOR_MONO)
+	ret = TRUE;
+    else
+	ret = FALSE;
+
+    return ret;
 }
 
 /**
@@ -168,24 +224,27 @@ i830_crt_mode_set(xf86OutputPtr output,
 static Bool
 i830_crt_detect_hotplug(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t	hotplug_en, temp;
     const int	timeout_ms = 1000;
     int		starttime, curtime;
     int		tries = 1;
     int		try;
 
+    if (IS_IGDNG(intel))
+	return intel_igdng_crt_detect_hotplug(output);
+
     /* On 4 series desktop, CRT detect sequence need to be done twice
      * to get a reliable result. */
-    if (IS_G4X(pI830) && !IS_GM45(pI830))
+    if (IS_G4X(intel) && !IS_GM45(intel))
 	tries = 2;
     else
 	tries = 1;
 
     hotplug_en = INREG(PORT_HOTPLUG_EN);
 
-    hotplug_en &= ~CRT_HOTPLUG_MASK;
+    hotplug_en &= CRT_FORCE_HOTPLUG_MASK;
 
     /* This starts the detection sequence */
     hotplug_en |= CRT_HOTPLUG_FORCE_DETECT;
@@ -193,7 +252,7 @@ i830_crt_detect_hotplug(xf86OutputPtr ou
     /* GM45 requires a longer activation period to reliably
      * detect CRT
      */
-    if (IS_GM45(pI830))
+    if (IS_G4X(intel))
 	hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
 
     /* Use the default voltage value */
@@ -235,8 +294,8 @@ static Bool
 i830_crt_detect_load (xf86CrtcPtr	    crtc,
 		      xf86OutputPtr    output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	    i830_crtc = I830CrtcPrivate(crtc);
     uint32_t		    save_bclrpat;
     uint32_t		    save_vtotal;
@@ -282,12 +341,13 @@ i830_crt_detect_load (xf86CrtcPtr	    cr
     /* Set the border color to purple. */
     OUTREG(bclrpat_reg, 0x500050);
     
-    if (IS_I9XX (pI830))
+    if (IS_I9XX (intel))
     {
 	uint32_t	pipeconf = INREG(pipeconf_reg);
 	OUTREG(pipeconf_reg, pipeconf | PIPECONF_FORCE_BORDER);
-	
-	st00 = pI830->readStandard (pI830, 0x3c2);
+        /* Wait for next Vblank to substitue border color for Color info */
+        i830WaitForVblank (scrn);
+	st00 = intel->readStandard (intel, 0x3c2);
 	present = (st00 & (1 << 4)) != 0;
 	OUTREG(pipeconf_reg, pipeconf);
     }
@@ -331,7 +391,7 @@ i830_crt_detect_load (xf86CrtcPtr	    cr
 	do {
 	    count++;
 	    /* Read the ST00 VGA status register */
-	    st00 = pI830->readStandard(pI830, 0x3c2);
+	    st00 = intel->readStandard(intel, 0x3c2);
 	    if (st00 & (1 << 4))
 		detect++;
 	} while ((INREG(pipe_dsl_reg) == dsl));
@@ -366,7 +426,7 @@ i830_crt_detect_load (xf86CrtcPtr	    cr
 static Bool
 i830_crt_detect_ddc(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    i830_output = output->driver_private;
     Bool detect;
 
@@ -374,7 +434,7 @@ i830_crt_detect_ddc(xf86OutputPtr output
     if (i830_output->type != I830_OUTPUT_ANALOG)
 	return FALSE;
 
-    I830I2CInit(pScrn, &i830_output->pDDCBus, GPIOA, "CRTDDC_A");
+    I830I2CInit(scrn, &i830_output->pDDCBus, GPIOA, "CRTDDC_A");
     detect = xf86I2CProbeAddress(i830_output->pDDCBus, 0x00A0);
     xf86DestroyI2CBusRec(i830_output->pDDCBus, TRUE, TRUE);
 
@@ -390,8 +450,8 @@ i830_crt_detect_ddc(xf86OutputPtr output
 static xf86OutputStatus
 i830_crt_detect(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     xf86CrtcPtr		    crtc;
     int			    dpms_mode;
     xf86OutputStatus	    status;
@@ -400,8 +460,8 @@ i830_crt_detect(xf86OutputPtr output)
     /*
      * Try hotplug detection where supported
      */
-    if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
-	    IS_G33CLASS(pI830)) {
+    if (IS_I945G(intel) || IS_I945GM(intel) || IS_I965G(intel) ||
+	    IS_G33CLASS(intel)) {
 	if (i830_crt_detect_hotplug(output))
 	    status = XF86OutputStatusConnected;
 	else
@@ -440,29 +500,36 @@ static void
 i830_crt_destroy (xf86OutputPtr output)
 {
     if (output->driver_private)
-	xfree (output->driver_private);
+	free (output->driver_private);
 }
 
 #ifdef RANDR_GET_CRTC_INTERFACE
 static xf86CrtcPtr
 i830_crt_get_crtc(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     int pipe = !!(INREG(ADPA) & ADPA_PIPE_SELECT_MASK);
    
-    return i830_pipe_to_crtc(pScrn, pipe);
+    return i830_pipe_to_crtc(scrn, pipe);
 }
 #endif
 
 static xf86MonPtr
 i830_get_edid(xf86OutputPtr output, int gpio_reg, char *gpio_str)
 {
+    ScrnInfoPtr	scrn =	    output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     xf86MonPtr		    edid_mon = NULL;
+    uint32_t		    i2c_reg;
 
     /* Set up the DDC bus. */
-    I830I2CInit(output->scrn, &intel_output->pDDCBus, gpio_reg, gpio_str);
+    if (IS_IGDNG(intel))
+	i2c_reg = PCH_GPIOA;
+    else
+	i2c_reg = GPIOA;
+    I830I2CInit(scrn, &intel_output->pDDCBus, i2c_reg, "CRTDDC_A");
 
     edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
 
@@ -470,7 +537,7 @@ i830_get_edid(xf86OutputPtr output, int
 	xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
 	intel_output->pDDCBus = NULL;
 	if (edid_mon) {
-	    xfree(edid_mon);
+	    free(edid_mon);
 	    edid_mon = NULL;
 	}
     }
@@ -523,16 +590,16 @@ static const xf86OutputFuncsRec i830_crt
 };
 
 void
-i830_crt_init(ScrnInfoPtr pScrn)
+i830_crt_init(ScrnInfoPtr scrn)
 {
     xf86OutputPtr	    output;
     I830OutputPrivatePtr    i830_output;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
 
-    if (pI830->quirk_flag & QUIRK_IGNORE_CRT)
+    if (intel->quirk_flag & QUIRK_IGNORE_CRT)
 	return;
 
-    output = xf86OutputCreate (pScrn, &i830_crt_output_funcs, "VGA");
+    output = xf86OutputCreate (scrn, &i830_crt_output_funcs, "VGA");
     if (!output)
 	return;
     i830_output = xnfcalloc (sizeof (I830OutputPrivateRec), 1);
@@ -543,7 +610,7 @@ i830_crt_init(ScrnInfoPtr pScrn)
     }
     i830_output->type = I830_OUTPUT_ANALOG;
     /* i830 (almador) cannot place the analog adaptor on pipe B */
-    if (IS_I830(pI830))
+    if (IS_I830(intel))
 	i830_output->pipe_mask = (1 << 0);
     else
 	i830_output->pipe_mask = ((1 << 0) | (1 << 1));
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_cursor.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_cursor.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_cursor.c	2008-08-02 07:12:39.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_cursor.c	2011-02-08 11:14:00.000000000 +0100
@@ -26,20 +26,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c,v 1.6 2002/12/18 15:49:01 dawes Exp $ */
-
-/*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
 
 /*
  * Authors:
@@ -71,10 +57,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 static void
 I830SetPipeCursorBase (xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr		pScrn = crtc->scrn;
+    ScrnInfoPtr		scrn = crtc->scrn;
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     int			pipe = intel_crtc->pipe;
-    I830Ptr		pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     int			cursor_base;
 
     cursor_base = (pipe == 0) ? CURSOR_A_BASE : CURSOR_B_BASE;
@@ -86,16 +72,16 @@ I830SetPipeCursorBase (xf86CrtcPtr crtc)
 }
 
 void
-I830InitHWCursor(ScrnInfoPtr pScrn)
+I830InitHWCursor(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    I830Ptr		pI830 = I830PTR(pScrn);
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t		temp;
     int			i;
 
     DPRINTF(PFX, "I830InitHWCursor\n");
 
-    if (!IS_I9XX(pI830))
+    if (!IS_I9XX(intel))
        OUTREG(CURSOR_SIZE, (I810_CURSOR_Y << 12) | I810_CURSOR_X);
 
     /* Initialise the HW cursor registers, leaving the cursor hidden. */
@@ -104,7 +90,7 @@ I830InitHWCursor(ScrnInfoPtr pScrn)
 	int   cursor_control = i == 0 ? CURSOR_A_CONTROL : CURSOR_B_CONTROL;
 	
 	temp = INREG(cursor_control);
-	if (IS_MOBILE(pI830) || IS_I9XX(pI830)) 
+	if (IS_MOBILE(intel) || IS_I9XX(intel)) 
 	{
 	    temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE |
 		      MCURSOR_MEM_TYPE_LOCAL |
@@ -133,31 +119,19 @@ I830CursorInit(ScreenPtr pScreen)
 			       HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK |
 			       HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
 			       HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
+			       HARDWARE_CURSOR_UPDATE_UNHIDDEN |
 			       HARDWARE_CURSOR_ARGB));
 }
 
-void
-i830_crtc_load_cursor_image (xf86CrtcPtr crtc, unsigned char *src)
-{
-    I830Ptr		pI830 = I830PTR(crtc->scrn);
-    I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
-    uint8_t		*pcurs;
-
-    pcurs = pI830->FbBase + intel_crtc->cursor_offset;
-
-    intel_crtc->cursor_is_argb = FALSE;
-    memcpy (pcurs, src, I810_CURSOR_X * I810_CURSOR_Y / 4);
-}
-
 #ifdef ARGB_CURSOR
 void
 i830_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
 {
-    I830Ptr		pI830 = I830PTR(crtc->scrn);
+    intel_screen_private *intel = intel_get_screen_private(crtc->scrn);
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     uint32_t		*pcurs;
 
-    pcurs = (uint32_t *) (pI830->FbBase + intel_crtc->cursor_argb_offset);
+    pcurs = (uint32_t *) (intel->FbBase + intel_crtc->cursor_argb_offset);
 
     intel_crtc->cursor_is_argb = TRUE;
     memcpy (pcurs, image, I810_CURSOR_Y * I810_CURSOR_X * 4);
@@ -168,21 +142,21 @@ void
 i830_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
 {
     ScrnInfoPtr		scrn = crtc->scrn;
-    I830Ptr		pI830 = I830PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = I830CrtcPrivate(crtc);
     uint32_t		temp;
 
     temp = 0;
     if (x < 0) {
-	temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
+	temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
 	x = -x;
     }
     if (y < 0) {
-	temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
+	temp |= CURSOR_POS_SIGN << CURSOR_Y_SHIFT;
 	y = -y;
     }
-    temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
-    temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
+    temp |= x << CURSOR_X_SHIFT;
+    temp |= y << CURSOR_Y_SHIFT;
 
     switch (intel_crtc->pipe) {
     case 0:
@@ -201,7 +175,7 @@ void
 i830_crtc_show_cursor (xf86CrtcPtr crtc)
 {
     ScrnInfoPtr		scrn = crtc->scrn;
-    I830Ptr		pI830 = I830PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = I830CrtcPrivate(crtc);
     int			pipe = intel_crtc->pipe;
     uint32_t		temp;
@@ -210,7 +184,7 @@ i830_crtc_show_cursor (xf86CrtcPtr crtc)
     
     temp = INREG(cursor_control);
     
-    if (IS_MOBILE(pI830) || IS_I9XX(pI830)) 
+    if (IS_MOBILE(intel) || IS_I9XX(intel)) 
     {
 	temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
 	if (intel_crtc->cursor_is_argb)
@@ -239,7 +213,7 @@ void
 i830_crtc_hide_cursor (xf86CrtcPtr crtc)
 {
     ScrnInfoPtr		scrn = crtc->scrn;
-    I830Ptr		pI830 = I830PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = I830CrtcPrivate(crtc);
     int			pipe = intel_crtc->pipe;
     uint32_t		temp;
@@ -248,7 +222,7 @@ i830_crtc_hide_cursor (xf86CrtcPtr crtc)
     
     temp = INREG(cursor_control);
     
-    if (IS_MOBILE(pI830) || IS_I9XX(pI830)) 
+    if (IS_MOBILE(intel) || IS_I9XX(intel)) 
     {
 	temp &= ~(CURSOR_MODE|MCURSOR_GAMMA_ENABLE);
 	temp |= CURSOR_MODE_DISABLE;
@@ -265,7 +239,7 @@ void
 i830_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg)
 {
     ScrnInfoPtr		scrn = crtc->scrn;
-    I830Ptr		pI830 = I830PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = I830CrtcPrivate(crtc);
     int			pipe = intel_crtc->pipe;
     int			pal0 = pipe == 0 ? CURSOR_A_PALETTE0 : CURSOR_B_PALETTE0;
@@ -277,25 +251,25 @@ i830_crtc_set_cursor_colors (xf86CrtcPtr
 }
 
 void
-i830_update_cursor_offsets (ScrnInfoPtr pScrn)
+i830_update_cursor_offsets (ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     int i;
 
-    if (pI830->cursor_mem) {
-	unsigned long cursor_offset_base = pI830->cursor_mem->offset;
+    if (intel->cursor_mem) {
+	unsigned long cursor_offset_base = intel->cursor_mem->offset;
 	unsigned long cursor_addr_base, offset = 0;
 
 	/* Single memory buffer for cursors */
-	if (pI830->CursorNeedsPhysical) {
+	if (intel->CursorNeedsPhysical) {
 	    /* On any hardware that requires physical addresses for cursors,
 	     * the PTEs don't support memory above 4GB, so we can safely
 	     * ignore the top 32 bits of cursor_mem->bus_addr.
 	     */
-	    cursor_addr_base = (unsigned long)pI830->cursor_mem->bus_addr;
+	    cursor_addr_base = (unsigned long)intel->cursor_mem->bus_addr;
 	} else
-	    cursor_addr_base = pI830->cursor_mem->offset;
+	    cursor_addr_base = intel->cursor_mem->offset;
 
 	for (i = 0; i < xf86_config->num_crtc; i++) {
 	    xf86CrtcPtr crtc = xf86_config->crtc[i];
@@ -315,19 +289,19 @@ i830_update_cursor_offsets (ScrnInfoPtr
 	    xf86CrtcPtr crtc = xf86_config->crtc[i];
 	    I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
 
-	    if (pI830->CursorNeedsPhysical) {
+	    if (intel->CursorNeedsPhysical) {
 		intel_crtc->cursor_addr =
-		    pI830->cursor_mem_classic[i]->bus_addr;
+		    intel->cursor_mem_classic[i]->bus_addr;
 		intel_crtc->cursor_argb_addr =
-		    pI830->cursor_mem_argb[i]->bus_addr;
+		    intel->cursor_mem_argb[i]->bus_addr;
 	    } else {
 		intel_crtc->cursor_addr =
-		    pI830->cursor_mem_classic[i]->offset;
+		    intel->cursor_mem_classic[i]->offset;
 		intel_crtc->cursor_argb_addr =
-		    pI830->cursor_mem_argb[i]->offset;
+		    intel->cursor_mem_argb[i]->offset;
 	    }
-	    intel_crtc->cursor_offset = pI830->cursor_mem_classic[i]->offset;
-	    intel_crtc->cursor_argb_offset = pI830->cursor_mem_argb[i]->offset;
+	    intel_crtc->cursor_offset = intel->cursor_mem_classic[i]->offset;
+	    intel_crtc->cursor_argb_offset = intel->cursor_mem_argb[i]->offset;
 	}
     }
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c	2011-01-09 21:25:46.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c	2011-02-08 11:14:00.000000000 +0100
@@ -41,8 +41,8 @@
 #include "i830.h"
 #include "i830_bios.h"
 #include "i830_display.h"
-#include "i830_debug.h"
 #include "xf86Modes.h"
+#include "i810_reg.h"
 
 typedef struct {
     /* given values */    
@@ -150,6 +150,16 @@ struct intel_limit {
 #define I9XX_P2_LVDS_FAST		      7
 #define I9XX_P2_LVDS_SLOW_LIMIT		 112000
 
+#define IRONLAKE_P2_DOT_LIMIT    225000 /* 225Mhz */
+#define IRONLAKE_DOT_MIN         25000
+#define IRONLAKE_DOT_MAX         350000
+#define IRONLAKE_VCO_MIN         1760000
+#define IRONLAKE_VCO_MAX         3510000
+#define IRONLAKE_M1_MIN          12
+#define IRONLAKE_M1_MAX          22
+#define IRONLAKE_M2_MIN          5
+#define IRONLAKE_M2_MAX          9
+
 #define INTEL_LIMIT_I8XX_DVO_DAC    0
 #define INTEL_LIMIT_I8XX_LVDS	    1
 #define INTEL_LIMIT_I9XX_SDVO_DAC   2
@@ -239,12 +249,77 @@ struct intel_limit {
 #define G4X_P2_DUAL_LVDS_FAST           7
 #define G4X_P2_DUAL_LVDS_LIMIT          0
 
+/* DAC & HDMI Refclk 120Mhz */
+#define IRONLAKE_DAC_N_MIN     1
+#define IRONLAKE_DAC_N_MAX     5
+#define IRONLAKE_DAC_M_MIN     79
+#define IRONLAKE_DAC_M_MAX     127
+#define IRONLAKE_DAC_P_MIN     5
+#define IRONLAKE_DAC_P_MAX     80
+#define IRONLAKE_DAC_P1_MIN    1
+#define IRONLAKE_DAC_P1_MAX    8
+#define IRONLAKE_DAC_P2_SLOW   10
+#define IRONLAKE_DAC_P2_FAST   5
+
+/* LVDS single-channel 120Mhz refclk */
+#define IRONLAKE_LVDS_S_N_MIN  1
+#define IRONLAKE_LVDS_S_N_MAX  3
+#define IRONLAKE_LVDS_S_M_MIN  79
+#define IRONLAKE_LVDS_S_M_MAX  118
+#define IRONLAKE_LVDS_S_P_MIN  28
+#define IRONLAKE_LVDS_S_P_MAX  112
+#define IRONLAKE_LVDS_S_P1_MIN 2
+#define IRONLAKE_LVDS_S_P1_MAX 8
+#define IRONLAKE_LVDS_S_P2_SLOW        14
+#define IRONLAKE_LVDS_S_P2_FAST        14
+
+/* LVDS dual-channel 120Mhz refclk */
+#define IRONLAKE_LVDS_D_N_MIN  1
+#define IRONLAKE_LVDS_D_N_MAX  3
+#define IRONLAKE_LVDS_D_M_MIN  79
+#define IRONLAKE_LVDS_D_M_MAX  127
+#define IRONLAKE_LVDS_D_P_MIN  14
+#define IRONLAKE_LVDS_D_P_MAX  56
+#define IRONLAKE_LVDS_D_P1_MIN 2
+#define IRONLAKE_LVDS_D_P1_MAX 8
+#define IRONLAKE_LVDS_D_P2_SLOW        7
+#define IRONLAKE_LVDS_D_P2_FAST        7
+
+/* LVDS single-channel 100Mhz refclk */
+#define IRONLAKE_LVDS_S_SSC_N_MIN      1
+#define IRONLAKE_LVDS_S_SSC_N_MAX      2
+#define IRONLAKE_LVDS_S_SSC_M_MIN      79
+#define IRONLAKE_LVDS_S_SSC_M_MAX      126
+#define IRONLAKE_LVDS_S_SSC_P_MIN      28
+#define IRONLAKE_LVDS_S_SSC_P_MAX      112
+#define IRONLAKE_LVDS_S_SSC_P1_MIN     2
+#define IRONLAKE_LVDS_S_SSC_P1_MAX     8
+#define IRONLAKE_LVDS_S_SSC_P2_SLOW    14
+#define IRONLAKE_LVDS_S_SSC_P2_FAST    14
+
+/* LVDS dual-channel 100Mhz refclk */
+#define IRONLAKE_LVDS_D_SSC_N_MIN      1
+#define IRONLAKE_LVDS_D_SSC_N_MAX      3
+#define IRONLAKE_LVDS_D_SSC_M_MIN      79
+#define IRONLAKE_LVDS_D_SSC_M_MAX      126
+#define IRONLAKE_LVDS_D_SSC_P_MIN      14
+#define IRONLAKE_LVDS_D_SSC_P_MAX      42
+#define IRONLAKE_LVDS_D_SSC_P1_MIN     2
+#define IRONLAKE_LVDS_D_SSC_P1_MAX     6
+#define IRONLAKE_LVDS_D_SSC_P2_SLOW    7
+#define IRONLAKE_LVDS_D_SSC_P2_FAST    7
+
 static Bool
 intel_find_pll_i8xx_and_i9xx(const intel_limit_t *, xf86CrtcPtr,
                              int, int, intel_clock_t *);
 static Bool
 intel_find_pll_g4x(const intel_limit_t *, xf86CrtcPtr,
                    int, int, intel_clock_t *);
+static Bool
+intel_igdng_find_best_PLL(const intel_limit_t *, xf86CrtcPtr,
+			  int, int, intel_clock_t *);
+static void
+i830_crtc_load_lut(xf86CrtcPtr crtc);
 
 static const intel_limit_t intel_limits[] = {
     { /* INTEL_LIMIT_I8XX_DVO_DAC */
@@ -404,10 +479,116 @@ static const intel_limit_t intel_limits[
     },
 };
 
+static const intel_limit_t intel_limits_ironlake_dac = {
+    .dot = { .min = IRONLAKE_DOT_MIN,          .max = IRONLAKE_DOT_MAX },
+    .vco = { .min = IRONLAKE_VCO_MIN,          .max = IRONLAKE_VCO_MAX },
+    .n   = { .min = IRONLAKE_DAC_N_MIN,        .max = IRONLAKE_DAC_N_MAX },
+    .m   = { .min = IRONLAKE_DAC_M_MIN,        .max = IRONLAKE_DAC_M_MAX },
+    .m1  = { .min = IRONLAKE_M1_MIN,           .max = IRONLAKE_M1_MAX },
+    .m2  = { .min = IRONLAKE_M2_MIN,           .max = IRONLAKE_M2_MAX },
+    .p   = { .min = IRONLAKE_DAC_P_MIN,        .max = IRONLAKE_DAC_P_MAX },
+    .p1  = { .min = IRONLAKE_DAC_P1_MIN,       .max = IRONLAKE_DAC_P1_MAX },
+    .p2  = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,
+	.p2_slow = IRONLAKE_DAC_P2_SLOW,
+	.p2_fast = IRONLAKE_DAC_P2_FAST },
+    .find_pll = intel_igdng_find_best_PLL,
+};
+
+static const intel_limit_t intel_limits_ironlake_single_lvds = {
+    .dot = { .min = IRONLAKE_DOT_MIN,          .max = IRONLAKE_DOT_MAX },
+    .vco = { .min = IRONLAKE_VCO_MIN,          .max = IRONLAKE_VCO_MAX },
+    .n   = { .min = IRONLAKE_LVDS_S_N_MIN,     .max = IRONLAKE_LVDS_S_N_MAX },
+    .m   = { .min = IRONLAKE_LVDS_S_M_MIN,     .max = IRONLAKE_LVDS_S_M_MAX },
+    .m1  = { .min = IRONLAKE_M1_MIN,           .max = IRONLAKE_M1_MAX },
+    .m2  = { .min = IRONLAKE_M2_MIN,           .max = IRONLAKE_M2_MAX },
+    .p   = { .min = IRONLAKE_LVDS_S_P_MIN,     .max = IRONLAKE_LVDS_S_P_MAX },
+    .p1  = { .min = IRONLAKE_LVDS_S_P1_MIN,    .max = IRONLAKE_LVDS_S_P1_MAX },
+    .p2  = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,
+	.p2_slow = IRONLAKE_LVDS_S_P2_SLOW,
+	.p2_fast = IRONLAKE_LVDS_S_P2_FAST },
+    .find_pll = intel_igdng_find_best_PLL,
+};
+
+static const intel_limit_t intel_limits_ironlake_dual_lvds = {
+    .dot = { .min = IRONLAKE_DOT_MIN,          .max = IRONLAKE_DOT_MAX },
+    .vco = { .min = IRONLAKE_VCO_MIN,          .max = IRONLAKE_VCO_MAX },
+    .n   = { .min = IRONLAKE_LVDS_D_N_MIN,     .max = IRONLAKE_LVDS_D_N_MAX },
+    .m   = { .min = IRONLAKE_LVDS_D_M_MIN,     .max = IRONLAKE_LVDS_D_M_MAX },
+    .m1  = { .min = IRONLAKE_M1_MIN,           .max = IRONLAKE_M1_MAX },
+    .m2  = { .min = IRONLAKE_M2_MIN,           .max = IRONLAKE_M2_MAX },
+    .p   = { .min = IRONLAKE_LVDS_D_P_MIN,     .max = IRONLAKE_LVDS_D_P_MAX },
+    .p1  = { .min = IRONLAKE_LVDS_D_P1_MIN,    .max = IRONLAKE_LVDS_D_P1_MAX },
+    .p2  = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,
+	.p2_slow = IRONLAKE_LVDS_D_P2_SLOW,
+	.p2_fast = IRONLAKE_LVDS_D_P2_FAST },
+   .find_pll = intel_igdng_find_best_PLL,
+};
+
+static const intel_limit_t intel_limits_ironlake_single_lvds_100m = {
+    .dot = { .min = IRONLAKE_DOT_MIN,          .max = IRONLAKE_DOT_MAX },
+    .vco = { .min = IRONLAKE_VCO_MIN,          .max = IRONLAKE_VCO_MAX },
+    .n   = { .min = IRONLAKE_LVDS_S_SSC_N_MIN, .max = IRONLAKE_LVDS_S_SSC_N_MAX },
+    .m   = { .min = IRONLAKE_LVDS_S_SSC_M_MIN, .max = IRONLAKE_LVDS_S_SSC_M_MAX },
+    .m1  = { .min = IRONLAKE_M1_MIN,           .max = IRONLAKE_M1_MAX },
+    .m2  = { .min = IRONLAKE_M2_MIN,           .max = IRONLAKE_M2_MAX },
+    .p   = { .min = IRONLAKE_LVDS_S_SSC_P_MIN, .max = IRONLAKE_LVDS_S_SSC_P_MAX },
+    .p1  = { .min = IRONLAKE_LVDS_S_SSC_P1_MIN,.max = IRONLAKE_LVDS_S_SSC_P1_MAX },
+    .p2  = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,
+	.p2_slow = IRONLAKE_LVDS_S_SSC_P2_SLOW,
+	.p2_fast = IRONLAKE_LVDS_S_SSC_P2_FAST },
+   .find_pll = intel_igdng_find_best_PLL,
+};
+
+static const intel_limit_t intel_limits_ironlake_dual_lvds_100m = {
+    .dot = { .min = IRONLAKE_DOT_MIN,          .max = IRONLAKE_DOT_MAX },
+    .vco = { .min = IRONLAKE_VCO_MIN,          .max = IRONLAKE_VCO_MAX },
+    .n   = { .min = IRONLAKE_LVDS_D_SSC_N_MIN, .max = IRONLAKE_LVDS_D_SSC_N_MAX },
+    .m   = { .min = IRONLAKE_LVDS_D_SSC_M_MIN, .max = IRONLAKE_LVDS_D_SSC_M_MAX },
+    .m1  = { .min = IRONLAKE_M1_MIN,           .max = IRONLAKE_M1_MAX },
+    .m2  = { .min = IRONLAKE_M2_MIN,           .max = IRONLAKE_M2_MAX },
+    .p   = { .min = IRONLAKE_LVDS_D_SSC_P_MIN, .max = IRONLAKE_LVDS_D_SSC_P_MAX },
+    .p1  = { .min = IRONLAKE_LVDS_D_SSC_P1_MIN,.max = IRONLAKE_LVDS_D_SSC_P1_MAX },
+    .p2  = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,
+	.p2_slow = IRONLAKE_LVDS_D_SSC_P2_SLOW,
+	.p2_fast = IRONLAKE_LVDS_D_SSC_P2_FAST },
+   .find_pll = intel_igdng_find_best_PLL,
+};
+
+
+static const intel_limit_t *intel_igdng_limit(xf86CrtcPtr crtc)
+{
+    ScrnInfoPtr	scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    const intel_limit_t *limit;
+
+    if (i830PipeHasType(crtc, I830_OUTPUT_LVDS)) {
+	int refclk = 120;
+
+	if (intel->lvds_use_ssc && intel->lvds_ssc_freq)
+	    refclk = 100;
+
+	if ((INREG(PCH_LVDS) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP) {
+	    if (refclk == 100)
+		limit = &intel_limits_ironlake_dual_lvds_100m;
+	    else
+		limit = &intel_limits_ironlake_dual_lvds;
+	} else {
+	    if (refclk == 100)
+		limit = &intel_limits_ironlake_single_lvds_100m;
+	    else
+		limit = &intel_limits_ironlake_single_lvds;
+	}
+    } else
+	limit = &intel_limits_ironlake_dac;
+
+    return limit;
+}
+
+
 static const intel_limit_t *intel_limit_g4x (xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr	pScrn = crtc->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     const intel_limit_t *limit;
 
     if (i830PipeHasType (crtc, I830_OUTPUT_LVDS)) {
@@ -428,18 +609,20 @@ static const intel_limit_t *intel_limit_
 
 static const intel_limit_t *intel_limit (xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr	pScrn = crtc->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     const intel_limit_t *limit;
 
-    if (IS_G4X(pI830)) {
+    if (IS_IGDNG(intel)) {
+	limit = intel_igdng_limit(crtc);
+    } else if (IS_G4X(intel)) {
         limit = intel_limit_g4x(crtc);
-    } else if (IS_I9XX(pI830) && !IS_IGD(pI830)) {
+    } else if (IS_I9XX(intel) && !IS_IGD(intel)) {
 	if (i830PipeHasType (crtc, I830_OUTPUT_LVDS))
 	    limit = &intel_limits[INTEL_LIMIT_I9XX_LVDS];
 	else
 	    limit = &intel_limits[INTEL_LIMIT_I9XX_SDVO_DAC];
-    } else if (IS_IGD(pI830)) {
+    } else if (IS_IGD(intel)) {
 	if (i830PipeHasType (crtc, I830_OUTPUT_LVDS))
 	    limit = &intel_limits[INTEL_LIMIT_IGD_LVDS];
 	else
@@ -483,10 +666,10 @@ static void igd_clock(int refclk, intel_
     clock->dot = clock->vco / clock->p;
 }
 
-static void intel_clock(I830Ptr pI830, int refclk, intel_clock_t *clock)
+static void intel_clock(intel_screen_private *intel, int refclk, intel_clock_t *clock)
 {
-    if (IS_I9XX(pI830)) {
-	if (IS_IGD(pI830))
+    if (IS_I9XX(intel)) {
+	if (IS_IGD(intel))
 	    igd_clock(refclk, clock);
 	else
 	    i9xx_clock (refclk, clock);
@@ -495,9 +678,9 @@ static void intel_clock(I830Ptr pI830, i
 }
 
 static void
-i830PrintPll(ScrnInfoPtr pScrn, char *prefix, intel_clock_t *clock)
+i830PrintPll(ScrnInfoPtr scrn, char *prefix, intel_clock_t *clock)
 {
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 	       "%s: dotclock %d vco %d ((m %d, m1 %d, m2 %d), n %d, "
 	       "(p %d, p1 %d, p2 %d))\n",
 	       prefix, clock->dot, clock->vco,
@@ -506,14 +689,70 @@ i830PrintPll(ScrnInfoPtr pScrn, char *pr
 	       clock->p, clock->p1, clock->p2);
 }
 
+static Bool
+i830PllIsValid(xf86CrtcPtr crtc, intel_clock_t *clock);
+
+static Bool
+intel_igdng_find_best_PLL(const intel_limit_t *limit, xf86CrtcPtr crtc,
+			  int target, int refclk, intel_clock_t *best_clock)
+{
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    intel_clock_t clock;
+    int max_n;
+    Bool found = FALSE;
+    /* Approximately equals target * 0.00585 */
+    int err_most = (target >> 8) + (target >> 9);
+
+    if (i830PipeHasType(crtc, I830_OUTPUT_LVDS)) {
+	if ((INREG(PCH_LVDS) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP)
+	    clock.p2 = limit->p2.p2_fast;
+	else
+	    clock.p2 = limit->p2.p2_slow;
+    } else {
+	if (target < limit->p2.dot_limit)
+	    clock.p2 = limit->p2.p2_slow;
+	else
+	    clock.p2 = limit->p2.p2_fast;
+    }
+
+    memset(best_clock, 0, sizeof(*best_clock));
+    max_n = limit->n.max;
+    /* based on hardware requriment prefer smaller n to precision */
+    for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
+	/* based on hardware requirment prefere larger m1,m2 */
+	for (clock.m1 = limit->m1.max; clock.m1 >= limit->m1.min; clock.m1--) {
+	    for (clock.m2 = limit->m2.max;
+		 clock.m2 >= limit->m2.min; clock.m2--) {
+		for (clock.p1 = limit->p1.max;
+		     clock.p1 >= limit->p1.min; clock.p1--) {
+		    int this_err;
+
+		    intel_clock(intel, refclk, &clock);
+		    if (!i830PllIsValid(crtc, &clock))
+			continue;
+		    this_err = abs(clock.dot - target) ;
+		    if (this_err < err_most) {
+			*best_clock = clock;
+			err_most = this_err;
+			max_n = clock.n;
+			found = TRUE;
+		    }
+		}
+	    }
+	}
+    }
+    return found;
+}
+
 /**
  * Returns whether any output on the specified pipe is of the specified type
  */
 Bool
 i830PipeHasType (xf86CrtcPtr crtc, int type)
 {
-    ScrnInfoPtr	pScrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr	scrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     int		i;
 
     for (i = 0; i < xf86_config->num_output; i++)
@@ -529,7 +768,11 @@ i830PipeHasType (xf86CrtcPtr crtc, int t
     return FALSE;
 }
 
+#if 1
 #define i830PllInvalid(s)   { /* ErrorF (s) */; return FALSE; }
+#else
+#define i830PllInvalid(s)   { ErrorF (s) ; return FALSE; }
+#endif
 /**
  * Returns whether the given set of divisors are valid for a given refclk with
  * the given outputs.
@@ -539,8 +782,8 @@ static Bool
 i830PllIsValid(xf86CrtcPtr crtc, intel_clock_t *clock)
 {
     const intel_limit_t *limit = intel_limit (crtc);
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     if (clock->p1  < limit->p1.min  || limit->p1.max  < clock->p1)
 	i830PllInvalid ("p1 out of range\n");
@@ -550,7 +793,7 @@ i830PllIsValid(xf86CrtcPtr crtc, intel_c
 	i830PllInvalid ("m2 out of range\n");
     if (clock->m1  < limit->m1.min  || limit->m1.max  < clock->m1)
 	i830PllInvalid ("m1 out of range\n");
-    if (clock->m1 <= clock->m2 && !IS_IGD(pI830))
+    if (clock->m1 <= clock->m2 && !IS_IGD(intel))
 	i830PllInvalid ("m1 <= m2\n");
     if (clock->m   < limit->m.min   || limit->m.max   < clock->m)
 	i830PllInvalid ("m out of range\n");
@@ -571,8 +814,8 @@ static Bool
 intel_find_pll_i8xx_and_i9xx(const intel_limit_t * limit, xf86CrtcPtr crtc,
 	                     int target, int refclk, intel_clock_t *best_clock)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     intel_clock_t clock;
     int err = target;
 
@@ -600,7 +843,7 @@ intel_find_pll_i8xx_and_i9xx(const intel
 	for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max; clock.m2++)
 	{
 	    /* m1 is always 0 in IGD */
-	    if (clock.m2 >= clock.m1 && !IS_IGD(pI830))
+	    if (clock.m2 >= clock.m1 && !IS_IGD(intel))
 		break;
 	    for (clock.n = limit->n.min; clock.n <= limit->n.max; clock.n++) 
 	    {
@@ -608,7 +851,7 @@ intel_find_pll_i8xx_and_i9xx(const intel
 		{
 		    int this_err;
 
-		    intel_clock (pI830, refclk, &clock);
+		    intel_clock (intel, refclk, &clock);
 		    
 		    if (!i830PllIsValid(crtc, &clock))
 			continue;
@@ -629,8 +872,8 @@ static Bool
 intel_find_pll_g4x(const intel_limit_t * limit, xf86CrtcPtr crtc,
                    int target, int refclk, intel_clock_t *best_clock)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     intel_clock_t clock;
     int  max_n;
     Bool found = FALSE;
@@ -665,7 +908,7 @@ intel_find_pll_g4x(const intel_limit_t *
                     clock.p1 >= limit->p1.min; clock.p1--) {
                     int this_err;
 
-                    intel_clock (pI830, refclk, &clock);
+                    intel_clock (intel, refclk, &clock);
                     if (!i830PllIsValid(crtc, &clock))
                         continue;
                     this_err = abs(clock.dot - target) ;
@@ -693,10 +936,9 @@ i830WaitForVblank(ScrnInfoPtr pScreen)
 void
 i830PipeSetBase(xf86CrtcPtr crtc, int x, int y)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
-    int pipe = intel_crtc->pipe;
     int plane = intel_crtc->plane;
     unsigned long Start, Offset, Stride;
     int dspbase = (plane == 0 ? DSPABASE : DSPBBASE);
@@ -704,9 +946,9 @@ i830PipeSetBase(xf86CrtcPtr crtc, int x,
     int dsptileoff = (plane == 0 ? DSPATILEOFF : DSPBTILEOFF);
     int dspstride = (plane == 0) ? DSPASTRIDE : DSPBSTRIDE;
 
-    Offset = ((y * pScrn->displayWidth + x) * pI830->cpp);
-    Stride = pScrn->displayWidth * pI830->cpp;
-    if (pI830->front_buffer == NULL) {
+    Offset = ((y * scrn->displayWidth + x) * intel->cpp);
+    Stride = scrn->displayWidth * intel->cpp;
+    if (intel->front_buffer == NULL) {
 	/* During startup we may be called as part of monitor detection while
 	 * there is no memory allocation done, so just supply a dummy base
 	 * address.
@@ -714,18 +956,18 @@ i830PipeSetBase(xf86CrtcPtr crtc, int x,
 	Start = 0;
     } else if (crtc->rotatedData != NULL) {
 	/* offset is done by shadow painting code, not here */
-	Start = (char *)crtc->rotatedData - (char *)pI830->FbBase;
+	Start = (char *)crtc->rotatedData - (char *)intel->FbBase;
 	Offset = 0;
 	Stride = intel_crtc->rotate_mem->pitch;
     } else {
-	Start = pI830->front_buffer->offset;
+	Start = intel->front_buffer->offset;
     }
 
     crtc->x = x;
     crtc->y = y;
 
     OUTREG(dspstride, Stride);
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel)) {
         OUTREG(dspbase, Offset);
 	POSTING_READ(dspbase);
         OUTREG(dspsurf, Start);
@@ -735,30 +977,6 @@ i830PipeSetBase(xf86CrtcPtr crtc, int x,
 	OUTREG(dspbase, Start + Offset);
 	POSTING_READ(dspbase);
     }
-
-#ifdef XF86DRI
-    if (pI830->directRenderingType == DRI_XF86DRI) {
-	drmI830Sarea *sPriv = (drmI830Sarea *) DRIGetSAREAPrivate(pScrn->pScreen);
-
-	if (!sPriv)
-	    return;
-
-	switch (pipe) {
-	case 0:
-	    sPriv->pipeA_x = x;
-	    sPriv->pipeA_y = y;
-	    break;
-	case 1:
-	    sPriv->pipeB_x = x;
-	    sPriv->pipeB_y = y;
-	    break;
-	default:
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Can't update pipe %d in SAREA\n", pipe);
-	    break;
-	}
-    }
-#endif
 }
 
 /*
@@ -794,6 +1012,7 @@ Bool
 i830_pipe_a_require_activate (ScrnInfoPtr scrn)
 {
     xf86CrtcPtr	crtc = i830_crtc_for_pipe (scrn, 0);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     /* VESA 640x480x72Hz mode to set on the pipe */
     static DisplayModeRec   mode = {
 	NULL, NULL, "640x480", MODE_OK, M_T_DEFAULT,
@@ -807,6 +1026,9 @@ i830_pipe_a_require_activate (ScrnInfoPt
 	FALSE, FALSE, 0, NULL, 0, 0.0, 0.0
     };
 
+    if (IS_IGDNG(intel))
+	return FALSE;
+
     if (!crtc)
 	return FALSE;
     if (crtc->enabled)
@@ -834,14 +1056,14 @@ i830_pipe_a_require_deactivate (ScrnInfo
 static Bool
 i830_display_tiled(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     /* Rotated data is currently linear, allocated either via XAA or EXA */
     if (crtc->rotatedData)
 	return FALSE;
 
-    if (pI830->front_buffer && pI830->front_buffer->tiling != TILE_NONE)
+    if (intel->front_buffer && intel->front_buffer->tiling != TILE_NONE)
 	return TRUE;
 
     return FALSE;
@@ -865,19 +1087,19 @@ i830_display_tiled(xf86CrtcPtr crtc)
 static void
 i830_enable_fb_compression_8xx(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     uint32_t fbc_ctl = 0;
     unsigned long compressed_stride;
     int plane = (intel_crtc->plane == 0 ? FBC_CTL_PLANEA : FBC_CTL_PLANEB);
-    unsigned long uncompressed_stride = pScrn->displayWidth * pI830->cpp;
+    unsigned long uncompressed_stride = scrn->displayWidth * intel->cpp;
     unsigned long interval = 1000;
 
     if (INREG(FBC_CONTROL) & FBC_CTL_EN)
 	return;
 
-    compressed_stride = pI830->compressed_front_buffer->size /
+    compressed_stride = intel->compressed_front_buffer->size /
 	FBC_LL_SIZE;
 
     if (uncompressed_stride < compressed_stride)
@@ -890,25 +1112,25 @@ i830_enable_fb_compression_8xx(xf86CrtcP
     /* Wait for compressing bit to clear */
     while (INREG(FBC_STATUS) & FBC_STAT_COMPRESSING)
 	; /* nothing */
-    i830WaitForVblank(pScrn);
-    OUTREG(FBC_CFB_BASE, pI830->compressed_front_buffer->bus_addr);
-    OUTREG(FBC_LL_BASE, pI830->compressed_ll_buffer->bus_addr + 6);
+    i830WaitForVblank(scrn);
+    OUTREG(FBC_CFB_BASE, intel->compressed_front_buffer->bus_addr);
+    OUTREG(FBC_LL_BASE, intel->compressed_ll_buffer->bus_addr + 6);
     OUTREG(FBC_CONTROL2, FBC_CTL_FENCE_DBL | FBC_CTL_IDLE_IMM |
 	   FBC_CTL_CPU_FENCE | plane);
     OUTREG(FBC_FENCE_OFF, crtc->y);
 
     /* Zero buffers */
-    memset(pI830->FbBase + pI830->compressed_front_buffer->offset, 0,
-	   pI830->compressed_front_buffer->size);
-    memset(pI830->FbBase + pI830->compressed_ll_buffer->offset, 0,
-	   pI830->compressed_ll_buffer->size);
+    memset(intel->FbBase + intel->compressed_front_buffer->offset, 0,
+	   intel->compressed_front_buffer->size);
+    memset(intel->FbBase + intel->compressed_ll_buffer->offset, 0,
+	   intel->compressed_ll_buffer->size);
 
     /* enable it... */
     fbc_ctl |= FBC_CTL_EN | FBC_CTL_PERIODIC;
     fbc_ctl |= (compressed_stride & 0xff) << FBC_CTL_STRIDE_SHIFT;
     fbc_ctl |= (interval & 0x2fff) << FBC_CTL_INTERVAL_SHIFT;
     fbc_ctl |= FBC_CTL_UNCOMPRESSIBLE;
-    fbc_ctl |= pI830->front_buffer->fence_nr;
+    fbc_ctl |= intel->front_buffer->fence_nr;
     OUTREG(FBC_CONTROL, fbc_ctl);
 }
 
@@ -918,8 +1140,8 @@ i830_enable_fb_compression_8xx(xf86CrtcP
 static void
 i830_disable_fb_compression_8xx(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t fbc_ctl;
 
     /* Disable compression */
@@ -935,22 +1157,22 @@ i830_disable_fb_compression_8xx(xf86Crtc
 static void
 i830_disable_fb_compression2(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t dpfc_ctl;
 
     /* Disable compression */
     dpfc_ctl = INREG(DPFC_CONTROL);
     dpfc_ctl &= ~DPFC_CTL_EN;
     OUTREG(DPFC_CONTROL, dpfc_ctl);
-    i830WaitForVblank(pScrn);
+    i830WaitForVblank(scrn);
 }
 
 static void
 i830_enable_fb_compression2(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     int plane = (intel_crtc->plane == 0 ? DPFC_CTL_PLANEA : DPFC_CTL_PLANEB);
     unsigned long stall_watermark = 200, frames = 50;
@@ -960,18 +1182,18 @@ i830_enable_fb_compression2(xf86CrtcPtr
 
     /* Set it up... */
     i830_disable_fb_compression2(crtc);
-    OUTREG(DPFC_CB_BASE, pI830->compressed_front_buffer->offset);
+    OUTREG(DPFC_CB_BASE, intel->compressed_front_buffer->offset);
     /* Update i830_memory.c too if compression ratio changes */
     OUTREG(DPFC_CONTROL, plane | DPFC_CTL_FENCE_EN | DPFC_CTL_LIMIT_4X |
-	   pI830->front_buffer->fence_nr);
+	   intel->front_buffer->fence_nr);
     OUTREG(DPFC_RECOMP_CTL, DPFC_RECOMP_STALL_EN |
 	   (stall_watermark << DPFC_RECOMP_STALL_WM_SHIFT) |
 	   (frames << DPFC_RECOMP_TIMER_COUNT_SHIFT));
     OUTREG(DPFC_FENCE_YOFF, crtc->y);
 
     /* Zero buffers */
-    memset(pI830->FbBase + pI830->compressed_front_buffer->offset, 0,
-	   pI830->compressed_front_buffer->size);
+    memset(intel->FbBase + intel->compressed_front_buffer->offset, 0,
+	   intel->compressed_front_buffer->size);
 
     /* enable it... */
     OUTREG(DPFC_CONTROL, INREG(DPFC_CONTROL) | DPFC_CTL_EN);
@@ -980,10 +1202,10 @@ i830_enable_fb_compression2(xf86CrtcPtr
 static void
 i830_enable_fb_compression(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (IS_GM45(pI830))
+    if (IS_GM45(intel))
 	return i830_enable_fb_compression2(crtc);
 
     i830_enable_fb_compression_8xx(crtc);
@@ -992,10 +1214,10 @@ i830_enable_fb_compression(xf86CrtcPtr c
 static void
 i830_disable_fb_compression(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (IS_GM45(pI830))
+    if (IS_GM45(intel))
 	return i830_disable_fb_compression2(crtc);
 
     i830_disable_fb_compression_8xx(crtc);
@@ -1004,9 +1226,9 @@ i830_disable_fb_compression(xf86CrtcPtr
 static Bool
 i830_use_fb_compression(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     unsigned long uncompressed_size;
     int plane = (intel_crtc->plane == 0 ? FBC_CTL_PLANEA : FBC_CTL_PLANEB);
@@ -1020,24 +1242,24 @@ i830_use_fb_compression(xf86CrtcPtr crtc
 
     /* Here we disable it to catch one->two pipe enabled configs */
     if (count > 1) {
-	if (i830_fb_compression_supported(pI830))
+	if (i830_fb_compression_supported(intel))
 	    i830_disable_fb_compression(crtc);
 	return FALSE;
     }
 
-    if (!pI830->fb_compression)
+    if (!intel->fb_compression)
 	return FALSE;
 
     if (!i830_display_tiled(crtc))
 	return FALSE;
 
     /* Pre-965 only supports plane A */
-    if (!IS_I965GM(pI830) && plane != FBC_CTL_PLANEA)
+    if (!IS_I965GM(intel) && plane != FBC_CTL_PLANEA)
 	return FALSE;
 
     /* Need 15, 16, or 32 (w/alpha) pixel format */
-    if (!(pScrn->bitsPerPixel == 16 || /* covers 15 bit mode as well */
-	  pScrn->bitsPerPixel == 32)) /* mode_set dtrt if fbc is in use */
+    if (!(scrn->bitsPerPixel == 16 || /* covers 15 bit mode as well */
+	  scrn->bitsPerPixel == 32)) /* mode_set dtrt if fbc is in use */
 	return FALSE;
 
     /* Can't cache more lines than we can track */
@@ -1049,8 +1271,8 @@ i830_use_fb_compression(xf86CrtcPtr crtc
      * buffer if the uncompressed size is large.
      */
     uncompressed_size = crtc->mode.HDisplay * crtc->mode.VDisplay *
-	pI830->cpp;
-    if (pI830->compressed_front_buffer->size < uncompressed_size)
+	intel->cpp;
+    if (intel->compressed_front_buffer->size < uncompressed_size)
 	return FALSE;
 
     /*
@@ -1060,15 +1282,15 @@ i830_use_fb_compression(xf86CrtcPtr crtc
     return TRUE;
 }
 
-#if defined(DRM_IOCTL_MODESET_CTL) && (defined(XF86DRI) || defined(DRI2))
+#if defined(DRM_IOCTL_MODESET_CTL)
 static void i830_modeset_ctl(xf86CrtcPtr crtc, int pre)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     struct drm_modeset_ctl modeset;
 
-    if (pI830->directRenderingType <= DRI_NONE)
+    if (intel->directRenderingType <= DRI_NONE)
       return;
 
     modeset.crtc = intel_crtc->pipe;
@@ -1080,11 +1302,11 @@ static void i830_modeset_ctl(xf86CrtcPtr
     if (pre && intel_crtc->dpms_mode != DPMSModeOff) {
 	/* On -> off is a pre modeset */
 	modeset.cmd = _DRM_PRE_MODESET;
-	ioctl(pI830->drmSubFD, DRM_IOCTL_MODESET_CTL, &modeset);
+	ioctl(intel->drmSubFD, DRM_IOCTL_MODESET_CTL, &modeset);
     } else if (!pre && intel_crtc->dpms_mode == DPMSModeOff) {
 	/* Off -> on means post modeset */
 	modeset.cmd = _DRM_POST_MODESET;
-	ioctl(pI830->drmSubFD, DRM_IOCTL_MODESET_CTL, &modeset);
+	ioctl(intel->drmSubFD, DRM_IOCTL_MODESET_CTL, &modeset);
     }
 }
 #else
@@ -1092,43 +1314,58 @@ static void i830_modeset_ctl(xf86CrtcPtr
 {
     return;
 }
-#endif /* DRM_IOCTL_MODESET_CTL && (XF86DRI || DRI2) */
+#endif /* DRM_IOCTL_MODESET_CTL */
 
 static void
 i830_disable_vga_plane (xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t vgacntrl = INREG(VGACNTRL);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint8_t sr01;
+    uint32_t vga_reg, vgacntrl;
 
+    if (IS_IGDNG(intel))
+	vga_reg = CPU_VGACNTRL;
+    else
+	vga_reg = VGACNTRL;
+
+    vgacntrl = INREG(vga_reg);
     if (vgacntrl & VGA_DISP_DISABLE)
 	return;
 
     /*
-       Set bit 5 of SR01;
-       Wait 30us;
-       */
-    OUTREG8(SRX, 1);
-    sr01 = INREG8(SRX + 1);
-    OUTREG8(SRX + 1, sr01 | (1 << 5));
-    usleep(30);
-    /* disable center mode on 965GM and G4X platform */
-    if (IS_I965GM(pI830) || IS_G4X(pI830))
-        vgacntrl &= ~(3 << 24);
-
-    vgacntrl |= VGA_DISP_DISABLE;
-
-    OUTREG(VGACNTRL, vgacntrl);
-    i830WaitForVblank(pScrn);
-
+     * Bug #17235: G4X machine needs following steps
+     * for disable VGA.
+     * - set bit 5 of SR01;
+     * - Wait 30us;
+     * - disable vga plane;
+     * - restore SR01;
+     */
+    if (IS_G4X(intel)) {
+	OUTREG8(SRX, 1);
+	sr01 = INREG8(SRX + 1);
+	OUTREG8(SRX + 1, sr01 | (1 << 5));
+	usleep(30);
+    }
+
+    while (!(INREG(vga_reg) & VGA_DISP_DISABLE)) {
+	vgacntrl |= VGA_DISP_DISABLE;
+	OUTREG(vga_reg, vgacntrl);
+	i830WaitForVblank(scrn);
+    }
+
+    /* restore SR01 */
+    if (IS_G4X(intel)) {
+	OUTREG8(SRX, 1);
+	OUTREG8(SRX + 1, sr01);
+    }
 }
 
-void
+static void
 i830_crtc_enable(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     int pipe = intel_crtc->pipe;
     int plane = intel_crtc->plane;
@@ -1170,11 +1407,11 @@ i830_crtc_enable(xf86CrtcPtr crtc)
 	OUTREG(dspbase_reg, INREG(dspbase_reg));
     }
 
+    i830_crtc_load_lut(crtc);
+
     /* Give the overlay scaler a chance to enable if it's on this pipe */
     i830_crtc_dpms_video(crtc, TRUE);
 
-    i830_crtc_load_lut(crtc);
-
     /* Reenable compression if needed */
     if (i830_use_fb_compression(crtc))
 	i830_enable_fb_compression(crtc);
@@ -1184,8 +1421,8 @@ i830_crtc_enable(xf86CrtcPtr crtc)
 void
 i830_crtc_disable(xf86CrtcPtr crtc, Bool disable_pipe)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     int pipe = intel_crtc->pipe;
     int plane = intel_crtc->plane;
@@ -1220,9 +1457,9 @@ i830_crtc_disable(xf86CrtcPtr crtc, Bool
 	POSTING_READ(dspbase_reg);
     }
 
-    if (!IS_I9XX(pI830)) {
+    if (!IS_I9XX(intel)) {
 	/* Wait for vblank for the disable to take effect */
-	i830WaitForVblank(pScrn);
+	i830WaitForVblank(scrn);
     }
 
     /* May need to leave pipe A on */
@@ -1236,7 +1473,7 @@ i830_crtc_disable(xf86CrtcPtr crtc, Bool
 	}
 
 	/* Wait for vblank for the disable to take effect. */
-	i830WaitForVblank(pScrn);
+	i830WaitForVblank(scrn);
 
 	temp = INREG(dpll_reg);
 	if ((temp & DPLL_VCO_ENABLE) != 0) {
@@ -1252,6 +1489,446 @@ i830_crtc_disable(xf86CrtcPtr crtc, Bool
     i830_disable_vga_plane (crtc);
 }
 
+static void ironlake_fdi_link_train(xf86CrtcPtr crtc)
+{
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+    int pipe = intel_crtc->pipe;
+    int fdi_tx_reg = (pipe == 0) ? FDI_TXA_CTL : FDI_TXB_CTL;
+    int fdi_rx_reg = (pipe == 0) ? FDI_RXA_CTL : FDI_RXB_CTL;
+    int fdi_rx_iir_reg = (pipe == 0) ? FDI_RXA_IIR : FDI_RXB_IIR;
+    int fdi_rx_imr_reg = (pipe == 0) ? FDI_RXA_IMR : FDI_RXB_IMR;
+    uint32_t temp, tries = 0;
+    
+    /* enable CPU FDI TX and PCH FDI RX */
+    temp = INREG(fdi_tx_reg);
+    temp |= FDI_TX_ENABLE;
+    temp &= ~(7 << 19);
+    temp |= /*(intel_crtc->fdi_lanes - 1)*/3 << 19;
+    temp &= ~FDI_LINK_TRAIN_NONE;
+    temp |= FDI_LINK_TRAIN_PATTERN_1;
+    OUTREG(fdi_tx_reg, temp);
+    INREG(fdi_tx_reg);
+    
+    temp = INREG(fdi_rx_reg);
+    temp &= ~FDI_LINK_TRAIN_NONE;
+    temp |= FDI_LINK_TRAIN_PATTERN_1;
+    OUTREG(fdi_rx_reg, temp | FDI_RX_ENABLE);
+    INREG(fdi_rx_reg);
+    usleep(150);
+    
+    /* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit
+       for train result */
+    temp = INREG(fdi_rx_imr_reg);
+    temp &= ~FDI_RX_SYMBOL_LOCK;
+    temp &= ~FDI_RX_BIT_LOCK;
+    OUTREG(fdi_rx_imr_reg, temp);
+    INREG(fdi_rx_imr_reg);
+    usleep(150);
+
+    for (;;) {
+	temp = INREG(fdi_rx_iir_reg);
+	ErrorF("FDI_RX_IIR 0x%x\n", temp);
+	
+	if ((temp & FDI_RX_BIT_LOCK)) {
+	    ErrorF("FDI train 1 done.\n");
+	    OUTREG(fdi_rx_iir_reg,
+		       temp | FDI_RX_BIT_LOCK);
+	    break;
+	}
+	
+	tries++;
+
+	if (tries > 5) {
+	    ErrorF("FDI train 1 fail!\n");
+	    break;
+	}
+    }
+    
+    /* Train 2 */
+    temp = INREG(fdi_tx_reg);
+    temp &= ~FDI_LINK_TRAIN_NONE;
+    temp |= FDI_LINK_TRAIN_PATTERN_2;
+    OUTREG(fdi_tx_reg, temp);
+
+    temp = INREG(fdi_rx_reg);
+    temp &= ~FDI_LINK_TRAIN_NONE;
+    temp |= FDI_LINK_TRAIN_PATTERN_2;
+    OUTREG(fdi_rx_reg, temp);
+    usleep(150);
+
+    tries = 0;
+
+    for (;;) {
+	temp = INREG(fdi_rx_iir_reg);
+	ErrorF("FDI_RX_IIR 0x%x\n", temp);
+	
+	if (temp & FDI_RX_SYMBOL_LOCK) {
+	    OUTREG(fdi_rx_iir_reg,
+		       temp | FDI_RX_SYMBOL_LOCK);
+	    ErrorF("FDI train 2 done.\n");
+	    break;
+	}
+
+	tries++;
+
+	if (tries > 5) {
+	    ErrorF("FDI train 2 fail!\n");
+	    break;
+	}
+    }
+    
+    ErrorF("FDI train done\n");
+}
+
+static void
+ironlake_crtc_enable(xf86CrtcPtr crtc)
+{
+	ScrnInfoPtr scrn = crtc->scrn;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+	int pipe = intel_crtc->pipe;
+	int plane = intel_crtc->plane;
+	int pch_dpll_reg = (pipe == 0) ? PCH_DPLL_A : PCH_DPLL_B;
+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
+	int dspcntr_reg = (plane == 0) ? DSPACNTR : DSPBCNTR;
+	int dspbase_reg = (plane == 0) ? DSPABASE : DSPBBASE;
+	int fdi_tx_reg = (pipe == 0) ? FDI_TXA_CTL : FDI_TXB_CTL;
+	int fdi_rx_reg = (pipe == 0) ? FDI_RXA_CTL : FDI_RXB_CTL;
+	int transconf_reg = (pipe == 0) ? TRANSACONF : TRANSBCONF;
+	int pf_ctl_reg = (pipe == 0) ? PFA_CTL_1 : PFB_CTL_1;
+	int pf_win_size = (pipe == 0) ? PFA_WIN_SZ : PFB_WIN_SZ;
+	int pf_win_pos = (pipe == 0) ? PFA_WIN_POS : PFB_WIN_POS;
+	int cpu_htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;
+	int cpu_hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;
+	int cpu_hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;
+	int cpu_vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;
+	int cpu_vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;
+	int cpu_vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;
+	int trans_htot_reg = (pipe == 0) ? TRANS_HTOTAL_A : TRANS_HTOTAL_B;
+	int trans_hblank_reg = (pipe == 0) ? TRANS_HBLANK_A : TRANS_HBLANK_B;
+	int trans_hsync_reg = (pipe == 0) ? TRANS_HSYNC_A : TRANS_HSYNC_B;
+	int trans_vtot_reg = (pipe == 0) ? TRANS_VTOTAL_A : TRANS_VTOTAL_B;
+	int trans_vblank_reg = (pipe == 0) ? TRANS_VBLANK_A : TRANS_VBLANK_B;
+	int trans_vsync_reg = (pipe == 0) ? TRANS_VSYNC_A : TRANS_VSYNC_B;
+	uint32_t temp, pipe_bpc;
+
+	temp = INREG(pipeconf_reg);
+	pipe_bpc = temp & PIPE_BPC_MASK;
+
+	/* XXX no LVDS port force */
+	if (i830PipeHasType(crtc, I830_OUTPUT_LVDS)) {
+	    temp = INREG(PCH_LVDS);
+	    if ((temp & LVDS_PORT_EN) == 0) {
+		OUTREG(PCH_LVDS, temp | LVDS_PORT_EN);
+		INREG(PCH_LVDS);
+	    }
+	}
+
+	ErrorF("PCH FDI RX PLL enable\n");
+	temp = INREG(fdi_rx_reg);
+	temp &= ~(0x7 << 16);
+	temp |= (pipe_bpc << 11);
+	temp &= ~(FDI_DP_PORT_WIDTH_MASK);
+	temp |= FDI_DP_PORT_WIDTH_X4;
+
+	OUTREG(fdi_rx_reg, temp | FDI_RX_PLL_ENABLE); /* default 4 lanes */
+	INREG(fdi_rx_reg);
+	usleep(200);
+
+	temp = INREG(fdi_rx_reg);
+	OUTREG(fdi_rx_reg, temp | FDI_SEL_PCDCLK); 
+	temp = INREG(fdi_rx_reg);
+	usleep(200);
+
+	ErrorF("PCH FDI TX PLL enable %08x\n", temp);
+	temp = INREG(fdi_tx_reg);
+	if ((temp & FDI_TX_PLL_ENABLE) == 0) {
+	    OUTREG(fdi_tx_reg, temp | FDI_TX_PLL_ENABLE);
+	    INREG(fdi_tx_reg);
+	    usleep(100);
+	}
+
+
+
+#define PF_FILTER_MASK		(3<<23)
+#define PF_FILTER_MED_3x3	(1<<23)
+	if (i830PipeHasType(crtc, I830_OUTPUT_LVDS)) {
+	    temp = INREG(pf_ctl_reg);
+	    temp &= ~PF_FILTER_MASK;
+	    OUTREG(pf_ctl_reg, temp | PF_ENABLE | PF_FILTER_MED_3x3);
+	    /* currently full aspect */
+	    OUTREG(pf_win_pos, 0);
+	    OUTREG(pf_win_size, (intel->lvds_fixed_mode->HDisplay << 16) |
+		(intel->lvds_fixed_mode->VDisplay));
+	}
+
+	ErrorF("Pipe enable\n");
+	/* Enable CPU pipe */
+	temp = INREG(pipeconf_reg);
+	if ((temp & PIPEACONF_ENABLE) == 0) {
+	    OUTREG(pipeconf_reg, temp | PIPEACONF_ENABLE);
+	    INREG(pipeconf_reg);
+	    usleep(100);
+	}
+
+	ErrorF("Plane enable\n");
+	/* configure and enable CPU plane */
+	temp = INREG(dspcntr_reg);
+	if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
+	    OUTREG(dspcntr_reg, temp | DISPLAY_PLANE_ENABLE);
+	    /* Flush the plane changes */
+	    OUTREG(dspbase_reg, INREG(dspbase_reg));
+	    usleep(10);
+	}
+	/* twice, like the BIOS */
+	OUTREG(dspcntr_reg, temp | DISPLAY_PLANE_ENABLE);
+
+	/* Train FDI. */
+	ironlake_fdi_link_train(crtc);
+
+	/* enable PCH DPLL */
+	temp = INREG(pch_dpll_reg);
+	if ((temp & DPLL_VCO_ENABLE) == 0) {
+	    OUTREG(pch_dpll_reg, temp | DPLL_VCO_ENABLE);
+	    INREG(pch_dpll_reg);
+	}
+	usleep(200);
+
+	/* set transcoder timing */
+	OUTREG(trans_htot_reg, INREG(cpu_htot_reg));
+	OUTREG(trans_hblank_reg, INREG(cpu_hblank_reg));
+	OUTREG(trans_hsync_reg, INREG(cpu_hsync_reg));
+
+	OUTREG(trans_vtot_reg, INREG(cpu_vtot_reg));
+	OUTREG(trans_vblank_reg, INREG(cpu_vblank_reg));
+	OUTREG(trans_vsync_reg, INREG(cpu_vsync_reg));
+
+	/* enable normal */
+
+	ErrorF("FDI TX link normal\n");
+	temp = INREG(fdi_tx_reg);
+	temp &= ~FDI_LINK_TRAIN_NONE;
+	OUTREG(fdi_tx_reg, temp | FDI_LINK_TRAIN_NONE |
+		   FDI_TX_ENHANCE_FRAME_ENABLE);
+	INREG(fdi_tx_reg);
+
+	temp = INREG(fdi_rx_reg);
+	temp &= ~FDI_LINK_TRAIN_NONE;
+	temp |= FDI_LINK_TRAIN_NONE;
+	
+	OUTREG(fdi_rx_reg, temp | FDI_LINK_TRAIN_NONE);
+	INREG(fdi_rx_reg);
+
+	usleep(100);
+
+	ErrorF("transcoder enable\n");
+	/* enable transcoder */
+	temp = INREG(transconf_reg);
+	temp &= ~PIPE_BPC_MASK;
+	temp |= pipe_bpc;
+	OUTREG(transconf_reg, temp | TRANS_ENABLE);
+	INREG(transconf_reg);
+
+	while ((INREG(transconf_reg) & TRANS_STATE_ENABLE) == 0)
+	    ;
+
+	ErrorF("LUT load\n");
+	i830_crtc_load_lut(crtc);
+
+	ErrorF("DPMS on done\n");
+
+	i830_modeset_ctl(crtc, 0);
+}
+
+void
+ironlake_crtc_disable(xf86CrtcPtr crtc)
+{
+	ScrnInfoPtr scrn = crtc->scrn;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+	int pipe = intel_crtc->pipe;
+	int plane = intel_crtc->plane;
+	int pch_dpll_reg = (pipe == 0) ? PCH_DPLL_A : PCH_DPLL_B;
+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
+	int dspcntr_reg = (plane == 0) ? DSPACNTR : DSPBCNTR;
+	int dspbase_reg = (plane == 0) ? DSPABASE : DSPBBASE;
+	int fdi_tx_reg = (pipe == 0) ? FDI_TXA_CTL : FDI_TXB_CTL;
+	int fdi_rx_reg = (pipe == 0) ? FDI_RXA_CTL : FDI_RXB_CTL;
+	int transconf_reg = (pipe == 0) ? TRANSACONF : TRANSBCONF;
+	int pf_ctl_reg = (pipe == 0) ? PFA_CTL_1 : PFB_CTL_1;
+	int pf_win_size = (pipe == 0) ? PFA_WIN_SZ : PFB_WIN_SZ;
+	uint32_t temp, pipe_bpc;
+	int n;
+
+	i830_modeset_ctl(crtc, 1);
+
+	temp = INREG(pipeconf_reg);
+	pipe_bpc = temp & PIPE_BPC_MASK;
+
+	ErrorF("Plane disable\n");
+	temp = INREG(dspcntr_reg);
+	if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
+		OUTREG(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE);
+		/* flush plane changes */
+		OUTREG(dspbase_reg, INREG(dspbase_reg));
+		INREG(dspbase_reg);
+	}
+
+	i830_disable_vga_plane (crtc);
+
+	ErrorF("Pipe disable\n");
+	/* disable cpu pipe, disable after all planes disabled */
+	temp = INREG(pipeconf_reg);
+	if ((temp & PIPEACONF_ENABLE) != 0) {
+	    OUTREG(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
+	    INREG(pipeconf_reg);
+	    n = 0;
+	    /* wait for cpu pipe off, pipe state */
+	    while ((INREG(pipeconf_reg) & I965_PIPECONF_ACTIVE) != 0) {
+		n++;
+		if (n < 60) {
+		    usleep(500);
+		    continue;
+		} else {
+		    ErrorF("aborting pipeconf disable early\n");
+		    break;
+		}
+	    }
+	}
+
+	usleep(100);
+
+	ErrorF("PFIT disable\n");
+	temp = INREG(pf_ctl_reg);
+	if ((temp & PF_ENABLE) != 0) {
+		OUTREG(pf_ctl_reg, temp & ~PF_ENABLE);
+		INREG(pf_ctl_reg);
+	}
+	OUTREG(pf_win_size, 0);
+	INREG(pf_win_size);
+
+	ErrorF("FDI TX disable\n");
+	temp = INREG(fdi_tx_reg);
+	OUTREG(fdi_tx_reg, temp & ~FDI_TX_ENABLE);
+	INREG(fdi_tx_reg);
+
+	ErrorF("FDI RX disable\n");
+	temp = INREG(fdi_rx_reg);
+	temp &= ~(0x07 << 16);
+	temp |= pipe_bpc << 11;
+	OUTREG(fdi_rx_reg, temp & ~FDI_RX_ENABLE);
+	INREG(fdi_rx_reg);
+
+	usleep(100);
+
+	ErrorF("FDI TX train 1 preload\n");
+	/* still set train pattern 1 */
+	temp = INREG(fdi_tx_reg);
+	temp &= ~FDI_LINK_TRAIN_NONE;
+	temp |= FDI_LINK_TRAIN_PATTERN_1;
+	OUTREG(fdi_tx_reg, temp);
+	INREG(fdi_tx_reg);
+
+	ErrorF("FDI RX train 1 preload\n");
+	temp = INREG(fdi_rx_reg);
+	temp &= ~FDI_LINK_TRAIN_NONE;
+	temp |= FDI_LINK_TRAIN_PATTERN_1;
+	OUTREG(fdi_rx_reg, temp);
+	INREG(fdi_rx_reg);
+
+	usleep(100);
+
+	ErrorF("LVDS port force off\n");
+	if (i830PipeHasType(crtc, I830_OUTPUT_LVDS)) {
+	    while ((temp = INREG(PCH_LVDS)) & PORT_ENABLE) {
+		OUTREG(PCH_LVDS, temp & ~LVDS_PORT_EN);
+		INREG(PCH_LVDS);
+		usleep(100);
+	    }
+	}
+
+	ErrorF("Transcoder disable\n");
+	/* disable PCH transcoder */
+	temp = INREG(transconf_reg);
+	if ((temp & TRANS_STATE_ENABLE) != 0) {
+	    OUTREG(transconf_reg, temp & ~TRANS_ENABLE);
+	    INREG(transconf_reg);
+	    n = 0;
+	    /* wait for PCH transcoder off, transcoder state */
+	    while ((INREG(transconf_reg) & TRANS_STATE_ENABLE) != 0) {
+		n++;
+		if (n < 600) {
+		    usleep(500);
+		    continue;
+		} else {
+		    ErrorF("aborting transcoder disable early, 0x%08x\n", INREG(transconf_reg));
+		    break;
+		}
+	    }
+	}
+
+	temp = INREG(transconf_reg);
+	temp &= ~PIPE_BPC_MASK;
+	temp |= pipe_bpc;
+	OUTREG(transconf_reg, temp);
+	INREG(transconf_reg);
+	usleep(100);
+
+	ErrorF("PCH DPLL disable\n");
+	/* disable PCH DPLL */
+	temp = INREG(pch_dpll_reg);
+	OUTREG(pch_dpll_reg, temp & ~DPLL_VCO_ENABLE);
+	INREG(pch_dpll_reg);
+
+	ErrorF("FDI RX PLL PCD disable\n");
+	temp = INREG(fdi_rx_reg);
+	temp &= ~FDI_SEL_PCDCLK;
+	OUTREG(fdi_rx_reg, temp);
+	temp = INREG(fdi_rx_reg);
+
+	ErrorF("FDI TX PLL disable %08x\n", temp);
+	temp = INREG(fdi_tx_reg);
+	temp &= ~FDI_TX_PLL_ENABLE;
+	OUTREG(fdi_tx_reg, temp);
+	temp = INREG(fdi_tx_reg);
+	usleep(100);
+
+	ErrorF("FDI RX PLL disable %08x\n", temp);
+	temp = INREG(fdi_tx_reg);
+	OUTREG(fdi_tx_reg, temp & ~FDI_TX_PLL_ENABLE);
+	INREG(fdi_tx_reg);
+	usleep(100);
+
+	ErrorF("DPMS off done\n");
+	/* Wait for the clocks to turn off. */
+	usleep(150);
+}
+
+static void igdng_crtc_dpms(xf86CrtcPtr crtc, int mode)
+{
+    I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+
+    if (intel_crtc->pipe != intel_crtc->plane)
+	FatalError("pipe/plane mismatch, aborting\n");
+
+    /* XXX: When our outputs are all unaware of DPMS modes other than off
+     * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
+     */
+    switch (mode) {
+    case DPMSModeOn:
+    case DPMSModeStandby:
+    case DPMSModeSuspend:
+	ironlake_crtc_enable(crtc);
+	break;
+    case DPMSModeOff:
+	ironlake_crtc_disable(crtc);
+	intel_crtc->enabled = FALSE;
+	break;
+    }
+}
+
 /**
  * Sets the power management mode of the pipe and plane.
  *
@@ -1259,10 +1936,10 @@ i830_crtc_disable(xf86CrtcPtr crtc, Bool
  * on appropriately at the same time as we're turning the pipe off/on.
  */
 static void
-i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
+i9xx_crtc_dpms(xf86CrtcPtr crtc, int mode)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     int pipe = intel_crtc->pipe;
     Bool disable_pipe = TRUE;
@@ -1277,61 +1954,43 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mod
 	i830_crtc_enable(crtc);
 	break;
     case DPMSModeOff:
-	if ((pipe == 0) && (pI830->quirk_flag & QUIRK_PIPEA_FORCE))
+	if ((pipe == 0) && (intel->quirk_flag & QUIRK_PIPEA_FORCE))
 	    disable_pipe = FALSE;
 	i830_crtc_disable(crtc, disable_pipe);
+	intel_crtc->enabled = FALSE;
 	break;
     }
+}
 
-    intel_crtc->dpms_mode = mode;
+static void
+i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
+{
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
 
-#ifdef XF86DRI
-    if (pI830->directRenderingType == DRI_XF86DRI) {
-	drmI830Sarea *sPriv = (drmI830Sarea *) DRIGetSAREAPrivate(pScrn->pScreen);
-	Bool enabled = crtc->enabled && mode != DPMSModeOff;
-
-	I830DRISetVBlankInterrupt (pScrn, TRUE);
-
-	if (!sPriv)
-	    return;
-
-	switch (pipe) {
-	case 0:
-	    sPriv->pipeA_w = enabled ? crtc->mode.HDisplay : 0;
-	    sPriv->pipeA_h = enabled ? crtc->mode.VDisplay : 0;
-	    break;
-	case 1:
-	    sPriv->pipeB_w = enabled ? crtc->mode.HDisplay : 0;
-	    sPriv->pipeB_h = enabled ? crtc->mode.VDisplay : 0;
-	    break;
-	default:
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Can't update pipe %d in SAREA\n", pipe);
-	    break;
-	}
-    }
-#endif
+    if (IS_IGDNG(intel))
+	igdng_crtc_dpms(crtc, mode);
+    else
+	i9xx_crtc_dpms(crtc, mode);
+
+    intel_crtc->dpms_mode = mode;
 }
 
 static Bool
 i830_crtc_lock (xf86CrtcPtr crtc)
 {
-   /* Sync the engine before mode switch */
-   i830WaitSync(crtc->scrn);
+    /* Sync the engine before mode switch, to finish any outstanding
+     * WAIT_FOR_EVENTS that may rely on CRTC state.
+     */
+    intel_sync(crtc->scrn);
 
-#ifdef XF86DRI
-    return I830DRILock(crtc->scrn);
-#else
     return FALSE;
-#endif
 }
 
 static void
 i830_crtc_unlock (xf86CrtcPtr crtc)
 {
-#ifdef XF86DRI
-    I830DRIUnlock (crtc->scrn);
-#endif
 }
 
 static void
@@ -1366,11 +2025,6 @@ i830_crtc_commit (xf86CrtcPtr crtc)
     /* Reenable FB compression if possible */
     if (i830_use_fb_compression(crtc))
 	i830_enable_fb_compression(crtc);
-
-#ifdef XF86DRI
-    /* Tell DRI1 the news about new output config */
-    i830_update_dri_buffers(crtc->scrn);
-#endif
 }
 
 void
@@ -1389,32 +2043,37 @@ static Bool
 i830_crtc_mode_fixup(xf86CrtcPtr crtc, DisplayModePtr mode,
 		     DisplayModePtr adjusted_mode)
 {
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+
+    if (IS_IGDNG(intel)) {
+	/* FDI link clock is fixed at 2.7G */
+	if (mode->Clock * 3 > 27000 * 4)
+	    return MODE_CLOCK_HIGH;
+    }
+
     return TRUE;
 }
 
 /** Returns the core display clock speed for i830 - i945 */
 static int
-i830_get_core_clock_speed(ScrnInfoPtr pScrn)
+i830_get_core_clock_speed(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     /* Core clock values taken from the published datasheets.
      * The 830 may go up to 166 Mhz, which we should check.
      */
-    if (IS_I945G(pI830) || (IS_G33CLASS(pI830) && !IS_IGDGM(pI830)))
+    if (IS_I945G(intel) || (IS_G33CLASS(intel) && !IS_IGDGM(intel)))
 	return 400000;
-    else if (IS_I915G(pI830))
+    else if (IS_I915G(intel))
 	return 333000;
-    else if (IS_I945GM(pI830) || IS_845G(pI830) || IS_IGDGM(pI830))
+    else if (IS_I945GM(intel) || IS_845G(intel) || IS_IGDGM(intel))
 	return 200000;
-    else if (IS_I915GM(pI830)) {
+    else if (IS_I915GM(intel)) {
 	uint16_t gcfgc;
 
-#if XSERVER_LIBPCIACCESS
-      pci_device_cfg_read_u16 (pI830->PciInfo, &gcfgc, I915_GCFGC);
-#else
-      gcfgc = pciReadWord(pI830->PciTag, I915_GCFGC);
-#endif
+      pci_device_cfg_read_u16 (intel->PciInfo, &gcfgc, I915_GCFGC);
       if (gcfgc & I915_LOW_FREQUENCY_ENABLE)
 	    return 133000;
 	else {
@@ -1426,17 +2085,12 @@ i830_get_core_clock_speed(ScrnInfoPtr pS
 		return 190000;
 	    }
 	}
-    } else if (IS_I865G(pI830))
+    } else if (IS_I865G(intel))
 	return 266000;
-    else if (IS_I855(pI830)) {
-#if XSERVER_LIBPCIACCESS
+    else if (IS_I855(intel)) {
         struct pci_device *bridge = intel_host_bridge ();
 	uint16_t hpllcc;
 	pci_device_cfg_read_u16 (bridge, &hpllcc, I855_HPLLCC);
-#else
-	PCITAG bridge = pciTag(0, 0, 0); /* This is always the host bridge */
-	uint16_t hpllcc = pciReadWord(bridge, I855_HPLLCC);
-#endif
 
 	/* Assume that the hardware is in the high speed state.  This
 	 * should be the default.
@@ -1461,12 +2115,12 @@ i830_get_core_clock_speed(ScrnInfoPtr pS
  * or -1 if the panel fitter is not present or not in use
  */
 static int
-i830_panel_fitter_pipe(I830Ptr pI830)
+i830_panel_fitter_pipe(intel_screen_private *intel)
 {
     uint32_t pfit_control;
 
     /* i830 doesn't have a panel fitter */
-    if (IS_I830(pI830))
+    if (IS_I830(intel))
 	return -1;
 
     pfit_control = INREG(PFIT_CONTROL);
@@ -1476,7 +2130,7 @@ i830_panel_fitter_pipe(I830Ptr pI830)
 	return -1;
 
     /* 965 can place panel fitter on either pipe */
-    if (IS_I965G(pI830))
+    if (IS_I965G(intel))
 	return (pfit_control & PFIT_PIPE_MASK) >> PFIT_PIPE_SHIFT;
 
     /* older chips can only use pipe 1 */
@@ -1490,26 +2144,26 @@ i830_panel_fitter_pipe(I830Ptr pI830)
  * Adjusting this register requires that the planes be off.
  */
 static void
-i830_update_dsparb(ScrnInfoPtr pScrn)
+i830_update_dsparb(ScrnInfoPtr scrn)
 {
-   xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-   I830Ptr pI830 = I830PTR(pScrn);
+   xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+   intel_screen_private *intel = intel_get_screen_private(scrn);
    int total_hdisplay = 0, planea_hdisplay = 0, planeb_hdisplay = 0;
    int fifo_entries = 0, planea_entries = 0, planeb_entries = 0, i;
 
    if ((INREG(DSPACNTR) & DISPLAY_PLANE_ENABLE) &&
        (INREG(DSPBCNTR) & DISPLAY_PLANE_ENABLE))
-       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+       xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		  "tried to update DSPARB with both planes enabled!\n");
 
   /*
     * FIFO entries will be split based on programmed modes
     */
-   if (IS_I965GM(pI830))
+   if (IS_I965GM(intel))
        fifo_entries = 127;
-   else if (IS_I9XX(pI830))
+   else if (IS_I9XX(intel))
        fifo_entries = 95;
-   else if (IS_MOBILE(pI830)) {
+   else if (IS_MOBILE(intel)) {
        fifo_entries = 255;
    } else {
 	/* The 845/865 only have a AEND field.  Though the field size would
@@ -1534,11 +2188,11 @@ i830_update_dsparb(ScrnInfoPtr pScrn)
    planea_entries = fifo_entries * planea_hdisplay / total_hdisplay;
    planeb_entries = fifo_entries * planeb_hdisplay / total_hdisplay;
 
-   if (IS_I9XX(pI830))
+   if (IS_I9XX(intel))
        OUTREG(DSPARB,
 	      ((planea_entries + planeb_entries) << DSPARB_CSTART_SHIFT) |
 	      (planea_entries << DSPARB_BSTART_SHIFT));
-   else if (IS_MOBILE(pI830))
+   else if (IS_MOBILE(intel))
        OUTREG(DSPARB,
 	      ((planea_entries + planeb_entries) << DSPARB_BEND_SHIFT) |
 	      (planea_entries << DSPARB_AEND_SHIFT));
@@ -1546,6 +2200,48 @@ i830_update_dsparb(ScrnInfoPtr pScrn)
        OUTREG(DSPARB, planea_entries << DSPARB_AEND_SHIFT);
 }
 
+struct fdi_m_n {
+    CARD32        tu;
+    CARD32        gmch_m;
+    CARD32        gmch_n;
+    CARD32        link_m;
+    CARD32        link_n;
+};
+
+static void
+fdi_reduce_ratio(CARD32 *num, CARD32 *den)
+{
+    while (*num > 0xffffff || *den > 0xffffff) {
+	*num >>= 1;
+	*den >>= 1;
+    }
+}
+
+#define DATA_N 0x800000
+#define LINK_N 0x80000
+
+static void
+igdng_compute_m_n(int bits_per_pixel, int nlanes,
+		  int pixel_clock, int link_clock,
+		  struct fdi_m_n *m_n)
+{
+    uint64_t temp;
+
+    m_n->tu = 64; /* default size */
+
+    temp = (uint64_t) DATA_N * pixel_clock;
+    temp = temp / link_clock;
+    m_n->gmch_m = (temp * bits_per_pixel) / nlanes;
+    m_n->gmch_m >>= 3; /* convert to bytes per pixel */
+    m_n->gmch_n = DATA_N;
+    fdi_reduce_ratio(&m_n->gmch_m, &m_n->gmch_n);
+
+    temp = (uint64_t) LINK_N * pixel_clock;
+    m_n->link_m = temp / link_clock;
+    m_n->link_n = LINK_N;
+    fdi_reduce_ratio(&m_n->link_m, &m_n->link_n);
+}
+
 /**
  * Sets up registers for the given mode/adjusted_mode pair.
  *
@@ -1559,9 +2255,9 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 		   DisplayModePtr adjusted_mode,
 		   int x, int y)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     I830OutputPrivatePtr intel_output;
     int pipe = intel_crtc->pipe;
@@ -1588,6 +2284,19 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
     Bool is_crt = FALSE, is_lvds = FALSE, is_tv = FALSE;
     const intel_limit_t *limit;
 
+    struct fdi_m_n m_n = {0};
+    int data_m1_reg = (pipe == 0) ? PIPEA_DATA_M1 : PIPEB_DATA_M1;
+    int data_n1_reg = (pipe == 0) ? PIPEA_DATA_N1 : PIPEB_DATA_N1;
+    int link_m1_reg = (pipe == 0) ? PIPEA_LINK_M1 : PIPEB_LINK_M1;
+    int link_n1_reg = (pipe == 0) ? PIPEA_LINK_N1 : PIPEB_LINK_N1;
+    int pch_fp_reg = (pipe == 0) ? PCH_FPA0 : PCH_FPB0;
+    int pch_dpll_reg = (pipe == 0) ? PCH_DPLL_A : PCH_DPLL_B;
+    int fdi_rx_reg = (pipe == 0) ? FDI_RXA_CTL : FDI_RXB_CTL;
+    int fdi_tx_reg = (pipe == 0) ? FDI_TXA_CTL : FDI_TXB_CTL;
+    int lvds_reg = LVDS;
+    uint32_t temp;
+    int sdvo_pixel_multiply;
+
     /* Set up some convenient bools for what outputs are connected to
      * our pipe, used in DPLL setup.
      */
@@ -1626,15 +2335,17 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
     }
 
     if (num_outputs > 1)
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "clone detected, disabling SSC\n");
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "clone detected, disabling SSC\n");
 
     /* Don't use SSC when cloned */
-    if (is_lvds && pI830->lvds_use_ssc && num_outputs < 2) {
-	refclk = pI830->lvds_ssc_freq * 1000;
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    if (is_lvds && intel->lvds_use_ssc && num_outputs < 2) {
+	refclk = intel->lvds_ssc_freq * 1000;
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "using SSC reference clock of %d MHz\n", refclk / 1000);
-    } else if (IS_I9XX(pI830)) {
+    } else if (IS_I9XX(intel)) {
 	refclk = 96000;
+	if (IS_IGDNG(intel))
+	    refclk = 120000; /* 120Mhz refclk */
     } else {
 	refclk = 48000;
     }
@@ -1650,7 +2361,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	FatalError("Couldn't find PLL settings for mode!\n");
 
     if (fabs(adjusted_mode->Clock - clock.dot) / clock.dot > .02) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		   "Chosen PLL clock of %.1f Mhz more than 2%% away from "
 		   "desired %.1f Mhz\n",
 		   (float)clock.dot / 1000,
@@ -1677,13 +2388,47 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	}
     }
 
-    if (IS_IGD(pI830))
+    if (IS_IGDNG(intel)) {
+	int bpp = 24;
+	if (is_lvds) {
+	    uint32_t lvds_reg = INREG(PCH_LVDS);
+
+	    if (!((lvds_reg & LVDS_A3_POWER_MASK) == LVDS_A3_POWER_UP))
+		bpp = 18;
+	}
+
+	igdng_compute_m_n(bpp, 4, /* lane num 4 */
+			  adjusted_mode->Clock,
+			  270000, /* lane clock */
+			  &m_n);
+	ErrorF("bpp %d\n", bpp / 3);
+	intel_crtc->bpc = bpp / 3;
+    }
+
+    if (IS_IGDNG(intel)) {
+	uint32_t temp;
+
+	temp = INREG(PCH_DREF_CONTROL);
+	/* Always enable nonspread source */
+	temp &= ~DREF_NONSPREAD_SOURCE_MASK;
+	temp |= DREF_NONSPREAD_SOURCE_ENABLE;
+	OUTREG(PCH_DREF_CONTROL, temp);
+	temp = INREG(PCH_DREF_CONTROL);
+
+	temp &= ~DREF_SSC_SOURCE_MASK;
+	temp |= DREF_SSC_SOURCE_ENABLE;
+	OUTREG(PCH_DREF_CONTROL, temp);
+	temp = INREG(PCH_DREF_CONTROL);
+    }
+
+    if (IS_IGD(intel))
 	fp = (1 << clock.n) << 16 | clock.m1 << 8 | clock.m2;
     else
 	fp = clock.n << 16 | clock.m1 << 8 | clock.m2;
 
-    dpll = DPLL_VGA_MODE_DIS;
-    if (IS_I9XX(pI830)) {
+    if (!IS_IGDNG(intel))
+	dpll = DPLL_VGA_MODE_DIS;
+    if (IS_I9XX(intel)) {
 	if (is_lvds)
 	    dpll |= DPLLB_MODE_LVDS;
 	else
@@ -1691,15 +2436,16 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	if (is_sdvo)
 	{
 	    dpll |= DPLL_DVO_HIGH_SPEED;
-	    if ((IS_I945G(pI830) || IS_I945GM(pI830) || IS_G33CLASS(pI830)))
-	    {
-		int sdvo_pixel_multiply = adjusted_mode->Clock / mode->Clock;
+	    sdvo_pixel_multiply = adjusted_mode->Clock / mode->Clock;
+	    if ((IS_I945G(intel) || IS_I945GM(intel) || IS_G33CLASS(intel)))
 		dpll |= (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
-	    }
+	    else if (IS_IGDNG(intel))
+		dpll |= (sdvo_pixel_multiply - 1) << PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT;
+		
 	}
 	
 	/* compute bitmask from p1 value */
-	if (IS_IGD(pI830))
+	if (IS_IGD(intel))
 	    dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA01_P1_POST_DIV_SHIFT_IGD;
 	else
 	    dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA01_P1_POST_DIV_SHIFT;
@@ -1717,7 +2463,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	    dpll |= DPLLB_LVDS_P2_CLOCK_DIV_14;
 	    break;
 	}
-	if (IS_I965G(pI830) && !IS_GM45(pI830))
+	if (IS_I965G(intel) && !IS_GM45(intel) && !IS_IGDNG(intel))
 	    dpll |= (6 << PLL_LOAD_PULSE_PHASE_SHIFT);
     } else {
 	if (is_lvds) {
@@ -1740,19 +2486,23 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 /*	dpll |= PLL_REF_INPUT_TVCLKINBC; */
 	dpll |= 3;
     }
-    else if (is_lvds && pI830->lvds_use_ssc && num_outputs < 2)
+    else if (is_lvds && intel->lvds_use_ssc && num_outputs < 2)
 	dpll |= PLLB_REF_INPUT_SPREADSPECTRUMIN;
     else
 	dpll |= PLL_REF_INPUT_DREFCLK;
 
     /* Set up the display plane register */
     dspcntr = DISPPLANE_GAMMA_ENABLE;
-    switch (pScrn->bitsPerPixel) {
+    /* this is "must be enabled" in the docs, but not set by bios */
+    if (IS_IGDNG(intel))
+	dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
+
+    switch (scrn->bitsPerPixel) {
     case 8:
 	dspcntr |= DISPPLANE_8BPP;
 	break;
     case 16:
-	if (pScrn->depth == 15)
+	if (scrn->depth == 15)
 	    dspcntr |= DISPPLANE_15_16BPP;
 	else
 	    dspcntr |= DISPPLANE_16BPP;
@@ -1764,16 +2514,20 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	FatalError("unknown display bpp\n");
     }
 
-    if (pipe == 0)
-	dspcntr |= DISPPLANE_SEL_PIPE_A;
-    else
-	dspcntr |= DISPPLANE_SEL_PIPE_B;
+    /* IGDNG's plane is forced to pipe, bit 24 is to
+       enable color space conversion */
+    if (!IS_IGDNG(intel)) {
+	if (pipe == 0)
+	    dspcntr |= DISPPLANE_SEL_PIPE_A;
+	else
+	    dspcntr |= DISPPLANE_SEL_PIPE_B;
+    }
 
-    if (IS_I965G(pI830) && i830_display_tiled(crtc))
+    if (IS_I965G(intel) && i830_display_tiled(crtc))
 	dspcntr |= DISPLAY_PLANE_TILED;
 
     pipeconf = INREG(pipeconf_reg);
-    if (pipe == 0 && !IS_I965G(pI830))
+    if (pipe == 0 && !IS_I965G(intel))
     {
 	/* Enable pixel doubling when the dot clock is > 90% of the (display)
 	 * core speed.
@@ -1781,17 +2535,26 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	 * XXX: No double-wide on 915GM pipe B. Is that the only reason for the
 	 * pipe == 0 check?
 	 */
-	if (mode->Clock > i830_get_core_clock_speed(pScrn) * 9 / 10)
+	if (mode->Clock > i830_get_core_clock_speed(scrn) * 9 / 10)
 	    pipeconf |= PIPEACONF_DOUBLE_WIDE;
 	else
 	    pipeconf &= ~PIPEACONF_DOUBLE_WIDE;
     }
+
+    if (IS_IGDNG(intel)) {
+	pipeconf &= ~(7 << 5);
+	if (intel_crtc->bpc == 6)
+	    pipeconf |= (1 << 6); /* 0 is 8bpc */
+	if (intel_crtc->bpc != 8)
+	    pipeconf |= (1 << 4); /* enable dithering */
+    }
+
     /*
      * This "shouldn't" be needed as the dpms on code
      * will be run after the mode is set. On 9xx, it helps.
      * On 855, it can lock up the chip (and the entire machine)
      */
-    if (!IS_I85X (pI830))
+    if (!IS_I85X (intel))
     {
 	dspcntr |= DISPLAY_PLANE_ENABLE;
 	pipeconf |= PIPEACONF_ENABLE;
@@ -1799,19 +2562,25 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
     }
     
     /* Disable the panel fitter if it was on our pipe */
-    if (i830_panel_fitter_pipe (pI830) == pipe)
+    if (!IS_IGDNG(intel) && i830_panel_fitter_pipe (intel) == pipe)
 	OUTREG(PFIT_CONTROL, 0);
 
-    if (pI830->debug_modes) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    if (intel->debug_modes) {
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "Mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
-	xf86PrintModeline(pScrn->scrnIndex, mode);
+	xf86PrintModeline(scrn->scrnIndex, mode);
 	if (!xf86ModesEqual(mode, adjusted_mode)) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "Adjusted mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
-	    xf86PrintModeline(pScrn->scrnIndex, adjusted_mode);
+	    xf86PrintModeline(scrn->scrnIndex, adjusted_mode);
 	}
-	i830PrintPll(pScrn, "chosen", &clock);
+	i830PrintPll(scrn, "chosen", &clock);
+    }
+
+    /* assign to IGDNG registers */
+    if (IS_IGDNG(intel)) {
+	fp_reg = pch_fp_reg;
+	dpll_reg = pch_dpll_reg;
     }
 
     if (dpll & DPLL_VCO_ENABLE)
@@ -1828,9 +2597,17 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
      */
     if (is_lvds)
     {
-	uint32_t lvds = INREG(LVDS);
+	uint32_t lvds;
+
+	if (IS_IGDNG(intel))
+	    lvds_reg = PCH_LVDS;
 
-	lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP | LVDS_PIPEB_SELECT;
+	lvds = INREG(lvds_reg);
+	lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP;
+	if (IS_IGDNG(intel))
+	    lvds |= (pipe == 1) ? LVDS_PIPEB_SELECT : 0; 
+	else
+	    lvds |= LVDS_PIPEB_SELECT;
 	/* Set the B0-B3 data pairs corresponding to whether we're going to
 	 * set the DPLLs for dual-channel mode or not.
 	 */
@@ -1839,24 +2616,24 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	else
 	    lvds &= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);
 
-	if (pI830->lvds_24_bit_mode) {
+	if (intel->lvds_24_bit_mode) {
 	    /* Option set which requests 24-bit mode
 	     * (LVDS_A3_POWER_UP, as opposed to 18-bit mode) here; we
 	     * still need to look more thoroughly into how panels
 	     * behave in the two modes.  This option enables that
 	     * experimentation.
 	     */
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "Selecting less common 24 bit TMDS pixel format.\n");
 	    lvds |= LVDS_A3_POWER_UP;
 	    lvds |= LVDS_DATA_FORMAT_DOT_ONE;
 	} else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "Selecting standard 18 bit TMDS pixel format.\n");
 	}
 
 	/* Enable dithering if we're in 18-bit mode. */
-	if (IS_I965G(pI830))
+	if (IS_I965G(intel))
 	{
 	    if ((lvds & LVDS_A3_POWER_MASK) == LVDS_A3_POWER_UP)
 		lvds &= ~LVDS_DITHER_ENABLE;
@@ -1866,17 +2643,18 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 
 	lvds |= lvds_bits;
 
-	OUTREG(LVDS, lvds);
-	POSTING_READ(LVDS);
+	OUTREG(lvds_reg, lvds);
+	POSTING_READ(lvds_reg);
     }
 
     OUTREG(fp_reg, fp);
+/*    OUTREG(fp_reg + 4, fp); RHEL had this... wtf? */
     OUTREG(dpll_reg, dpll);
     POSTING_READ(dpll_reg);
     /* Wait for the clocks to stabilize. */
     usleep(150);
     
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel) && !IS_IGDNG(intel)) {
 	int sdvo_pixel_multiply = adjusted_mode->Clock / mode->Clock;
 	OUTREG(dpll_md_reg, (0 << DPLL_MD_UDI_DIVIDER_SHIFT) |
 	       ((sdvo_pixel_multiply - 1) << DPLL_MD_UDI_MULTIPLIER_SHIFT));
@@ -1888,8 +2666,8 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
     /* Wait for the clocks to stabilize. */
     usleep(150);
 
-    if (!DSPARB_HWCONTROL(pI830))
-	i830_update_dsparb(pScrn);
+    if (!DSPARB_HWCONTROL(intel))
+	i830_update_dsparb(scrn);
 
     OUTREG(htot_reg, (adjusted_mode->CrtcHDisplay - 1) |
 	((adjusted_mode->CrtcHTotal - 1) << 16));
@@ -1899,7 +2677,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	((adjusted_mode->CrtcHSyncEnd - 1) << 16));
     OUTREG(vtot_reg, (adjusted_mode->CrtcVDisplay - 1) |
 	((adjusted_mode->CrtcVTotal - 1) << 16));
-    
+
     OUTREG(vblank_reg, (adjusted_mode->CrtcVBlankStart - 1) |
 	((adjusted_mode->CrtcVBlankEnd - 1) << 16));
     OUTREG(vsync_reg, (adjusted_mode->CrtcVSyncStart - 1) |
@@ -1907,38 +2685,71 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
     /* pipesrc and dspsize control the size that is scaled from, which should
      * always be the user's requested size.
      */
-    OUTREG(dspsize_reg, ((mode->VDisplay - 1) << 16) | (mode->HDisplay - 1));
-    OUTREG(dsppos_reg, 0);
+    if (!IS_IGDNG(intel)) {
+	    OUTREG(dspsize_reg, ((mode->VDisplay - 1) << 16) | (mode->HDisplay - 1));
+	    OUTREG(dsppos_reg, 0);
+    }
     OUTREG(pipesrc_reg, ((mode->HDisplay - 1) << 16) | (mode->VDisplay - 1));
+
+    if (IS_IGDNG(intel)) {
+	OUTREG(data_m1_reg, TU_SIZE(m_n.tu) | m_n.gmch_m);
+	OUTREG(data_n1_reg, TU_SIZE(m_n.tu) | m_n.gmch_n);
+	OUTREG(link_m1_reg, m_n.link_m);
+	OUTREG(link_n1_reg, m_n.link_n);
+
+	/* enable FDI RX PLL too */
+	temp = INREG(fdi_rx_reg);
+	OUTREG(fdi_rx_reg, temp | FDI_RX_PLL_ENABLE);
+	INREG(fdi_rx_reg);
+	usleep(200);
+
+	temp = INREG(fdi_tx_reg);
+	OUTREG(fdi_tx_reg, temp | FDI_TX_PLL_ENABLE);
+	INREG(fdi_tx_reg);
+
+	temp = INREG(fdi_rx_reg);
+	OUTREG(fdi_rx_reg, temp | FDI_RX_PLL_ENABLE);
+	INREG(fdi_rx_reg);
+	usleep(200);
+    }
+
     OUTREG(pipeconf_reg, pipeconf);
     POSTING_READ(pipeconf_reg);
-    i830WaitForVblank(pScrn);
+    i830WaitForVblank(scrn);
+
+    if (IS_IGDNG(intel)) {
+	/* enable address swizzle for tiling buffer */
+	temp = INREG(DISP_ARB_CTL);
+	OUTREG(DISP_ARB_CTL, temp | DISP_TILE_SURFACE_SWIZZLING);
+    }
 
     OUTREG(dspcntr_reg, dspcntr);
     /* Flush the plane changes */
     i830PipeSetBase(crtc, x, y);
-#ifdef XF86DRI
-   I830DRISetVBlankInterrupt (pScrn, TRUE);
-#endif
-    
-    i830WaitForVblank(pScrn);
+
+    i830WaitForVblank(scrn);
 }
 
 
 /** Loads the palette/gamma unit for the CRTC with the prepared values */
-void
+static void
 i830_crtc_load_lut(xf86CrtcPtr crtc)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     int palreg = (intel_crtc->pipe == 0) ? PALETTE_A : PALETTE_B;
     int i;
 
     /* The clocks have to be on to load the palette. */
-    if (!crtc->enabled || intel_crtc->dpms_mode != DPMSModeOn)
+    if (!crtc->enabled)
 	return;
 
+    /* use legacy palette for IGDNG */
+    if (IS_IGDNG(intel))
+	palreg = (intel_crtc->pipe == 0) ? LGC_PALETTE_A :
+	    LGC_PALETTE_B;
+
     for (i = 0; i < 256; i++) {
 	OUTREG(palreg + 4 * i,
 	       (intel_crtc->lut_r[i] << 16) |
@@ -1952,6 +2763,8 @@ static void
 i830_crtc_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
 		    int size)
 {
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     int i;
 
@@ -1963,7 +2776,13 @@ i830_crtc_gamma_set(xf86CrtcPtr crtc, CA
 	intel_crtc->lut_b[i] = blue[i] >> 8;
     }
 
-    i830_crtc_load_lut(crtc);
+    /*
+     * 855 at least really doesn't seem like like you poking its
+     * pallette registers other than at mode set time. so just disable
+     * this for now on 8xx. Stops hard machine lockups for me.
+     */
+    if (IS_I9XX(intel))
+	i830_crtc_load_lut(crtc);
 }
 
 /**
@@ -1974,28 +2793,28 @@ i830_crtc_gamma_set(xf86CrtcPtr crtc, CA
 static void *
 i830_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = crtc->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     unsigned long rotate_pitch;
     int align = KB(4), size;
 
-    width = i830_pad_drawable_width(width, pI830->cpp);
-    rotate_pitch = width * pI830->cpp;
+    width = i830_pad_drawable_width(width);
+    rotate_pitch = width * intel->cpp;
     size = rotate_pitch * height;
 
     assert(intel_crtc->rotate_mem == NULL);
-    intel_crtc->rotate_mem = i830_allocate_memory(pScrn, "rotated crtc",
+    intel_crtc->rotate_mem = i830_allocate_memory(scrn, "rotated crtc",
 						  size, rotate_pitch, align,
 						  0, TILE_NONE);
     if (intel_crtc->rotate_mem == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "Couldn't allocate shadow memory for rotated CRTC\n");
 	return NULL;
     }
-    memset(pI830->FbBase + intel_crtc->rotate_mem->offset, 0, size);
+    memset(intel->FbBase + intel_crtc->rotate_mem->offset, 0, size);
 
-    return pI830->FbBase + intel_crtc->rotate_mem->offset;
+    return intel->FbBase + intel_crtc->rotate_mem->offset;
 }
     
 /**
@@ -2004,26 +2823,26 @@ i830_crtc_shadow_allocate (xf86CrtcPtr c
 static PixmapPtr
 i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
+    ScrnInfoPtr scrn = crtc->scrn;
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     int rotate_pitch;
     PixmapPtr rotate_pixmap;
 
     if (!data)
 	data = i830_crtc_shadow_allocate (crtc, width, height);
     
-    rotate_pitch = i830_pad_drawable_width(width, pI830->cpp) * pI830->cpp;
+    rotate_pitch = i830_pad_drawable_width(width) * intel->cpp;
 
-    rotate_pixmap = GetScratchPixmapHeader(pScrn->pScreen,
+    rotate_pixmap = GetScratchPixmapHeader(scrn->pScreen,
 					   width, height,
-					   pScrn->depth,
-					   pScrn->bitsPerPixel,
+					   scrn->depth,
+					   scrn->bitsPerPixel,
 					   rotate_pitch,
 					   data);
 
     if (rotate_pixmap == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "Couldn't allocate shadow pixmap for rotated CRTC\n");
     }
     if (intel_crtc->rotate_mem && intel_crtc->rotate_mem->bo)
@@ -2034,16 +2853,18 @@ i830_crtc_shadow_create(xf86CrtcPtr crtc
 static void
 i830_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
+    ScrnInfoPtr scrn = crtc->scrn;
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
 
-    if (rotate_pixmap)
+    if (rotate_pixmap) {
+	i830_set_pixmap_bo(rotate_pixmap, NULL);
 	FreeScratchPixmapHeader(rotate_pixmap);
+    }
 
     if (data) {
 	/* Be sure to sync acceleration before the memory gets unbound. */
-	I830Sync(pScrn);
-	i830_free_memory(pScrn, intel_crtc->rotate_mem);
+	intel_sync(scrn);
+	i830_free_memory(scrn, intel_crtc->rotate_mem);
 	intel_crtc->rotate_mem = NULL;
     }
 }
@@ -2061,9 +2882,9 @@ i830_crtc_set_origin(xf86CrtcPtr crtc, i
  * the same location that it currently points at, but in the new bo
  */
 void
-i830_set_new_crtc_bo(ScrnInfoPtr pScrn)
+i830_set_new_crtc_bo(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     int			i;
 
     for (i = 0; i < xf86_config->num_crtc; i++) {
@@ -2075,13 +2896,13 @@ i830_set_new_crtc_bo(ScrnInfoPtr pScrn)
 }
 
 void
-i830DescribeOutputConfiguration(ScrnInfoPtr pScrn)
+i830DescribeOutputConfiguration(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    I830Ptr pI830 = I830PTR(pScrn);
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     int i;
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Output configuration:\n");
+    xf86DrvMsg(scrn->scrnIndex, X_INFO, "Output configuration:\n");
 
     for (i = 0; i < xf86_config->num_crtc; i++) {
 	xf86CrtcPtr crtc = xf86_config->crtc[i];
@@ -2092,24 +2913,30 @@ i830DescribeOutputConfiguration(ScrnInfo
 	    INREG(PIPEBCONF);
 	Bool hw_plane_enable = (dspcntr & DISPLAY_PLANE_ENABLE) != 0;
 	Bool hw_pipe_enable = (pipeconf & PIPEACONF_ENABLE) != 0;
+	int pipe;
+
+	if (IS_IGDNG(intel))
+	    pipe = intel_crtc->plane;
+	else
+	    pipe = !!(dspcntr & DISPPLANE_SEL_PIPE_MASK);
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "  Pipe %c is %s\n",
 		   'A' + i, crtc->enabled ? "on" : "off");
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "  Display plane %c is now %s and connected to pipe %c.\n",
 		   'A' + intel_crtc->plane,
 		   hw_plane_enable ? "enabled" : "disabled",
-		   dspcntr & DISPPLANE_SEL_PIPE_MASK ? 'B' : 'A');
+		   'A' + pipe);
 	if (hw_pipe_enable != crtc->enabled) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		       "  Hardware claims pipe %c is %s while software "
 		       "believes it is %s\n",
 		       'A' + i, hw_pipe_enable ? "on" : "off",
 		       crtc->enabled ? "on" : "off");
 	}
 	if (hw_plane_enable != crtc->enabled) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		       "  Hardware claims plane %c is %s while software "
 		       "believes it is %s\n",
 		       'A' + i, hw_plane_enable ? "on" : "off",
@@ -2122,7 +2949,7 @@ i830DescribeOutputConfiguration(ScrnInfo
 	xf86CrtcPtr	crtc = output->crtc;
 	I830CrtcPrivatePtr	intel_crtc = crtc ? crtc->driver_private : NULL;
 	
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "  Output %s is connected to pipe %s\n",
 		   output->name, intel_crtc == NULL ? "none" :
 		   (intel_crtc->pipe == 0 ? "A" : "B"));
@@ -2160,8 +2987,8 @@ static DisplayModeRec   load_detect_mode
 xf86CrtcPtr
 i830GetLoadDetectPipe(xf86OutputPtr output, DisplayModePtr mode, int *dpms_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    xf86CrtcConfigPtr	    xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    xf86CrtcConfigPtr	    xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     I830CrtcPrivatePtr	    intel_crtc;
     xf86CrtcPtr		    supported_crtc =NULL;
@@ -2227,7 +3054,7 @@ i830GetLoadDetectPipe(xf86OutputPtr outp
 	output->funcs->commit (output);
     }
     /* let the output get through one full cycle before testing */
-    i830WaitForVblank (pScrn);
+    i830WaitForVblank (scrn);
 
     return crtc;
 }
@@ -2235,7 +3062,7 @@ i830GetLoadDetectPipe(xf86OutputPtr outp
 void
 i830ReleaseLoadDetectPipe(xf86OutputPtr output, int dpms_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     xf86CrtcPtr		    crtc = output->crtc;
     
@@ -2244,7 +3071,7 @@ i830ReleaseLoadDetectPipe(xf86OutputPtr
 	output->crtc = NULL;
 	intel_output->load_detect_temp = FALSE;
 	crtc->enabled = xf86CrtcInUse (crtc);
-	xf86DisableUnusedFunctions(pScrn);
+	xf86DisableUnusedFunctions(scrn);
     }
     /*
      * Switch crtc and output back off if necessary
@@ -2259,9 +3086,9 @@ i830ReleaseLoadDetectPipe(xf86OutputPtr
 
 /* Returns the clock of the currently programmed mode of the given pipe. */
 static int
-i830_crtc_clock_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc)
+i830_crtc_clock_get(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     int pipe = intel_crtc->pipe;
     uint32_t dpll = INREG((pipe == 0) ? DPLL_A : DPLL_B);
@@ -2274,15 +3101,15 @@ i830_crtc_clock_get(ScrnInfoPtr pScrn, x
 	fp = INREG((pipe == 0) ? FPA1 : FPB1);
 
     clock.m1 = (fp & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT;
-    if (IS_IGD(pI830)) {
+    if (IS_IGD(intel)) {
 	clock.n = ffs((fp & FP_N_IGD_DIV_MASK) >> FP_N_DIV_SHIFT) - 1;
 	clock.m2 = (fp & FP_M2_IGD_DIV_MASK) >> FP_M2_DIV_SHIFT;
     } else {
 	clock.n = (fp & FP_N_DIV_MASK) >> FP_N_DIV_SHIFT;
 	clock.m2 = (fp & FP_M2_DIV_MASK) >> FP_M2_DIV_SHIFT;
     }
-    if (IS_I9XX(pI830)) {
-	if (IS_IGD(pI830))
+    if (IS_I9XX(intel)) {
+	if (IS_IGD(intel))
 	    clock.p1 = ffs((dpll & DPLL_FPA01_P1_POST_DIV_MASK_IGD) >>
 			   DPLL_FPA01_P1_POST_DIV_SHIFT_IGD);
 	else
@@ -2297,33 +3124,36 @@ i830_crtc_clock_get(ScrnInfoPtr pScrn, x
 	    clock.p2 = dpll & DPLLB_LVDS_P2_CLOCK_DIV_7 ? 7 : 14;
 	    break;
 	default:
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		       "Unknown DPLL mode %08x in programmed mode\n",
 		       (int)(dpll & DPLL_MODE_MASK));
 	    return 0;
 	}
 
-	if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)
-	    intel_clock(pI830, 100000, &clock);
+	if (IS_IGDNG(intel))
+	    i9xx_clock(120000, &clock);
+	else if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)
+	    intel_clock(intel, 100000, &clock);
 	else
-	    intel_clock(pI830, 96000, &clock);
+	    intel_clock(intel, 96000, &clock);
     } else {
-	Bool is_lvds = (pipe == 1) && (INREG(LVDS) & LVDS_PORT_EN);
+	CARD32 lvds = IS_IGDNG(intel) ? PCH_LVDS : LVDS;
+	Bool is_lvds = (pipe == 1) && (INREG(lvds) & LVDS_PORT_EN);
 
 	if (is_lvds) {
 	    clock.p1 = ffs((dpll & DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) >>
 			   DPLL_FPA01_P1_POST_DIV_SHIFT);
 
 	    /* if LVDS is dual-channel, p2 = 7 */
-	    if ((INREG(LVDS) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP)
+	    if ((INREG(lvds) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP)
 		clock.p2 = 7;
 	    else
 		clock.p2 = 14;
 
 	    if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)
-		intel_clock(pI830, 66000, &clock); /* XXX: might not be 66MHz */
+		intel_clock(intel, 66000, &clock); /* XXX: might not be 66MHz */
 	    else
-		intel_clock(pI830, 48000, &clock);
+		intel_clock(intel, 48000, &clock);
 	} else {
 	    if (dpll & PLL_P1_DIVIDE_BY_TWO) {
 		clock.p1 = 2;
@@ -2336,7 +3166,7 @@ i830_crtc_clock_get(ScrnInfoPtr pScrn, x
 	    else
 		clock.p2 = 2;
 
-	    intel_clock(pI830, 48000, &clock);
+	    intel_clock(intel, 48000, &clock);
 	}
     }
 
@@ -2345,16 +3175,16 @@ i830_crtc_clock_get(ScrnInfoPtr pScrn, x
      * configuration being accurate, which it isn't necessarily.
      */
     if (0)
-	i830PrintPll(pScrn, "probed", &clock);
+	i830PrintPll(scrn, "probed", &clock);
 
     return clock.dot;
 }
 
 /** Returns the currently programmed mode of the given pipe. */
 DisplayModePtr
-i830_crtc_mode_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc)
+i830_crtc_mode_get(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     int pipe = intel_crtc->pipe;
     DisplayModePtr mode;
@@ -2363,11 +3193,11 @@ i830_crtc_mode_get(ScrnInfoPtr pScrn, xf
     int vtot = INREG((pipe == 0) ? VTOTAL_A : VTOTAL_B);
     int vsync = INREG((pipe == 0) ? VSYNC_A : VSYNC_B);
 
-    mode = xcalloc(1, sizeof(DisplayModeRec));
+    mode = calloc(1, sizeof(DisplayModeRec));
     if (mode == NULL)
 	return NULL;
 
-    mode->Clock = i830_crtc_clock_get(pScrn, crtc);
+    mode->Clock = i830_crtc_clock_get(scrn, crtc);
     mode->HDisplay = (htot & 0xffff) + 1;
     mode->HTotal = ((htot & 0xffff0000) >> 16) + 1;
     mode->HSyncStart = (hsync & 0xffff) + 1;
@@ -2400,7 +3230,6 @@ static const xf86CrtcFuncsRec i830_crtc_
     .set_cursor_position = i830_crtc_set_cursor_position,
     .show_cursor = i830_crtc_show_cursor,
     .hide_cursor = i830_crtc_hide_cursor,
-/*    .load_cursor_image = i830_crtc_load_cursor_image, */
     .load_cursor_argb = i830_crtc_load_cursor_argb,
     .destroy = NULL, /* XXX */
 #if RANDR_13_INTERFACE
@@ -2409,13 +3238,13 @@ static const xf86CrtcFuncsRec i830_crtc_
 };
 
 void
-i830_crtc_init(ScrnInfoPtr pScrn, int pipe)
+i830_crtc_init(ScrnInfoPtr scrn, int pipe)
 {
     xf86CrtcPtr crtc;
     I830CrtcPrivatePtr intel_crtc;
     int i;
 
-    crtc = xf86CrtcCreate (pScrn, &i830_crtc_funcs);
+    crtc = xf86CrtcCreate (scrn, &i830_crtc_funcs);
     if (crtc == NULL)
 	return;
 
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_display.h	2011-02-08 11:14:00.000000000 +0100
@@ -29,17 +29,16 @@
 
 /* i830_display.c */
 void i830PipeSetBase(xf86CrtcPtr crtc, int x, int y);
-void i830WaitForVblank(ScrnInfoPtr pScrn);
-void i830DescribeOutputConfiguration(ScrnInfoPtr pScrn);
-void i830_set_new_crtc_bo(ScrnInfoPtr pScrn);
+void i830WaitForVblank(ScrnInfoPtr scrn);
+void i830DescribeOutputConfiguration(ScrnInfoPtr scrn);
+void i830_set_new_crtc_bo(ScrnInfoPtr scrn);
 void i830_crtc_disable(xf86CrtcPtr crtc, Bool disable_pipe);
-void i830_crtc_enable(xf86CrtcPtr crtc);
+void ironlake_crtc_disable(xf86CrtcPtr crtc);
 
-xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output, DisplayModePtr mode, int *dpms_mode);
+xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output, DisplayModePtr mode,
+				  int *dpms_mode);
 void i830ReleaseLoadDetectPipe(xf86OutputPtr output, int dpms_mode);
-void i830_crtc_init(ScrnInfoPtr pScrn, int pipe);
-void i830_crtc_load_lut(xf86CrtcPtr crtc);
-DisplayModePtr i830_crtc_mode_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc);
-void i830_output_prepare (xf86OutputPtr output);
-void i830_output_commit (xf86OutputPtr output);
-
+void i830_crtc_init(ScrnInfoPtr scrn, int pipe);
+DisplayModePtr i830_crtc_mode_get(ScrnInfoPtr scrn, xf86CrtcPtr crtc);
+void i830_output_prepare(xf86OutputPtr output);
+void i830_output_commit(xf86OutputPtr output);
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c	2010-11-23 10:01:18.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,4 +1,3 @@
-/* $xfree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v 1.15 2003/06/18 13:14:17 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2001 VA Linux Systems Inc., Fremont, California.
@@ -28,36 +27,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors: Jeff Hartmann <jhartmann@valinux.com>
  *          David Dawes <dawes@xfree86.org>
  *          Keith Whitwell <keith@tungstengraphics.com>
  */
 
-/*
- * This driver does AGP memory allocation a little differently from most
- * others.  The 2D and 3D allocations have been unified (see i830_memory.c).
- * The driver does the AGP allocations and binding directly, then passes
- * on the mappings to the DRM module.  The DRM's AGP interfaces are not used.
- * The main difference with this is that the offsets need to include
- * the AGP aperture base address because that won't be known or added on
- * by the DRM module.
- *
- * DHD 07/2002
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -68,9 +42,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/time.h>
+#include <time.h>
+#include <errno.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -85,1673 +61,952 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "GL/glxtokens.h"
 
 #include "i830.h"
-#include "i830_dri.h"
 
 #include "i915_drm.h"
 
-#include "dristruct.h"
+#include "dri2.h"
 
 #ifdef DRI2
-#include "dri2.h"
+#if DRI2INFOREC_VERSION >= 1
+#define USE_DRI2_1_1_0
 #endif
 
-static Bool I830InitVisualConfigs(ScreenPtr pScreen);
-static Bool I830CreateContext(ScreenPtr pScreen, VisualPtr visual,
-			      drm_context_t hwContext, void *pVisualConfigPriv,
-			      DRIContextType contextStore);
-static void I830DestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
-			       DRIContextType contextStore);
-static void I830DRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
-			       DRIContextType readContextType,
-			       void *readContextStore,
-			       DRIContextType writeContextType,
-			       void *writeContextStore);
-static void I830DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index);
-static void I830DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
-			       RegionPtr prgnSrc, CARD32 index);
-
-static void I830DRITransitionTo2d(ScreenPtr pScreen);
-static void I830DRITransitionTo3d(ScreenPtr pScreen);
-
-#if (DRIINFO_MAJOR_VERSION > 5 || \
-     (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 4))
-#define DRI_DRIVER_FRAMEBUFFER_MAP 1
-#else
-#define DRI_DRIVER_FRAMEBUFFER_MAP 0
+extern XF86ModuleData dri2ModuleData;
 #endif
 
-extern void GlxSetVisualConfigs(int nconfigs,
-				__GLXvisualConfig * configs,
-				void **configprivs);
-
-static Bool
-I830CleanupDma(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   drmI830Init info;
-
-   memset(&info, 0, sizeof(drmI830Init));
-   info.func = I830_CLEANUP_DMA;
-
-   if (drmCommandWrite(pI830->drmSubFD, DRM_I830_INIT,
-		       &info, sizeof(drmI830Init))) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I830 Dma Cleanup Failed\n");
-      return FALSE;
-   }
-
-   return TRUE;
-}
-
-static Bool
-I830InitDma(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   I830RingBuffer *ring = &pI830->ring;
-   I830DRIPtr pI830DRI = (I830DRIPtr) pI830->pDRIInfo->devPrivate;
-   drmI830Init info;
-
-   memset(&info, 0, sizeof(drmI830Init));
-   info.func = I830_INIT_DMA;
-
-   /* Initialize fields that are used in the absence of GEM */
-   if (!pI830->memory_manager && !pI830->use_drm_mode) {
-       info.ring_start = ring->mem->offset + pI830->LinearAddr;
-       info.ring_end = ring->mem->end + pI830->LinearAddr;
-       info.ring_size = ring->mem->size;
-
-       /* Not used as of the middle of GEM development. */
-       info.mmio_offset = (unsigned int)pI830DRI->regs;
-
-       /* Not used as of before GEM development */
-       info.front_offset = pI830->front_buffer->offset;
-       info.back_offset = pI830->back_buffer->offset;
-       info.depth_offset = pI830->depth_buffer->offset;
-       info.pitch = pScrn->displayWidth;
-       info.back_pitch = pScrn->displayWidth;
-       info.depth_pitch = pScrn->displayWidth;
-       info.w = pScrn->virtualX;
-       info.h = pScrn->virtualY;
-   }
-
-
-   info.sarea_priv_offset = sizeof(XF86DRISAREARec);
-
-   /* This should probably have been moved alongside offset/pitch in the sarea.
-    */
-   info.cpp = pI830->cpp;
-
-   if (drmCommandWrite(pI830->drmSubFD, DRM_I830_INIT,
-		       &info, sizeof(drmI830Init))) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "I830 Dma Initialization Failed\n");
-      return FALSE;
-   }
-
-   return TRUE;
-}
+typedef struct {
+	int refcnt;
+	PixmapPtr pixmap;
+	unsigned int attachment;
+} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
 
-static Bool
-I830ResumeDma(ScrnInfoPtr pScrn)
+#ifndef USE_DRI2_1_1_0
+static DRI2BufferPtr
+I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments,
+		      int count)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-   drmI830Init info;
-
-   memset(&info, 0, sizeof(drmI830Init));
-   info.func = I830_RESUME_DMA;
+	ScreenPtr screen = drawable->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	DRI2BufferPtr buffers;
+	dri_bo *bo;
+	int i;
+	I830DRI2BufferPrivatePtr privates;
+	PixmapPtr pixmap, pDepthPixmap;
+
+	buffers = calloc(count, sizeof *buffers);
+	if (buffers == NULL)
+		return NULL;
+	privates = calloc(count, sizeof *privates);
+	if (privates == NULL) {
+		free(buffers);
+		return NULL;
+	}
 
-   if (drmCommandWrite(pI830->drmSubFD, DRM_I830_INIT,
-		       &info, sizeof(drmI830Init))) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I830 Dma Resume Failed\n");
-      return FALSE;
-   }
+	pDepthPixmap = NULL;
+	for (i = 0; i < count; i++) {
+		if (attachments[i] == DRI2BufferFrontLeft) {
+			pixmap = get_drawable_pixmap(drawable);
+			pixmap->refcnt++;
+		} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
+			pixmap = pDepthPixmap;
+			pixmap->refcnt++;
+		} else {
+			unsigned int hint = 0;
+
+			switch (attachments[i]) {
+			case DRI2BufferDepth:
+				if (SUPPORTS_YTILING(intel))
+					hint = INTEL_CREATE_PIXMAP_TILING_Y;
+				else
+					hint = INTEL_CREATE_PIXMAP_TILING_X;
+				break;
+			case DRI2BufferFakeFrontLeft:
+			case DRI2BufferFakeFrontRight:
+			case DRI2BufferBackLeft:
+			case DRI2BufferBackRight:
+				hint = INTEL_CREATE_PIXMAP_TILING_X;
+				break;
+			}
+
+			if (!intel->tiling)
+				hint = 0;
+
+			pixmap = screen->CreatePixmap(screen,
+						      drawable->width,
+						      drawable->height,
+						      drawable->depth,
+						      hint);
+
+		}
+
+		if (attachments[i] == DRI2BufferDepth)
+			pDepthPixmap = pixmap;
+
+		buffers[i].attachment = attachments[i];
+		buffers[i].pitch = pixmap->devKind;
+		buffers[i].cpp = pixmap->drawable.bitsPerPixel / 8;
+		buffers[i].driverPrivate = &privates[i];
+		buffers[i].flags = 0;	/* not tiled */
+		privates[i].refcnt = 1;
+		privates[i].pixmap = pixmap;
+		privates[i].attachment = attachments[i];
+
+		bo = i830_get_pixmap_bo(pixmap);
+		if (bo != NULL && dri_bo_flink(bo, &buffers[i].name) != 0) {
+			/* failed to name buffer */
+		}
+	}
 
-   return TRUE;
+	return buffers;
 }
 
-static Bool
-I830SetParam(ScrnInfoPtr pScrn, int param, int value)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   drmI830SetParam sp;
-
-   memset(&sp, 0, sizeof(sp));
-   sp.param = param;
-   sp.value = value;
-
-   if (drmCommandWrite(pI830->drmSubFD, DRM_I830_SETPARAM, &sp, sizeof(sp))) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I830 SetParam Failed\n");
-      return FALSE;
-   }
-
-   return TRUE;
-}
+#else
 
-Bool
-I830DRISetHWS(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    drmI830HWS hws;
+static DRI2Buffer2Ptr
+I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
+		     unsigned int format)
+{
+	ScreenPtr screen = drawable->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	DRI2Buffer2Ptr buffer;
+	dri_bo *bo;
+	I830DRI2BufferPrivatePtr privates;
+	PixmapPtr pixmap;
+
+	buffer = calloc(1, sizeof *buffer);
+	if (buffer == NULL)
+		return NULL;
+	privates = calloc(1, sizeof *privates);
+	if (privates == NULL) {
+		free(buffer);
+		return NULL;
+	}
 
-    hws.addr = pI830->hw_status->offset;
+	if (attachment == DRI2BufferFrontLeft) {
+		pixmap = get_drawable_pixmap(drawable);
+		pixmap->refcnt++;
+	} else {
+		unsigned int hint = 0;
 
-    if (drmCommandWrite(pI830->drmSubFD, DRM_I830_HWS_PAGE_ADDR,
-		&hws, sizeof(drmI830HWS))) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		"hw status page initialization Failed\n");
-	return FALSE;
-    }
-    return TRUE;
-}
+		switch (attachment) {
+		case DRI2BufferDepth:
+		case DRI2BufferDepthStencil:
+			if (SUPPORTS_YTILING(intel))
+				hint = INTEL_CREATE_PIXMAP_TILING_Y;
+			else
+				hint = INTEL_CREATE_PIXMAP_TILING_X;
+			break;
+		case DRI2BufferFakeFrontLeft:
+		case DRI2BufferFakeFrontRight:
+		case DRI2BufferBackLeft:
+		case DRI2BufferBackRight:
+			hint = INTEL_CREATE_PIXMAP_TILING_X;
+			break;
+		}
+
+		if (!intel->tiling)
+			hint = 0;
+
+		pixmap = screen->CreatePixmap(screen,
+					      drawable->width,
+					      drawable->height,
+					      (format != 0) ? format :
+							      drawable->depth,
+					      hint);
+		if (pixmap == NULL) {
+			free(privates);
+			free(buffer);
+			return NULL;
+		}
 
-static Bool
-I830InitVisualConfigs(ScreenPtr pScreen)
-{
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
-   int numConfigs = 0;
-   __GLXvisualConfig *pConfigs = NULL;
-   I830ConfigPrivPtr pI830Configs = NULL;
-   I830ConfigPrivPtr *pI830ConfigPtrs = NULL;
-   int accum, stencil, db, depth;
-   int i;
-
-   switch (pScrn->bitsPerPixel) {
-   case 8:
-   case 24:
-      break;
-
-   case 16:
-      numConfigs = 8;
-
-      pConfigs =
-	    (__GLXvisualConfig *) xcalloc(sizeof(__GLXvisualConfig),
-					  numConfigs);
-      if (!pConfigs)
-	 return FALSE;
-
-      pI830Configs =
-	    (I830ConfigPrivPtr) xcalloc(sizeof(I830ConfigPrivRec),
-					numConfigs);
-      if (!pI830Configs) {
-	 xfree(pConfigs);
-	 return FALSE;
-      }
-
-      pI830ConfigPtrs =
-	    (I830ConfigPrivPtr *) xcalloc(sizeof(I830ConfigPrivPtr),
-					  numConfigs);
-      if (!pI830ConfigPtrs) {
-	 xfree(pConfigs);
-	 xfree(pI830Configs);
-	 return FALSE;
-      }
-
-      for (i = 0; i < numConfigs; i++)
-	 pI830ConfigPtrs[i] = &pI830Configs[i];
-
-      i = 0;
-      depth = 1;
-      for (accum = 0; accum <= 1; accum++) {
-	 for (stencil = 0; stencil <= 1; stencil++) {
-	    for (db = 1; db >= 0; db--) {
-	       pConfigs[i].vid = -1;
-	       pConfigs[i].class = -1;
-	       pConfigs[i].rgba = TRUE;
-	       pConfigs[i].redSize = 5;
-	       pConfigs[i].greenSize = 6;
-	       pConfigs[i].blueSize = 5;
-	       pConfigs[i].alphaSize = 0;
-	       pConfigs[i].redMask = 0x0000F800;
-	       pConfigs[i].greenMask = 0x000007E0;
-	       pConfigs[i].blueMask = 0x0000001F;
-	       pConfigs[i].alphaMask = 0;
-	       if (accum) {
-		  pConfigs[i].accumRedSize = 16;
-		  pConfigs[i].accumGreenSize = 16;
-		  pConfigs[i].accumBlueSize = 16;
-		  pConfigs[i].accumAlphaSize = 0;
-	       } else {
-		  pConfigs[i].accumRedSize = 0;
-		  pConfigs[i].accumGreenSize = 0;
-		  pConfigs[i].accumBlueSize = 0;
-		  pConfigs[i].accumAlphaSize = 0;
-	       }
-	       pConfigs[i].doubleBuffer = db ? TRUE : FALSE;
-	       pConfigs[i].stereo = FALSE;
-	       pConfigs[i].bufferSize = 16;
-	       if (depth)
-		  pConfigs[i].depthSize = 16;
-	       else
-		  pConfigs[i].depthSize = 0;
-	       if (stencil)
-		  pConfigs[i].stencilSize = 8;
-	       else
-		  pConfigs[i].stencilSize = 0;
-	       pConfigs[i].auxBuffers = 0;
-	       pConfigs[i].level = 0;
-	       if (stencil || accum)
-		  pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
-	       else
-		  pConfigs[i].visualRating = GLX_NONE_EXT;
-	       pConfigs[i].transparentPixel = GLX_NONE_EXT;
-	       pConfigs[i].transparentRed = 0;
-	       pConfigs[i].transparentGreen = 0;
-	       pConfigs[i].transparentBlue = 0;
-	       pConfigs[i].transparentAlpha = 0;
-	       pConfigs[i].transparentIndex = 0;
-	       i++;
-	    }
-	 }
-      }
-      assert(i == numConfigs);
-      break;
-
-   case 32:
-      numConfigs = 8;
-
-      pConfigs = (__GLXvisualConfig *) xcalloc(sizeof(__GLXvisualConfig),
-					       numConfigs);
-      if (!pConfigs) {
-	 return FALSE;
-      }
-
-      pI830Configs = (I830ConfigPrivPtr) xcalloc(sizeof(I830ConfigPrivRec),
-						 numConfigs);
-      if (!pI830Configs) {
-	 xfree(pConfigs);
-	 return FALSE;
-      }
-
-      pI830ConfigPtrs = (I830ConfigPrivPtr *)
-	    xcalloc(sizeof(I830ConfigPrivPtr), numConfigs);
-      if (!pI830ConfigPtrs) {
-	 xfree(pConfigs);
-	 xfree(pI830Configs);
-	 return FALSE;
-      }
-
-      for (i = 0; i < numConfigs; i++) {
-	 pI830ConfigPtrs[i] = &pI830Configs[i];
-      }
-
-      i = 0;
-      for (accum = 0; accum <= 1; accum++) {
-	 for (depth = 1; depth >= 0; depth--) {	/* and stencil */
-	    for (db = 1; db >= 0; db--) {
-	       pConfigs[i].vid = -1;
-	       pConfigs[i].class = -1;
-	       pConfigs[i].rgba = TRUE;
-	       pConfigs[i].redSize = 8;
-	       pConfigs[i].greenSize = 8;
-	       pConfigs[i].blueSize = 8;
-	       pConfigs[i].alphaSize = 8;
-	       pConfigs[i].redMask = 0x00FF0000;
-	       pConfigs[i].greenMask = 0x0000FF00;
-	       pConfigs[i].blueMask = 0x000000FF;
-	       pConfigs[i].alphaMask = 0xFF000000;
-	       if (accum) {
-		  pConfigs[i].accumRedSize = 16;
-		  pConfigs[i].accumGreenSize = 16;
-		  pConfigs[i].accumBlueSize = 16;
-		  pConfigs[i].accumAlphaSize = 16;
-	       } else {
-		  pConfigs[i].accumRedSize = 0;
-		  pConfigs[i].accumGreenSize = 0;
-		  pConfigs[i].accumBlueSize = 0;
-		  pConfigs[i].accumAlphaSize = 0;
-	       }
-	       if (db) {
-		  pConfigs[i].doubleBuffer = TRUE;
-	       } else {
-		  pConfigs[i].doubleBuffer = FALSE;
-	       }
-	       pConfigs[i].stereo = FALSE;
-	       pConfigs[i].bufferSize = 32;
-	       if (depth) {
-		  pConfigs[i].depthSize = 24;
-		  pConfigs[i].stencilSize = 8;
-	       } else {
-		  pConfigs[i].depthSize = 0;
-		  pConfigs[i].stencilSize = 0;
-	       }
-	       pConfigs[i].auxBuffers = 0;
-	       pConfigs[i].level = 0;
-	       if (accum) {
-		  pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
-	       } else {
-		  pConfigs[i].visualRating = GLX_NONE_EXT;
-	       }
-	       pConfigs[i].transparentPixel = GLX_NONE_EXT;
-	       pConfigs[i].transparentRed = 0;
-	       pConfigs[i].transparentGreen = 0;
-	       pConfigs[i].transparentBlue = 0;
-	       pConfigs[i].transparentAlpha = 0;
-	       pConfigs[i].transparentIndex = 0;
-	       i++;
-	    }
-	 }
-      }
-      if (i != numConfigs) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "[drm] Incorrect initialization of visuals\n");
-	 return FALSE;
-      }
-      break;
-
-   }
-   pI830->numVisualConfigs = numConfigs;
-   pI830->pVisualConfigs = pConfigs;
-   pI830->pVisualConfigsPriv = pI830Configs;
-   GlxSetVisualConfigs(numConfigs, pConfigs, (void **)pI830ConfigPtrs);
-   return TRUE;
-}
+	}
 
-Bool
-I830CheckDRIAvailable(ScrnInfoPtr pScrn)
-{
-   /* Hardware 3D rendering only implemented for 16bpp and 32 bpp */
-   if (((pScrn->bitsPerPixel / 8) != 2 && pScrn->depth != 16) &&
-       (pScrn->bitsPerPixel / 8) != 4) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "[drm] Direct rendering only supported in 16 and 32 bpp modes\n");
-      return FALSE;
-   }
-
-   /* Check that the GLX, DRI, and DRM modules have been loaded by testing
-    * for known symbols in each module. */
-   if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "[dri] %s failed: glx not loaded\n", __FUNCTION__);
-      return FALSE;
-   }
-   if (!xf86LoaderCheckSymbol("DRIScreenInit")) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "[dri] %s failed: dri not loaded\n", __FUNCTION__);
-      return FALSE;
-   }
-   if (!xf86LoaderCheckSymbol("drmAvailable")) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "[dri] %s failed: libdrm not loaded\n", __FUNCTION__);
-      return FALSE;
-   }
-   if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "[dri] %s failed (libdri.a too old)\n", __FUNCTION__);
-      return FALSE;
-   }
-
-   /* Check the DRI version */
-   {
-      int major, minor, patch;
-
-      DRIQueryVersion(&major, &minor, &patch);
-      if (major != DRIINFO_MAJOR_VERSION || minor < DRIINFO_MINOR_VERSION ||
-	  major < 5) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "[dri] %s failed because of a version mismatch.\n"
-		    "[dri] libDRI version is %d.%d.%d but version %d.%d.x is needed.\n"
-		    "[dri] Disabling DRI.\n",
-		    "I830CheckDRIAvailable", major, minor, patch,
-		     DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION);
-	 return FALSE;
-      }
-   }
+	buffer->attachment = attachment;
+	buffer->pitch = pixmap->devKind;
+	buffer->cpp = pixmap->drawable.bitsPerPixel / 8;
+	buffer->driverPrivate = privates;
+	buffer->format = format;
+	buffer->flags = 0;	/* not tiled */
+	privates->refcnt = 1;
+	privates->pixmap = pixmap;
+	privates->attachment = attachment;
+
+	bo = i830_get_pixmap_bo(pixmap);
+	if (bo == NULL || dri_bo_flink(bo, &buffer->name) != 0) {
+		/* failed to name buffer */
+		screen->DestroyPixmap(pixmap);
+		free(privates);
+		free(buffer);
+		return NULL;
+	}
 
-   return TRUE;
+	return buffer;
 }
 
-Bool
-I830DRIScreenInit(ScreenPtr pScreen)
-{
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
-   DRIInfoPtr pDRIInfo;
-   I830DRIPtr pI830DRI;
-
-   DPRINTF(PFX, "I830DRIScreenInit\n");
-
-   if (!I830CheckDRIAvailable(pScrn))
-      return FALSE;
-
-   pDRIInfo = DRICreateInfoRec();
-   if (!pDRIInfo) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR,
-		 "[dri] DRICreateInfoRec failed. Disabling DRI.\n");
-      return FALSE;
-   }
-
-   pI830->pDRIInfo = pDRIInfo;
-   pI830->LockHeld = 0;
-
-   pDRIInfo->drmDriverName = "i915";
-   if (IS_I965G(pI830))
-      pDRIInfo->clientDriverName = "i965";
-   else
-      pDRIInfo->clientDriverName = "i915";
-
-   if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
-      pDRIInfo->busIdString = DRICreatePCIBusID(pI830->PciInfo);
-   } else {
-      pDRIInfo->busIdString = xalloc(64);
-      sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
-#if XSERVER_LIBPCIACCESS
-	      ((pI830->PciInfo->domain << 8) | pI830->PciInfo->bus),
-	      pI830->PciInfo->dev, pI830->PciInfo->func
-#else
-	      ((pciConfigPtr) pI830->PciInfo->thisCard)->busnum,
-	      ((pciConfigPtr) pI830->PciInfo->thisCard)->devnum,
-	      ((pciConfigPtr) pI830->PciInfo->thisCard)->funcnum
-#endif
-	      );
-   }
-   pDRIInfo->ddxDriverMajorVersion = I830_MAJOR_VERSION;
-   pDRIInfo->ddxDriverMinorVersion = I830_MINOR_VERSION;
-   pDRIInfo->ddxDriverPatchVersion = I830_PATCHLEVEL;
-   pDRIInfo->ddxDrawableTableEntry = I830_MAX_DRAWABLES;
-
-   if (SAREA_MAX_DRAWABLES < I830_MAX_DRAWABLES)
-      pDRIInfo->maxDrawableTableEntry = SAREA_MAX_DRAWABLES;
-   else
-      pDRIInfo->maxDrawableTableEntry = I830_MAX_DRAWABLES;
-
-   if (sizeof(XF86DRISAREARec) + sizeof(drmI830Sarea) > SAREA_MAX) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR,
-		 "[dri] Data does not fit in SAREA\n");
-      return FALSE;
-   }
-   /* This is a hack for now.  We have to have more than a 4k page here
-    * because of the size of the state.  However, the state should be
-    * in a per-context mapping.  This will be added in the Mesa 3.5 port
-    * of the I830 driver.
-    */
-   pDRIInfo->SAREASize = SAREA_MAX;
-
-   if (!(pI830DRI = (I830DRIPtr) xcalloc(sizeof(I830DRIRec), 1))) {
-      DRIDestroyInfoRec(pI830->pDRIInfo);
-      pI830->pDRIInfo = NULL;
-      return FALSE;
-   }
-   pDRIInfo->devPrivate = pI830DRI;
-   pDRIInfo->devPrivateSize = sizeof(I830DRIRec);
-   pDRIInfo->contextSize = sizeof(I830DRIContextRec);
-
-   pDRIInfo->CreateContext = I830CreateContext;
-   pDRIInfo->DestroyContext = I830DestroyContext;
-   pDRIInfo->SwapContext = I830DRISwapContext;
-   pDRIInfo->InitBuffers = I830DRIInitBuffers;
-   pDRIInfo->MoveBuffers = I830DRIMoveBuffers;
-   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
-
-#if DRIINFO_MAJOR_VERSION > 5 || \
-    (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 3)
-      if (pI830->accel == ACCEL_EXA)
-	 pDRIInfo->texOffsetStart = I830TexOffsetStart;
-#endif
-
-#if DRI_DRIVER_FRAMEBUFFER_MAP
-   /* DRI version is high enough that we can get the DRI code to not
-    * try to manage the framebuffer.
-    */
-   pDRIInfo->frameBufferPhysicalAddress = 0;
-   pDRIInfo->frameBufferSize = 0;
-   pDRIInfo->frameBufferStride = 0;
-   pDRIInfo->dontMapFrameBuffer = TRUE;
-#else
-   /* Supply a dummy mapping info required by DRI setup.
-    */
-   pDRIInfo->frameBufferPhysicalAddress = (char *) pI830->LinearAddr;
-   pDRIInfo->frameBufferSize = GTT_PAGE_SIZE;
-   pDRIInfo->frameBufferStride = 1;
 #endif
 
-   pDRIInfo->TransitionTo2d = I830DRITransitionTo2d;
-   pDRIInfo->TransitionTo3d = I830DRITransitionTo3d;
-
-   /* do driver-independent DRI screen initialization here */
-   if (!DRIScreenInit(pScreen, pDRIInfo, &pI830->drmSubFD)) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR,
-		 "[dri] DRIScreenInit failed. Disabling DRI.\n");
-      xfree(pDRIInfo->devPrivate);
-      pDRIInfo->devPrivate = NULL;
-      DRIDestroyInfoRec(pI830->pDRIInfo);
-      pI830->pDRIInfo = NULL;
-      return FALSE;
-   }
-
-   /* Now, nuke dri.c's dummy frontbuffer map setup if we did that. */
-   if (pDRIInfo->frameBufferSize != 0) {
-       int tmp;
-       drm_handle_t fb_handle;
-       void *ptmp;
-
-       /* With the compat method, it will continue to report
-	* the wrong map out of GetDeviceInfo, which will break AIGLX.
-	*/
-       DRIGetDeviceInfo(pScreen, &fb_handle, &tmp, &tmp, &tmp, &tmp, &ptmp);
-       drmRmMap(pI830->drmSubFD, fb_handle);
-
-       xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		  "Removed DRI frontbuffer mapping in compatibility mode.\n");
-       xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		  "DRIGetDeviceInfo will report incorrect frontbuffer "
-		  "handle.\n");
-   }
-
-   /* Check the i915 DRM versioning */
-   {
-      drmVersionPtr version;
-
-      /* Check the DRM lib version.
-       * drmGetLibVersion was not supported in version 1.0, so check for
-       * symbol first to avoid possible crash or hang.
-       */
-      if (xf86LoaderCheckSymbol("drmGetLibVersion")) {
-	 version = drmGetLibVersion(pI830->drmSubFD);
-      } else
-      {
-	 /* drmlib version 1.0.0 didn't have the drmGetLibVersion
-	  * entry point.  Fake it by allocating a version record
-	  * via drmGetVersion and changing it to version 1.0.0
-	  */
-	 version = drmGetVersion(pI830->drmSubFD);
-	 version->version_major = 1;
-	 version->version_minor = 0;
-	 version->version_patchlevel = 0;
-      }
-
-#define REQ_MAJ 1
-#define REQ_MIN 1
-      if (version) {
-	 if (version->version_major != REQ_MAJ ||
-	     version->version_minor < REQ_MIN) {
-	    /* incompatible drm library version */
-	    xf86DrvMsg(pScreen->myNum, X_ERROR,
-		       "[dri] I830DRIScreenInit failed because of a version mismatch.\n"
-		       "[dri] libdrm.a module version is %d.%d.%d but version %d.%d.x is needed.\n"
-		       "[dri] Disabling DRI.\n",
-		       version->version_major,
-		       version->version_minor, version->version_patchlevel,
-		       REQ_MAJ, REQ_MIN);
-	    drmFreeVersion(version);
-	    I830DRICloseScreen(pScreen);
-	    return FALSE;
-	 }
-	 drmFreeVersion(version);
-      }
-
-      /* Check the i915 DRM version */
-      version = drmGetVersion(pI830->drmSubFD);
-      if (version) {
-	 if (version->version_major != 1 || version->version_minor < 3) {
-	    /* incompatible drm version */
-	    xf86DrvMsg(pScreen->myNum, X_ERROR,
-		       "[dri] %s failed because of a version mismatch.\n"
-		       "[dri] i915 kernel module version is %d.%d.%d but version 1.3 or greater is needed.\n"
-		       "[dri] Disabling DRI.\n",
-		       "I830DRIScreenInit",
-		       version->version_major,
-		       version->version_minor, version->version_patchlevel);
-	    I830DRICloseScreen(pScreen);
-	    drmFreeVersion(version);
-	    return FALSE;
-	 }
-	 /* Check whether the kernel module attached to the device isn't the
-	  * one we expected (meaning it's the old i830 module).
-	  */
-	 if (strncmp(version->name, pDRIInfo->drmDriverName,
-		     strlen(pDRIInfo->drmDriverName)))
-	 {
-	    xf86DrvMsg(pScreen->myNum, X_WARNING,
-		       "Detected i830 kernel module.  The i915 kernel module "
-		       "is required for DRI.  Aborting.\n");
-	    I830DRICloseScreen(pScreen);
-	    drmFreeVersion(version);
-	    return FALSE;
-	 }
-	 pI830->drmMinor = version->version_minor;
-	 drmFreeVersion(version);
-      }
-   }
-
-   return TRUE;
-}
+#ifndef USE_DRI2_1_1_0
 
 static void
-I830InitTextureHeap(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   drmI830MemInitHeap drmHeap;
-
-   if (pI830->textures == NULL)
-       return;
-
-   /* Start up the simple memory manager for agp space */
-   drmHeap.region = I830_MEM_REGION_AGP;
-   drmHeap.start  = 0;
-   drmHeap.size   = pI830->textures->size;
-
-   if (drmCommandWrite(pI830->drmSubFD, DRM_I830_INIT_HEAP,
-			  &drmHeap, sizeof(drmHeap))) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "[drm] Failed to initialized agp heap manager\n");
-   } else {
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		    "[drm] Initialized kernel agp heap manager, %ld\n",
-		    pI830->textures->size);
-
-      I830SetParam(pScrn, I830_SETPARAM_TEX_LRU_LOG_GRANULARITY, 
-		   pI830->TexGranularity);
-   }
-}
-
-/*
- * Map registers & ring buffer
- */
-static Bool
-I830DRIMapHW(ScreenPtr pScreen)
-{
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
-   DRIInfoPtr pDRIInfo = pI830->pDRIInfo;
-   I830DRIPtr pI830DRI = pDRIInfo->devPrivate;
-
-   /* Kernel deals with direct hw access in this case */
-   if (pI830->use_drm_mode)
-       return TRUE;
-
-   DPRINTF(PFX, "I830DRIMapHW\n");
-   pI830DRI->regsSize = I830_REG_SIZE;
-   if (drmAddMap(pI830->drmSubFD, (drm_handle_t)pI830->MMIOAddr,
-		 pI830DRI->regsSize, DRM_REGISTERS, 0,
-		 (drmAddress) &pI830DRI->regs) < 0) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAddMap(regs) failed\n");
-      DRICloseScreen(pScreen);
-      return FALSE;
-   }
-   xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n",
-	      (int)pI830DRI->regs);
-
-   if (!pI830->memory_manager) {
-       if (drmAddMap(pI830->drmSubFD,
-		     (drm_handle_t)pI830->ring.mem->offset +
-		     pI830->LinearAddr,
-		     pI830->ring.mem->size, DRM_AGP, 0,
-		     (drmAddress) &pI830->ring_map) < 0) {
-	   xf86DrvMsg(pScreen->myNum, X_ERROR,
-		      "[drm] drmAddMap(ring_map) failed. Disabling DRI\n");
-	   DRICloseScreen(pScreen);
-	   return FALSE;
-       }
-       xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] ring buffer = 0x%08x\n",
-		  (int)pI830->ring_map);
-   }
-
-   return TRUE;
-}
-
-/**
- * Sets up mappings for static, lifetime-fixed allocations, and inital SAREA
- * setup.
- */
-Bool
-I830DRIDoMappings(ScreenPtr pScreen)
+I830DRI2DestroyBuffers(DrawablePtr drawable, DRI2BufferPtr buffers, int count)
 {
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
-   DRIInfoPtr pDRIInfo = pI830->pDRIInfo;
-   I830DRIPtr pI830DRI = pDRIInfo->devPrivate;
-   drmI830Sarea *sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen);
-
-   if (!I830DRIMapHW(pScreen)) {
-       DRICloseScreen(pScreen);
-       return FALSE;
-   }
-
-   if (!I830InitDma(pScrn)) {
-      DRICloseScreen(pScreen);
-      return FALSE;
-   }
-
-   if (pI830->memory_manager == NULL)
-       intel_bufmgr_fake_set_last_dispatch(pI830->bufmgr,
-					   (volatile unsigned int *)
-					   &sarea->last_dispatch);
-
-   /* init to zero to be safe */
-   sarea->front_handle = 0;
-   sarea->back_handle = 0;
-   sarea->depth_handle = 0;
-   sarea->tex_handle = 0;
-
-   /* Assign pScreen */
-   pScrn->pScreen = pScreen;
-
-   /* Need to initialize pScreen now to let RandR know. */
-   pScrn->pScreen->width = pScrn->virtualX;
-   pScrn->pScreen->height = pScrn->virtualY;
-
-   /* If we are using the kernel memory manager, we have to delay SAREA and
-    * mapping setup until our buffers are pinned at EnterVT, losing the
-    * opportunity to fail cleanly early on.
-    */
-   if (pI830->memory_manager == NULL) {
-      if (!i830_update_dri_buffers(pScrn)) {
-	 /* screen mappings probably failed */
-	 xf86DrvMsg(pScreen->myNum, X_ERROR,
-		    "[drm] drmAddMap(screen mappings) failed. "
-		    "Disabling DRI\n");
-	 DRICloseScreen(pScreen);
-	 return FALSE;
-      }
-   }
-
-   if (pI830->allocate_classic_textures)
-      I830InitTextureHeap(pScrn);
-
-   if (DEVICE_ID(pI830->PciInfo) != PCI_CHIP_845_G &&
-       DEVICE_ID(pI830->PciInfo) != PCI_CHIP_I830_M) {
-      I830SetParam(pScrn, I830_SETPARAM_USE_MI_BATCHBUFFER_START, 1 );
-   }
-
-   pI830DRI = (I830DRIPtr) pI830->pDRIInfo->devPrivate;
-   pI830DRI->deviceID = DEVICE_ID(pI830->PciInfo);
-   pI830DRI->width = pScrn->virtualX;
-   pI830DRI->height = pScrn->virtualY;
-   pI830DRI->mem = pScrn->videoRam * 1024;
-   pI830DRI->cpp = pI830->cpp;
-
-   pI830DRI->bitsPerPixel = pScrn->bitsPerPixel;
-
-   pI830DRI->sarea_priv_offset = sizeof(XF86DRISAREARec);
-
-   if (!(I830InitVisualConfigs(pScreen))) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR,
-		 "[dri] I830InitVisualConfigs failed. Disabling DRI\n");
-      DRICloseScreen(pScreen);
-      return FALSE;
-   }
+	ScreenPtr screen = drawable->pScreen;
+	I830DRI2BufferPrivatePtr private;
+	int i;
 
-   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[dri] visual configs initialized\n");
-   pI830->pDRIInfo->driverSwapMethod = DRI_HIDE_X_CONTEXT;
+	for (i = 0; i < count; i++) {
+		private = buffers[i].driverPrivate;
+		screen->DestroyPixmap(private->pixmap);
+	}
 
-   return TRUE;
+	if (buffers) {
+		free(buffers[0].driverPrivate);
+		free(buffers);
+	}
 }
 
-Bool
-I830DRIInstIrqHandler(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   I830DRIPtr pI830DRI = (I830DRIPtr) pI830->pDRIInfo->devPrivate;
-
-   pI830DRI->irq = drmGetInterruptFromBusID(pI830->drmSubFD,
-#if XSERVER_LIBPCIACCESS
-					       ((pI830->PciInfo->domain << 8) |
-						pI830->PciInfo->bus),
-					       pI830->PciInfo->dev,
-					       pI830->PciInfo->func
 #else
-					       ((pciConfigPtr) pI830->
-						PciInfo->thisCard)->busnum,
-					       ((pciConfigPtr) pI830->
-						PciInfo->thisCard)->devnum,
-					       ((pciConfigPtr) pI830->
-						PciInfo->thisCard)->funcnum
-#endif
-					       );
-
-   if (drmCtlInstHandler(pI830->drmSubFD, pI830DRI->irq)) {
-       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-	       "[drm] failure adding irq handler\n");
-       pI830DRI->irq = 0;
-       return FALSE;
-   } else
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "[drm] dma control initialized, using IRQ %d\n",
-	       pI830DRI->irq);
 
-   return TRUE;
-}
-
-Bool
-I830DRIResume(ScreenPtr pScreen)
+static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer)
 {
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   DPRINTF(PFX, "I830DRIResume\n");
-
-   I830ResumeDma(pScrn);
-
-   if (!pI830->memory_manager)
-       I830DRIInstIrqHandler(pScrn);
-
-   return TRUE;
+	if (buffer) {
+		I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
+		if (--private->refcnt == 0) {
+			ScreenPtr screen = private->pixmap->drawable.pScreen;
+
+			screen->DestroyPixmap(private->pixmap);
+
+			free(private);
+			free(buffer);
+		}
+	}
 }
 
-void
-I830DRICloseScreen(ScreenPtr pScreen)
-{
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
-   I830DRIPtr pI830DRI = (I830DRIPtr) pI830->pDRIInfo->devPrivate;
-
-   DPRINTF(PFX, "I830DRICloseScreen\n");
-
-   if (!pI830->memory_manager && pI830DRI->irq) {
-       drmCtlUninstHandler(pI830->drmSubFD);
-       pI830DRI->irq = 0;
-   }
-
-   I830CleanupDma(pScrn);
-
-   DRICloseScreen(pScreen);
-
-   if (pI830->pDRIInfo) {
-      if (pI830->pDRIInfo->devPrivate) {
-	 xfree(pI830->pDRIInfo->devPrivate);
-	 pI830->pDRIInfo->devPrivate = NULL;
-      }
-      DRIDestroyInfoRec(pI830->pDRIInfo);
-      pI830->pDRIInfo = NULL;
-   }
-   if (pI830->pVisualConfigs)
-      xfree(pI830->pVisualConfigs);
-   if (pI830->pVisualConfigsPriv)
-      xfree(pI830->pVisualConfigsPriv);
-   pI830->directRenderingType = DRI_NONE;
-}
+#endif
 
-static Bool
-I830CreateContext(ScreenPtr pScreen, VisualPtr visual,
-		  drm_context_t hwContext, void *pVisualConfigPriv,
-		  DRIContextType contextStore)
+static void I830DRI2ReferenceBuffer(DRI2Buffer2Ptr buffer)
 {
-   return TRUE;
+	if (buffer) {
+		I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
+		private->refcnt++;
+	}
 }
 
 static void
-I830DestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
-		   DRIContextType contextStore)
+I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
+		   DRI2BufferPtr destBuffer, DRI2BufferPtr sourceBuffer)
 {
-}
-
-Bool
-I830DRIFinishScreenInit(ScreenPtr pScreen)
-{
-   DPRINTF(PFX, "I830DRIFinishScreenInit\n");
-
-   if (!DRIFinishScreenInit(pScreen))
-      return FALSE;
+	I830DRI2BufferPrivatePtr srcPrivate = sourceBuffer->driverPrivate;
+	I830DRI2BufferPrivatePtr dstPrivate = destBuffer->driverPrivate;
+	ScreenPtr screen = drawable->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
+	    ? drawable : &srcPrivate->pixmap->drawable;
+	DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
+	    ? drawable : &dstPrivate->pixmap->drawable;
+	RegionPtr pCopyClip;
+	GCPtr gc;
+
+	gc = GetScratchGC(dst->depth, screen);
+	if (!gc)
+		return;
+
+	pCopyClip = REGION_CREATE(screen, NULL, 0);
+	REGION_COPY(screen, pCopyClip, pRegion);
+	(*gc->funcs->ChangeClip) (gc, CT_REGION, pCopyClip, 0);
+	ValidateGC(dst, gc);
+
+	/* Wait for the scanline to be outside the region to be copied */
+	if (pixmap_is_scanout(get_drawable_pixmap(dst))
+	    && intel->swapbuffers_wait) {
+		BoxPtr box;
+		BoxRec crtcbox;
+		int y1, y2;
+		int pipe = -1, event, load_scan_lines_pipe;
+		xf86CrtcPtr crtc;
+		Bool full_height = FALSE;
+
+		box = REGION_EXTENTS(unused, gc->pCompositeClip);
+		crtc = i830_covering_crtc(scrn, box, NULL, &crtcbox);
+
+		/*
+		 * Make sure the CRTC is valid and this is the real front
+		 * buffer
+		 */
+		if (crtc != NULL && !crtc->rotatedData) {
+			pipe = i830_crtc_to_pipe(crtc);
+
+			/*
+			 * Make sure we don't wait for a scanline that will
+			 * never occur
+			 */
+			y1 = (crtcbox.y1 <= box->y1) ? box->y1 - crtcbox.y1 : 0;
+			y2 = (box->y2 <= crtcbox.y2) ?
+			    box->y2 - crtcbox.y1 : crtcbox.y2 - crtcbox.y1;
+
+			if (y1 == 0 && y2 == (crtcbox.y2 - crtcbox.y1))
+			    full_height = TRUE;
+
+			/*
+			 * Pre-965 doesn't have SVBLANK, so we need a bit
+			 * of extra time for the blitter to start up and
+			 * do its job for a full height blit
+			 */
+			if (full_height && !IS_I965G(intel))
+			    y2 -= 2;
+
+			if (pipe == 0) {
+				event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
+				load_scan_lines_pipe =
+				    MI_LOAD_SCAN_LINES_DISPLAY_PIPEA;
+				if (full_height && IS_I965G(intel))
+				    event = MI_WAIT_FOR_PIPEA_SVBLANK;
+			} else {
+				event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
+				load_scan_lines_pipe =
+				    MI_LOAD_SCAN_LINES_DISPLAY_PIPEB;
+				if (full_height && IS_I965G(intel))
+				    event = MI_WAIT_FOR_PIPEB_SVBLANK;
+			}
+
+			BEGIN_BATCH(5);
+			/*
+			 * The documentation says that the LOAD_SCAN_LINES
+			 * command always comes in pairs. Don't ask me why.
+			 */
+			OUT_BATCH(MI_LOAD_SCAN_LINES_INCL |
+				  load_scan_lines_pipe);
+			OUT_BATCH((y1 << 16) | y2);
+			OUT_BATCH(MI_LOAD_SCAN_LINES_INCL |
+				  load_scan_lines_pipe);
+			OUT_BATCH((y1 << 16) | y2);
+			OUT_BATCH(MI_WAIT_FOR_EVENT | event);
+			ADVANCE_BATCH();
+		}
+	}
 
-   /* move irq initialize later in EnterVT, as then we
-    * would finish binding possible hw status page, which
-    * requires irq ctrl ioctl not be called that early.
-    */
-   return TRUE;
+	(*gc->ops->CopyArea) (src, dst,
+			       gc,
+			       0, 0,
+			       drawable->width, drawable->height,
+			       0, 0);
+	FreeScratchGC(gc);
+
+	/* Emit a flush of the rendering cache, or on the 965 and beyond
+	 * rendering results may not hit the framebuffer until significantly
+	 * later.
+	 *
+	 * We can't rely on getting into the block handler before the DRI
+	 * client gets to run again so flush now.
+	 */
+	intel_batch_submit(scrn, TRUE);
+	drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
 }
 
-static void
-I830DRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
-		   DRIContextType oldContextType, void *oldContext,
-		   DRIContextType newContextType, void *newContext)
-{
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   if (syncType == DRI_3D_SYNC &&
-       oldContextType == DRI_2D_CONTEXT && newContextType == DRI_2D_CONTEXT) {
-
-      if (I810_DEBUG & DEBUG_VERBOSE_DRI)
-	 ErrorF("i830DRISwapContext (in)\n");
+#if DRI2INFOREC_VERSION >= 4
 
-      pI830->last_3d = LAST_3D_OTHER;
-
-      if (!pScrn->vtSema)
-     	 return;
-      pI830->LockHeld = 1;
-      if (!pI830->memory_manager)
-	  i830_refresh_ring(pScrn);
-
-   } else if (syncType == DRI_2D_SYNC &&
-	      oldContextType == DRI_NO_CONTEXT &&
-	      newContextType == DRI_2D_CONTEXT) {
-      if (I810_DEBUG & DEBUG_VERBOSE_DRI)
-	 ErrorF("i830DRISwapContext (out)\n");
-
-      if (!pScrn->vtSema)
-     	 return;
-      pI830->LockHeld = 0;
-   } else if (I810_DEBUG & DEBUG_VERBOSE_DRI)
-      ErrorF("i830DRISwapContext (other)\n");
-}
+enum DRI2FrameEventType {
+	DRI2_SWAP,
+	DRI2_FLIP,
+	DRI2_WAITMSC,
+};
+
+typedef struct _DRI2FrameEvent {
+	XID drawable_id;
+	ClientPtr client;
+	enum DRI2FrameEventType type;
+	int frame;
+
+	/* for swaps & flips only */
+	DRI2SwapEventPtr event_complete;
+	void *event_data;
+	DRI2BufferPtr front;
+	DRI2BufferPtr back;
+} DRI2FrameEventRec, *DRI2FrameEventPtr;
 
-static void
-I830DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index)
+static int
+I830DRI2DrawablePipe(DrawablePtr pDraw)
 {
-   ScreenPtr pScreen = pWin->drawable.pScreen;
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   BoxPtr pbox;
-   int nbox;
-   int buffer, first_buffer, last_buffer;
-
-   if (I810_DEBUG & DEBUG_VERBOSE_DRI)
-      ErrorF("I830DRIInitBuffers\n");
-
-   first_buffer = I830_SELECT_BACK;
-   last_buffer = I830_SELECT_DEPTH;
-
-   for (buffer = first_buffer; buffer <= last_buffer; buffer++) {
-      pbox = REGION_RECTS(prgn);
-      nbox = REGION_NUM_RECTS(prgn);
-
-      if (!I830SelectBuffer(pScrn, buffer))
-	 continue;
-
-      if (buffer == I830_SELECT_DEPTH) {
-	 switch (pScrn->bitsPerPixel) {
-	 case 16:
-	    I830SetupForSolidFill(pScrn, 0xffff, GXcopy, -1);
-	    break;
-	 case 32:
-	    I830SetupForSolidFill(pScrn, 0xffffff, GXcopy, -1);
-	    break;
-	 }
-      } else
-	 I830SetupForSolidFill(pScrn, 0, GXcopy, -1);
-      while (nbox--) {
-	 I830SubsequentSolidFillRect(pScrn, pbox->x1, pbox->y1,
-				     pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);
-	 pbox++;
-      }
-   }
-
-   I830SelectBuffer(pScrn, I830_SELECT_FRONT);
-   i830MarkSync(pScrn);
+	ScreenPtr pScreen = pDraw->pScreen;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	BoxRec box, crtcbox;
+	xf86CrtcPtr crtc;
+	int pipe = -1;
+
+	box.x1 = pDraw->x;
+	box.y1 = pDraw->y;
+	box.x2 = box.x1 + pDraw->width;
+	box.y2 = box.y1 + pDraw->height;
+
+	crtc = i830_covering_crtc(pScrn, &box, NULL, &crtcbox);
+
+	/* Make sure the CRTC is valid and this is the real front buffer */
+	if (crtc != NULL && !crtc->rotatedData)
+		pipe = i830_crtc_to_pipe(crtc);
+
+	return pipe;
 }
 
-/* This routine is a modified form of XAADoBitBlt with the calls to
- * ScreenToScreenBitBlt built in. My routine has the prgnSrc as source
- * instead of destination. My origin is upside down so the ydir cases
- * are reversed.
- */
 static void
-I830DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
-		   RegionPtr prgnSrc, CARD32 index)
-{
-   ScreenPtr pScreen = pParent->drawable.pScreen;
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   BoxPtr pboxTmp, pboxNext, pboxBase;
-   DDXPointPtr pptTmp, pptNew2 = NULL;
-   int xdir, ydir;
-
-#if 0
-   int screenwidth = pScrn->virtualX;
-   int screenheight = pScrn->virtualY;
-#else
-   int screenwidth = pScreen->width;
-   int screenheight = pScreen->height;
-#endif
-
-   BoxPtr pbox = REGION_RECTS(prgnSrc);
-   int nbox = REGION_NUM_RECTS(prgnSrc);
-
-   BoxPtr pboxNew1 = NULL;
-   BoxPtr pboxNew2 = NULL;
-   DDXPointPtr pptNew1 = NULL;
-   DDXPointPtr pptSrc = &ptOldOrg;
-
-   int dx = pParent->drawable.x - ptOldOrg.x;
-   int dy = pParent->drawable.y - ptOldOrg.y;
-   int buffer, first_buffer, last_buffer;
-
-   /* If the copy will overlap in Y, reverse the order */
-   if (dy > 0) {
-      ydir = -1;
-
-      if (nbox > 1) {
-	 /* Keep ordering in each band, reverse order of bands */
-	 pboxNew1 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
-	 if (!pboxNew1)
-	    return;
-	 pptNew1 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
-	 if (!pptNew1) {
-	    xfree(pboxNew1);
-	    return;
-	 }
-	 pboxBase = pboxNext = pbox + nbox - 1;
-	 while (pboxBase >= pbox) {
-	    while ((pboxNext >= pbox) && (pboxBase->y1 == pboxNext->y1))
-	       pboxNext--;
-	    pboxTmp = pboxNext + 1;
-	    pptTmp = pptSrc + (pboxTmp - pbox);
-	    while (pboxTmp <= pboxBase) {
-	       *pboxNew1++ = *pboxTmp++;
-	       *pptNew1++ = *pptTmp++;
-	    }
-	    pboxBase = pboxNext;
-	 }
-	 pboxNew1 -= nbox;
-	 pbox = pboxNew1;
-	 pptNew1 -= nbox;
-	 pptSrc = pptNew1;
-      }
-   } else {
-      /* No changes required */
-      ydir = 1;
-   }
-
-   /* If the regions will overlap in X, reverse the order */
-   if (dx > 0) {
-      xdir = -1;
-
-      if (nbox > 1) {
-	 /*reverse orderof rects in each band */
-	 pboxNew2 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
-	 pptNew2 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
-	 if (!pboxNew2 || !pptNew2) {
-	    if (pptNew2)
-	       xfree(pptNew2);
-	    if (pboxNew2)
-	       xfree(pboxNew2);
-	    if (pboxNew1) {
-	       xfree(pptNew1);
-	       xfree(pboxNew1);
-	    }
-	    return;
-	 }
-	 pboxBase = pboxNext = pbox;
-	 while (pboxBase < pbox + nbox) {
-	    while ((pboxNext < pbox + nbox) && (pboxNext->y1 == pboxBase->y1))
-	       pboxNext++;
-	    pboxTmp = pboxNext;
-	    pptTmp = pptSrc + (pboxTmp - pbox);
-	    while (pboxTmp != pboxBase) {
-	       *pboxNew2++ = *--pboxTmp;
-	       *pptNew2++ = *--pptTmp;
-	    }
-	    pboxBase = pboxNext;
-	 }
-	 pboxNew2 -= nbox;
-	 pbox = pboxNew2;
-	 pptNew2 -= nbox;
-	 pptSrc = pptNew2;
-      }
-   } else {
-      /* No changes are needed */
-      xdir = 1;
-   }
-
-   /* SelectBuffer isn't really a good concept for the i810.
-    */
-   I830EmitFlush(pScrn);
-   first_buffer = I830_SELECT_BACK;
-   last_buffer = I830_SELECT_DEPTH;
-
-   for (buffer = first_buffer; buffer <= last_buffer; buffer++) {
-      if (!I830SelectBuffer(pScrn, buffer))
-	 continue;
-      I830SetupForScreenToScreenCopy(pScrn, xdir, ydir, GXcopy, -1, -1);
-      pbox = REGION_RECTS(prgnSrc);
-      nbox = REGION_NUM_RECTS(prgnSrc);
-      for (; nbox--; pbox++) {
-
-	 int x1 = pbox->x1;
-	 int y1 = pbox->y1;
-	 int destx = x1 + dx;
-	 int desty = y1 + dy;
-	 int w = pbox->x2 - x1 + 1;
-	 int h = pbox->y2 - y1 + 1;
-
-	 if (destx < 0)
-	    x1 -= destx, w += destx, destx = 0;
-	 if (desty < 0)
-	    y1 -= desty, h += desty, desty = 0;
-	 if (destx + w > screenwidth)
-	    w = screenwidth - destx;
-	 if (desty + h > screenheight)
-	    h = screenheight - desty;
-	 if (w <= 0)
-	    continue;
-	 if (h <= 0)
-	    continue;
-
-	 if (I810_DEBUG & DEBUG_VERBOSE_DRI)
-	    ErrorF("MoveBuffers %d,%d %dx%d dx: %d dy: %d\n",
-		   x1, y1, w, h, dx, dy);
-
-	 I830SubsequentScreenToScreenCopy(pScrn, x1, y1, destx, desty, w, h);
-      }
-   }
-
-   I830SelectBuffer(pScrn, I830_SELECT_FRONT);
-   I830EmitFlush(pScrn);
-
-   if (pboxNew2) {
-      xfree(pptNew2);
-      xfree(pboxNew2);
-   }
-   if (pboxNew1) {
-      xfree(pptNew1);
-      xfree(pboxNew1);
-   }
-   i830MarkSync(pScrn);
+I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front,
+			DRI2BufferPtr back)
+{
+	I830DRI2BufferPrivatePtr front_priv, back_priv;
+	struct intel_pixmap *front_intel, *back_intel;
+	ScreenPtr screen;
+	intel_screen_private *intel;
+	int tmp;
+
+	front_priv = front->driverPrivate;
+	back_priv = back->driverPrivate;
+
+	/* Swap BO names so DRI works */
+	tmp = front->name;
+	front->name = back->name;
+	back->name = tmp;
+
+	/* Swap pixmap bos */
+	front_intel = i830_get_pixmap_intel(front_priv->pixmap);
+	back_intel = i830_get_pixmap_intel(back_priv->pixmap);
+	i830_set_pixmap_intel(front_priv->pixmap, back_intel);
+	i830_set_pixmap_intel(back_priv->pixmap, front_intel); /* should be screen */
+
+	/* Do we need to update the Screen? */
+	screen = draw->pScreen;
+	intel = intel_get_screen_private(xf86Screens[screen->myNum]);
+	if (front_intel->bo == intel->front_buffer->bo) {
+	    dri_bo_unreference (intel->front_buffer->bo);
+	    intel->front_buffer->bo = back_intel->bo;
+	    dri_bo_reference (intel->front_buffer->bo);
+	    i830_set_pixmap_intel(screen->GetScreenPixmap(screen),
+				  back_intel);
+	}
 }
 
-static void
-I830DRITransitionTo3d(ScreenPtr pScreen)
-{
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
+#ifdef notyet
+void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
+			       unsigned int tv_usec, void *event_data)
+{
+	DRI2FrameEventPtr event = event_data;
+	DrawablePtr drawable;
+	ScreenPtr screen;
+	ScrnInfoPtr scrn;
+	intel_screen_private *intel;
+	int status;
+
+	status = dixLookupDrawable(&drawable, event->drawable_id, serverClient,
+				   M_ANY, DixWriteAccess);
+	if (status != Success) {
+		I830DRI2DestroyBuffer(NULL, event->front);
+		I830DRI2DestroyBuffer(NULL, event->back);
+		free(event);
+		return;
+	}
 
-   pI830->want_vblank_interrupts = TRUE;
-   I830DRISetVBlankInterrupt(pScrn, TRUE);
-}
+	screen = drawable->pScreen;
+	scrn = xf86Screens[screen->myNum];
+	intel = intel_get_screen_private(scrn);
+
+	switch (event->type) {
+	case DRI2_SWAP: {
+		int swap_type;
+
+		if (DRI2CanExchange(drawable)) {
+			I830DRI2ExchangeBuffers(drawable,
+						event->front, event->back);
+			swap_type = DRI2_EXCHANGE_COMPLETE;
+		} else {
+			BoxRec	    box;
+			RegionRec	    region;
+
+			box.x1 = 0;
+			box.y1 = 0;
+			box.x2 = drawable->width;
+			box.y2 = drawable->height;
+			REGION_INIT(pScreen, &region, &box, 0);
+
+			I830DRI2CopyRegion(drawable,
+					   &region, event->front, event->back);
+			swap_type = DRI2_BLIT_COMPLETE;
+		}
+		DRI2SwapComplete(event->client, drawable, frame, tv_sec, tv_usec,
+				 swap_type,
+				 event->event_complete, event->event_data);
+		break;
+	}
+	case DRI2_WAITMSC:
+		DRI2WaitMSCComplete(event->client, drawable,
+				    frame, tv_sec, tv_usec);
+		break;
+	default:
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "%s: unknown vblank event received\n", __func__);
+		/* Unknown type */
+		break;
+	}
 
-static void
-I830DRITransitionTo2d(ScreenPtr pScreen)
-{
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
+	I830DRI2DestroyBuffer(drawable, event->front);
+	I830DRI2DestroyBuffer(drawable, event->back);
+	free(event);
+}
+
+void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
+			      unsigned int tv_usec, void *event_data)
+{
+	DRI2FrameEventPtr flip = event_data;
+	DrawablePtr drawable;
+	ScreenPtr screen;
+	ScrnInfoPtr scrn;
+	int status;
+
+	status = dixLookupDrawable(&drawable, flip->drawable_id, serverClient,
+				     M_ANY, DixWriteAccess);
+	if (status != Success) {
+		free(flip);
+		return;
+	}
 
-   pI830->want_vblank_interrupts = FALSE;
-   I830DRISetVBlankInterrupt(pScrn, FALSE);
-}
+	screen = drawable->pScreen;
+	scrn = xf86Screens[screen->myNum];
 
-static int
-i830_name_buffer (ScrnInfoPtr pScrn, i830_memory *mem)
-{
-    if (mem && mem->bo)
-    {
-	if (!mem->gem_name)
-	{
-	    int ret;
-	    ret = dri_bo_flink(mem->bo, &mem->gem_name);
-	    if (ret != 0)
-	    {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "[drm] failed to name buffer %d\n", -errno);
-		return -1;
-	    }
-	}
-	return mem->gem_name;
-    }
-    return -1;
+	/* We assume our flips arrive in order, so we don't check the frame */
+	switch (flip->type) {
+	case DRI2_SWAP:
+		DRI2SwapComplete(flip->client, drawable, frame, tv_sec, tv_usec,
+				 DRI2_FLIP_COMPLETE, flip->event_complete,
+				 flip->event_data);
+	break;
+	default:
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "%s: unknown vblank event received\n", __func__);
+		/* Unknown type */
+		break;
+	}
+
+	free(flip);
 }
 
-/**
- * Update the SAREA fields with current buffer information.
+/*
+ * ScheduleSwap is responsible for requesting a DRM vblank event for the
+ * appropriate frame.
  *
- * Most of the SAREA fields are already updated by i830_do_addmap().
+ * In the case of a blit (e.g. for a windowed swap) or buffer exchange,
+ * the vblank requested can simply be the last queued swap frame + the swap
+ * interval for the drawable.
  *
- * This does include other SAREA initialization which will actually be constant
- * over the lifetime of the server.
- */
-static void
-i830_update_sarea(ScrnInfoPtr pScrn, drmI830Sarea *sarea)
-{
-   ScreenPtr pScreen = pScrn->pScreen;
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   if (pI830->directRenderingType == DRI_DRI2)
-       return;
-
-   sarea->width = pScreen->width;
-   sarea->height = pScreen->height;
-   sarea->pitch = pScrn->displayWidth;
-   sarea->virtualX = pScrn->virtualX;
-   sarea->virtualY = pScrn->virtualY;
-
-   sarea->front_tiled = (pI830->front_buffer->tiling != TILE_NONE);
-   sarea->back_tiled = (pI830->back_buffer->tiling != TILE_NONE);
-   sarea->depth_tiled = (pI830->depth_buffer->tiling != TILE_NONE);
-   sarea->rotated_tiled = FALSE;
-
-   sarea->log_tex_granularity = pI830->TexGranularity;
-
-   sarea->front_bo_handle = i830_name_buffer (pScrn, pI830->front_buffer);
-   sarea->back_bo_handle = i830_name_buffer (pScrn, pI830->back_buffer);
-   sarea->depth_bo_handle = i830_name_buffer (pScrn, pI830->depth_buffer);
-
-   /* The rotation is now handled entirely by the X Server, so just leave the
-    * DRI unaware.
-    */
-   sarea->rotation = 0;
-   sarea->rotated_offset = -1;
-   sarea->rotated_size = 0;
-   sarea->rotated_pitch = pScrn->displayWidth;
-}
-
-/**
- * Updates the DRI mapping for the given i830_memory struct, with the given
- * flags.
+ * In the case of a page flip, we request an event for the last queued swap
+ * frame + swap interval - 1, since we'll need to queue the flip for the frame
+ * immediately following the received event.
+ *
+ * The client will be blocked if it tries to perform further GL commands
+ * after queueing a swap, though in the Intel case after queueing a flip, the
+ * client is free to queue more commands; they'll block in the kernel if
+ * they access buffers busy with the flip.
+ *
+ * When the swap is complete, the driver should call into the server so it
+ * can send any swap complete events that have been requested.
  */
 static int
-i830_do_addmap(ScrnInfoPtr pScrn, i830_memory *mem,
-	       drm_handle_t *sarea_handle, int *sarea_size, int *sarea_offset)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    int size = mem->size;
-
-    if (mem == pI830->front_buffer) {
-	/* Workaround for XAA pixmap cache: Don't use front_buffer->size
-	 * and instead, calculate the visible frontbuffer size and round to
-	 * avoid irritating the assertions of older DRI drivers.
-	 */
-	size = ROUND_TO_PAGE(pScrn->displayWidth * pScrn->virtualY *
-			     pI830->cpp);
-    }
-
-    if (*sarea_handle != 0 &&
-	(*sarea_size != size || *sarea_offset != mem->offset))
-    {
-	drmRmMap(pI830->drmSubFD, *sarea_handle);
-	*sarea_handle = 0;
-	*sarea_size = 0;
-	*sarea_offset = 0;
-    }
-
-    if (*sarea_handle == 0) {
-	int ret;
-
-	ret = drmAddMap(pI830->drmSubFD,
-			(drm_handle_t)(mem->offset + pI830->LinearAddr),
-			size, DRM_AGP, 0,
-			(drmAddress) sarea_handle);
-	if (ret == 0) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		       "[drm] mapped %s at 0x%08lx, handle = 0x%08x\n",
-		       mem->name, mem->offset + pI830->LinearAddr,
-		       (int)*sarea_handle);
-	    *sarea_size = size;
-	    *sarea_offset = mem->offset;
-	} else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "[drm] failed to map %s at 0x%08lx\n",
-		       mem->name, mem->offset + pI830->LinearAddr);
-	    return FALSE;
+I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
+		     DRI2BufferPtr back, CARD64 *target_msc, CARD64 divisor,
+		     CARD64 remainder, DRI2SwapEventPtr func, void *data)
+{
+	ScreenPtr screen = draw->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drmVBlank vbl;
+	int ret, pipe = I830DRI2DrawablePipe(draw), flip = 0;
+	DRI2FrameEventPtr swap_info;
+	enum DRI2FrameEventType swap_type = DRI2_SWAP;
+	CARD64 current_msc;
+	BoxRec box;
+	RegionRec region;
+
+	/* Truncate to match kernel interfaces; means occasional overflow
+	 * misses, but that's generally not a big deal */
+	*target_msc &= 0xffffffff;
+	divisor &= 0xffffffff;
+	remainder &= 0xffffffff;
+
+	swap_info = calloc(1, sizeof(DRI2FrameEventRec));
+
+	/* Drawable not displayed... just complete the swap */
+	if (pipe == -1 || !swap_info)
+	    goto blit_fallback;
+
+	swap_info->drawable_id = draw->id;
+	swap_info->client = client;
+	swap_info->event_complete = func;
+	swap_info->event_data = data;
+	swap_info->front = front;
+	swap_info->back = back;
+	I830DRI2ReferenceBuffer(front);
+	I830DRI2ReferenceBuffer(back);
+
+	/* Get current count */
+	vbl.request.type = DRM_VBLANK_RELATIVE;
+	if (pipe > 0)
+		vbl.request.type |= DRM_VBLANK_SECONDARY;
+	vbl.request.sequence = 0;
+	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+	if (ret) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "first get vblank counter failed: %s\n",
+			   strerror(errno));
+		goto blit_fallback;
 	}
-    }
 
-    return TRUE;
-}
+	current_msc = vbl.reply.sequence;
 
-/**
- * Updates the DRM mappings with the current buffer information.
- *
- * Some old DRI drivers may be unprepared for buffers actually moving at
- * runtime, which would likely result in bus errors on software fallbacks or
- * hangs or misrendering on hardware rendering.
- */
-static Bool
-i830_update_dri_mappings(ScrnInfoPtr pScrn, drmI830Sarea *sarea)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
+	swap_info->type = swap_type;
 
-   if (!i830_do_addmap(pScrn, pI830->front_buffer, &sarea->front_handle,
-		       &sarea->front_size, &sarea->front_offset)) {
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DRI.\n");
-       return FALSE;
-   }
-
-   if (!i830_do_addmap(pScrn, pI830->back_buffer, &sarea->back_handle,
-		       &sarea->back_size, &sarea->back_offset)) {
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DRI.\n");
-       return FALSE;
-   }
-
-   sarea->third_handle = 0;
-   sarea->third_offset = 0;
-   sarea->third_size = 0;
-
-   if (!i830_do_addmap(pScrn, pI830->depth_buffer, &sarea->depth_handle,
-		       &sarea->depth_size, &sarea->depth_offset)) {
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DRI.\n");
-       return FALSE;
-   }
-
-   if (pI830->allocate_classic_textures) {
-       if (!i830_do_addmap(pScrn, pI830->textures, &sarea->tex_handle,
-			   &sarea->tex_size, &sarea->tex_offset)) {
-	   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DRI.\n");
-	   return FALSE;
-       }
-   }
+	/* Correct target_msc by 'flip' if swap_type == DRI2_FLIP.
+	 * Do it early, so handling of different timing constraints
+	 * for divisor, remainder and msc vs. target_msc works.
+	 */
+	if (*target_msc > 0)
+		*target_msc -= flip;
 
-   return TRUE;
-}
+	/*
+	 * If divisor is zero, or current_msc is smaller than target_msc
+	 * we just need to make sure target_msc passes before initiating
+	 * the swap.
+	 */
+	if (divisor == 0 || current_msc < *target_msc) {
+		vbl.request.type =  DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
+		if (pipe > 0)
+			vbl.request.type |= DRM_VBLANK_SECONDARY;
+
+		/* If non-pageflipping, but blitting/exchanging, we need to use
+		 * DRM_VBLANK_NEXTONMISS to avoid unreliable timestamping later
+		 * on.
+		 */
+		if (flip == 0)
+			vbl.request.type |= DRM_VBLANK_NEXTONMISS;
+		if (pipe > 0)
+			vbl.request.type |= DRM_VBLANK_SECONDARY;
+
+		/* If target_msc already reached or passed, set it to
+		 * current_msc to ensure we return a reasonable value back
+		 * to the caller. This makes swap_interval logic more robust.
+		 */
+		if (current_msc >= *target_msc)
+			*target_msc = current_msc;
+
+		vbl.request.sequence = *target_msc;
+		vbl.request.signal = (unsigned long)swap_info;
+		ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+		if (ret) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "divisor 0 get vblank counter failed: %s\n",
+				   strerror(errno));
+			goto blit_fallback;
+		}
 
-static void
-i830_update_screen_private(ScrnInfoPtr pScrn, drmI830Sarea *sarea)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
+		*target_msc = vbl.reply.sequence + flip;
+		swap_info->frame = *target_msc;
 
-   pI830->pDRIInfo->frameBufferPhysicalAddress = (char *) pI830->LinearAddr;
-   pI830->pDRIInfo->frameBufferStride = pScrn->displayWidth * pI830->cpp;
-   pI830->pDRIInfo->frameBufferSize = sarea->front_size;
-#if DRI_DRIVER_FRAMEBUFFER_MAP
-   pI830->pDRIInfo->hFrameBuffer = sarea->front_handle;
-#endif
-}
+		return TRUE;
+	}
 
-/**
- * Update the SAREA fields, DRI mappings, and screen info passed through the
- * protocol.
- *
- * This gets called both at startup and after any of the buffers might have
- * been relocated.
- */
-Bool
-i830_update_dri_buffers(ScrnInfoPtr pScrn)
-{
-   ScreenPtr pScreen = pScrn->pScreen;
-   I830Ptr pI830 = I830PTR(pScrn);
-   drmI830Sarea *sarea;
-   Bool success;
-
-   if (pI830->directRenderingType != DRI_XF86DRI)
-       return TRUE;
-
-   sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen);
-
-   success = i830_update_dri_mappings(pScrn, sarea);
-   if (!success)
-       return FALSE;
-   i830_update_sarea(pScrn, sarea);
-   i830_update_screen_private(pScrn, sarea);
+	/*
+	 * If we get here, target_msc has already passed or we don't have one,
+	 * and we need to queue an event that will satisfy the divisor/remainder
+	 * equation.
+	 */
+	vbl.request.type = DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
+	if (flip == 0)
+		vbl.request.type |= DRM_VBLANK_NEXTONMISS;
+	if (pipe > 0)
+		vbl.request.type |= DRM_VBLANK_SECONDARY;
+
+	vbl.request.sequence = current_msc - (current_msc % divisor) +
+		remainder;
+
+	/*
+	 * If the calculated deadline vbl.request.sequence is smaller than
+	 * or equal to current_msc, it means we've passed the last point
+	 * when effective onset frame seq could satisfy
+	 * seq % divisor == remainder, so we need to wait for the next time
+	 * this will happen.
+
+	 * This comparison takes the 1 frame swap delay in pageflipping mode
+	 * into account, as well as a potential DRM_VBLANK_NEXTONMISS delay
+	 * if we are blitting/exchanging instead of flipping.
+	 */
+	if (vbl.request.sequence <= current_msc)
+		vbl.request.sequence += divisor;
 
-   return TRUE;
-}
+	/* Account for 1 frame extra pageflip delay if flip > 0 */
+	vbl.request.sequence -= flip;
 
-Bool
-I830DRISetVBlankInterrupt (ScrnInfoPtr pScrn, Bool on)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    drmI830VBlankPipe pipe;
-
-    /* If we have no 3d running, then don't bother enabling the vblank
-     * interrupt.
-     */
-    if (!pI830->want_vblank_interrupts)
-	on = FALSE;
-
-    if (pI830->directRenderingType == DRI_XF86DRI && pI830->drmMinor >= 5) {
-	if (on) {
-	    if (xf86_config->num_crtc > 1 && xf86_config->crtc[1]->enabled)
-		if (pI830->drmMinor >= 6)
-		    pipe.pipe = DRM_I830_VBLANK_PIPE_A | DRM_I830_VBLANK_PIPE_B;
-		else
-		    pipe.pipe = DRM_I830_VBLANK_PIPE_B;
-	    else
-		pipe.pipe = DRM_I830_VBLANK_PIPE_A;
-	} else {
-	    pipe.pipe = 0;
+	vbl.request.signal = (unsigned long)swap_info;
+	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+	if (ret) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "final get vblank counter failed: %s\n",
+			   strerror(errno));
+		goto blit_fallback;
 	}
-	if (drmCommandWrite(pI830->drmSubFD, DRM_I830_SET_VBLANK_PIPE,
-			    &pipe, sizeof (pipe))) {
-	    return FALSE;
-	}
-    }
 
-    return TRUE;
+	/* Adjust returned value for 1 fame pageflip offset of flip > 0 */
+	*target_msc = vbl.reply.sequence + flip;
+	swap_info->frame = *target_msc;
+
+	return TRUE;
+
+blit_fallback:
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = draw->width;
+	box.y2 = draw->height;
+	REGION_INIT(pScreen, &region, &box, 0);
+
+	I830DRI2CopyRegion(draw, &region, front, back);
+
+	DRI2SwapComplete(client, draw, 0, 0, 0, DRI2_BLIT_COMPLETE, func, data);
+	if (swap_info) {
+	    I830DRI2DestroyBuffer(draw, swap_info->front);
+	    I830DRI2DestroyBuffer(draw, swap_info->back);
+	    free(swap_info);
+	}
+	*target_msc = 0; /* offscreen, so zero out target vblank count */
+	return TRUE;
 }
 
-Bool
-I830DRILock(ScrnInfoPtr pScrn)
+/*
+ * Get current frame count and frame count timestamp, based on drawable's
+ * crtc.
+ */
+static int
+I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   if (pI830->directRenderingType == DRI_XF86DRI && !pI830->LockHeld) {
-      DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
-      pI830->LockHeld = 1;
-      if (!pI830->memory_manager)
-	  i830_refresh_ring(pScrn);
-      return TRUE;
-   }
-   else
-      return FALSE;
-}
-
+	ScreenPtr screen = draw->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drmVBlank vbl;
+	int ret, pipe = I830DRI2DrawablePipe(draw);
+
+	/* Drawable not displayed, make up a value */
+	if (pipe == -1) {
+		*ust = 0;
+		*msc = 0;
+		return TRUE;
+	}
 
+	vbl.request.type = DRM_VBLANK_RELATIVE;
+	if (pipe > 0)
+		vbl.request.type |= DRM_VBLANK_SECONDARY;
+	vbl.request.sequence = 0;
+
+	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+	if (ret) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "get vblank counter failed: %s\n", strerror(errno));
+		return FALSE;
+	}
 
-void
-I830DRIUnlock(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
+	*ust = ((CARD64)vbl.reply.tval_sec * 1000000) + vbl.reply.tval_usec;
+	*msc = vbl.reply.sequence;
 
-   if (pI830->directRenderingType == DRI_XF86DRI && pI830->LockHeld) {
-      DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
-      pI830->LockHeld = 0;
-   }
+	return TRUE;
 }
 
-#ifdef DRI2
-
-typedef struct {
-    PixmapPtr pPixmap;
-} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
-
-#if 0
-static DRI2BufferPtr
-I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
+/*
+ * Request a DRM event when the requested conditions will be satisfied.
+ *
+ * We need to handle the event and ask the server to wake up the client when
+ * we receive it.
+ */
+static int
+I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
+			CARD64 divisor, CARD64 remainder)
 {
-    ScreenPtr pScreen = pDraw->pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    DRI2BufferPtr buffers;
-    dri_bo *bo;
-    int i;
-    I830DRI2BufferPrivatePtr privates;
-    PixmapPtr pPixmap, pDepthPixmap;
-
-    buffers = xcalloc(count, sizeof *buffers);
-    if (buffers == NULL)
-	return NULL;
-    privates = xcalloc(count, sizeof *privates);
-    if (privates == NULL) {
-	xfree(buffers);
-	return NULL;
-    }
-
-    pDepthPixmap = NULL;
-    for (i = 0; i < count; i++) {
-	if (attachments[i] == DRI2BufferFrontLeft) {
-	    if (pDraw->type == DRAWABLE_PIXMAP)
-		pPixmap = (PixmapPtr) pDraw;
-	    else
-		pPixmap = (*pScreen->GetWindowPixmap)((WindowPtr) pDraw);
-	    pPixmap->refcnt++;
-	} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
-	    pPixmap = pDepthPixmap;
-	    pPixmap->refcnt++;
-	} else {
-	    unsigned int hint = 0;
-
-	    switch (attachments[i]) {
-	    case DRI2BufferDepth:
-		if (SUPPORTS_YTILING(pI830))
-		    hint = INTEL_CREATE_PIXMAP_TILING_Y;
-		else
-		    hint = INTEL_CREATE_PIXMAP_TILING_X;
-		break;
-	    case DRI2BufferFakeFrontLeft:
-	    case DRI2BufferFakeFrontRight:
-	    case DRI2BufferBackLeft:
-	    case DRI2BufferBackRight:
-		    hint = INTEL_CREATE_PIXMAP_TILING_X;
-		break;
-	    }
-
-	    if (!pI830->tiling ||
-		(!IS_I965G(pI830) && !pI830->kernel_exec_fencing))
-		hint = 0;
+	ScreenPtr screen = draw->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	DRI2FrameEventPtr wait_info;
+	drmVBlank vbl;
+	int ret, pipe = I830DRI2DrawablePipe(draw);
+	CARD64 current_msc;
+
+	/* Truncate to match kernel interfaces; means occasional overflow
+	 * misses, but that's generally not a big deal */
+	target_msc &= 0xffffffff;
+	divisor &= 0xffffffff;
+	remainder &= 0xffffffff;
+
+	/* Drawable not visible, return immediately */
+	if (pipe == -1)
+		goto out_complete;
+
+	wait_info = calloc(1, sizeof(DRI2FrameEventRec));
+	if (!wait_info)
+		goto out_complete;
+
+	wait_info->drawable_id = draw->id;
+	wait_info->client = client;
+	wait_info->type = DRI2_WAITMSC;
+
+	/* Get current count */
+	vbl.request.type = DRM_VBLANK_RELATIVE;
+	if (pipe > 0)
+		vbl.request.type |= DRM_VBLANK_SECONDARY;
+	vbl.request.sequence = 0;
+	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+	if (ret) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "get vblank counter failed: %s\n", strerror(errno));
+		goto out_complete;
+	}
 
-	    pPixmap = (*pScreen->CreatePixmap)(pScreen,
-					       pDraw->width,
-					       pDraw->height,
-					       pDraw->depth,
-					       hint);
+	current_msc = vbl.reply.sequence;
 
+	/*
+	 * If divisor is zero, or current_msc is smaller than target_msc,
+	 * we just need to make sure target_msc passes  before waking up the
+	 * client.
+	 */
+	if (divisor == 0 || current_msc < target_msc) {
+		/* If target_msc already reached or passed, set it to
+		 * current_msc to ensure we return a reasonable value back
+		 * to the caller. This keeps the client from continually
+		 * sending us MSC targets from the past by forcibly updating
+		 * their count on this call.
+		 */
+		if (current_msc >= target_msc)
+			target_msc = current_msc;
+		vbl.request.type = DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
+		if (pipe > 0)
+			vbl.request.type |= DRM_VBLANK_SECONDARY;
+		vbl.request.sequence = target_msc;
+		vbl.request.signal = (unsigned long)wait_info;
+		ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+		if (ret) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "get vblank counter failed: %s\n", strerror(errno));
+			goto out_complete;
+		}
+
+		wait_info->frame = vbl.reply.sequence;
+		DRI2BlockClient(client, draw);
+		return TRUE;
 	}
 
-	if (attachments[i] == DRI2BufferDepth)
-	    pDepthPixmap = pPixmap;
-
-	buffers[i].attachment = attachments[i];
-	buffers[i].pitch = pPixmap->devKind;
-	buffers[i].cpp = pPixmap->drawable.bitsPerPixel / 8;
-	buffers[i].driverPrivate = &privates[i];
-	buffers[i].flags = 0; /* not tiled */
-	privates[i].pPixmap = pPixmap;
+	/*
+	 * If we get here, target_msc has already passed or we don't have one,
+	 * so we queue an event that will satisfy the divisor/remainder equation.
+	 */
+	vbl.request.type = DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
+	if (pipe > 0)
+		vbl.request.type |= DRM_VBLANK_SECONDARY;
+
+	vbl.request.sequence = current_msc - (current_msc % divisor) +
+	    remainder;
+
+	/*
+	 * If calculated remainder is larger than requested remainder,
+	 * it means we've passed the last point where
+	 * seq % divisor == remainder, so we need to wait for the next time
+	 * that will happen.
+	 */
+	if ((current_msc % divisor) >= remainder)
+	    vbl.request.sequence += divisor;
 
-	bo = i830_get_pixmap_bo (pPixmap);
-	if (dri_bo_flink(bo, &buffers[i].name) != 0) {
-	    /* failed to name buffer */
+	vbl.request.signal = (unsigned long)wait_info;
+	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+	if (ret) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "get vblank counter failed: %s\n", strerror(errno));
+		goto out_complete;
 	}
 
-    }
+	wait_info->frame = vbl.reply.sequence;
+	DRI2BlockClient(client, draw);
 
-    return buffers;
-}
+	return TRUE;
 
-static void
-I830DRI2DestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
-{
-    ScreenPtr pScreen = pDraw->pScreen;
-    I830DRI2BufferPrivatePtr private;
-    int i;
-
-    for (i = 0; i < count; i++)
-    {
-	private = buffers[i].driverPrivate;
-	(*pScreen->DestroyPixmap)(private->pPixmap);
-    }
-
-    if (buffers)
-    {
-	xfree(buffers[0].driverPrivate);
-	xfree(buffers);
-    }
+out_complete:
+	DRI2WaitMSCComplete(client, draw, target_msc, 0, 0);
+	return TRUE;
 }
 #endif
-
-static void
-I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
-		   DRI2BufferPtr pDestBuffer, DRI2BufferPtr pSrcBuffer)
-{
-    I830DRI2BufferPrivatePtr private = pSrcBuffer->driverPrivate;
-    ScreenPtr pScreen = pDraw->pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    PixmapPtr pPixmap = private->pPixmap;
-    RegionPtr pCopyClip;
-    GCPtr pGC;
-
-    pGC = GetScratchGC(pDraw->depth, pScreen);
-    pCopyClip = REGION_CREATE(pScreen, NULL, 0);
-    REGION_COPY(pScreen, pCopyClip, pRegion);
-    (*pGC->funcs->ChangeClip) (pGC, CT_REGION, pCopyClip, 0);
-    ValidateGC(pDraw, pGC);
-    (*pGC->ops->CopyArea)(&pPixmap->drawable,
-			  pDraw, pGC, 0, 0, pDraw->width, pDraw->height, 0, 0);
-    FreeScratchGC(pGC);
-
-    /* Emit a flush of the rendering cache, or on the 965 and beyond
-     * rendering results may not hit the framebuffer until significantly
-     * later.
-     */
-    I830EmitFlush(pScrn);
-    pI830->need_mi_flush = FALSE;
-
-    /* We can't rely on getting into the block handler before the DRI
-     * client gets to run again so flush now. */
-    intel_batch_flush(pScrn, TRUE);
-#if ALWAYS_SYNC
-    I830Sync(pScrn);
 #endif
-    drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE);
-
-}
 
-Bool I830DRI2ScreenInit(ScreenPtr pScreen)
+Bool I830DRI2ScreenInit(ScreenPtr screen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    DRI2InfoRec info;
-    char *p, buf[64];
-    int i;
-    struct stat sbuf;
-    dev_t d;
-
-    if (pI830->accel != ACCEL_UXA) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DRI2 requires UXA\n");
-	return FALSE;
-    }
-
-    sprintf(buf, "pci:%04x:%02x:%02x.%d",
-	    pI830->PciInfo->domain,
-	    pI830->PciInfo->bus,
-	    pI830->PciInfo->dev,
-	    pI830->PciInfo->func);
-
-    info.fd = -1;
-
-#ifdef XF86DRM_MODE
-    /* Use the already opened (master) fd from modesetting */
-    if (pI830->use_drm_mode)
-	info.fd = pI830->drmSubFD;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	DRI2InfoRec info;
+#ifdef USE_DRI2_1_1_0
+	int dri2_major = 1;
+	int dri2_minor = 0;
 #endif
-
-    if (info.fd < 0)
-	info.fd = drmOpen("i915", buf);
-
-    if (info.fd < 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Failed to open DRM device\n");
-	return FALSE;
-    }
-
-    /* The whole drmOpen thing is a fiasco and we need to find a way
-     * back to just using open(2).  For now, however, lets just make
-     * things worse with even more ad hoc directory walking code to
-     * discover the device file name. */
-
-    fstat(info.fd, &sbuf);
-    d = sbuf.st_rdev;
-
-    p = pI830->deviceName;
-    for (i = 0; i < DRM_MAX_MINOR; i++) {
-	sprintf(p, DRM_DEV_NAME, DRM_DIR_NAME, i);
-	if (stat(p, &sbuf) == 0 && sbuf.st_rdev == d)
-	    break;
-    }
-    if (i == DRM_MAX_MINOR) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "DRI2: failed to open drm device\n");
-	return FALSE;
-    }
-
-    info.driverName = IS_I965G(pI830) ? "i965" : "i915";
-    info.deviceName = p;
-    info.version = 1;
-
-#if 0
-    info.CreateBuffers = I830DRI2CreateBuffers;
-    info.DestroyBuffers = I830DRI2DestroyBuffers;
+#if DRI2INFOREC_VERSION >= 4
+	const char *driverNames[1];
 #endif
-    info.CopyRegion = I830DRI2CopyRegion;
 
-    pI830->drmSubFD = info.fd;
+#ifdef USE_DRI2_1_1_0
+	if (xf86LoaderCheckSymbol("DRI2Version")) {
+		DRI2Version(&dri2_major, &dri2_minor);
+	}
 
-    return DRI2ScreenInit(pScreen, &info);
-}
+	if (dri2_minor < 1) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "DRI2 requires DRI2 module version 1.1.0 or later\n");
+		return FALSE;
+	}
+#endif
 
-void I830DRI2CloseScreen(ScreenPtr pScreen)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel->deviceName = drmGetDeviceNameFromFd(intel->drmSubFD);
+	memset(&info, '\0', sizeof(info));
+	info.fd = intel->drmSubFD;
+	info.driverName = IS_I965G(intel) ? "i965" : "i915";
+	info.deviceName = intel->deviceName;
+
+#if DRI2INFOREC_VERSION >= 3
+	info.version = 3;
+	info.CreateBuffer = I830DRI2CreateBuffer;
+	info.DestroyBuffer = I830DRI2DestroyBuffer;
+#else
+# ifdef USE_DRI2_1_1_0
+	info.version = 2;
+	info.CreateBuffers = NULL;
+	info.DestroyBuffers = NULL;
+	info.CreateBuffer = I830DRI2CreateBuffer;
+	info.DestroyBuffer = I830DRI2DestroyBuffer;
+# else
+	info.version = 1;
+	info.CreateBuffers = I830DRI2CreateBuffers;
+	info.DestroyBuffers = I830DRI2DestroyBuffers;
+# endif
+#endif
+
+	info.CopyRegion = I830DRI2CopyRegion;
+#if DRI2INFOREC_VERSION >= 4
+#ifdef notyet
+	info.version = 4;
+	info.ScheduleSwap = I830DRI2ScheduleSwap;
+	info.GetMSC = I830DRI2GetMSC;
+	info.ScheduleWaitMSC = I830DRI2ScheduleWaitMSC;
+	info.numDrivers = 1;
+	info.driverNames = driverNames;
+	driverNames[0] = info.driverName;
+#endif
+#endif
 
-    DRI2CloseScreen(pScreen);
-    pI830->directRenderingType = DRI_NONE;
+	return DRI2ScreenInit(screen, &info);
+}
+
+void I830DRI2CloseScreen(ScreenPtr screen)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	DRI2CloseScreen(screen);
+	intel->directRenderingType = DRI_NONE;
+	drmFree(intel->deviceName);
 }
-
-#endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c	2010-11-29 02:42:38.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.50 2004/02/20 00:06:00 alanh Exp $ */
 /**************************************************************************
 
 Copyright 2001 VA Linux Systems Inc., Fremont, California.
@@ -28,135 +27,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors: Jeff Hartmann <jhartmann@valinux.com>
  *          Abraham van der Merwe <abraham@2d3d.co.za>
  *          David Dawes <dawes@xfree86.org>
  *          Alan Hourihane <alanh@tungstengraphics.com>
  */
 
-/*
- * Mode handling is based on the VESA driver written by:
- * Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
- */
-
-/*
- * Changes:
- *
- *    23/08/2001 Abraham van der Merwe <abraham@2d3d.co.za>
- *        - Fixed display timing bug (mode information for some
- *          modes were not initialized correctly)
- *        - Added workarounds for GTT corruptions (I don't adjust
- *          the pitches for 1280x and 1600x modes so we don't
- *          need extra memory)
- *        - The code will now default to 60Hz if LFP is connected
- *        - Added different refresh rate setting code to work
- *          around 0x4f02 BIOS bug
- *        - BIOS workaround for some mode sets (I use legacy BIOS
- *          calls for setting those)
- *        - Removed 0x4f04, 0x01 (save state) BIOS call which causes
- *          LFP to malfunction (do some house keeping and restore
- *          modes ourselves instead - not perfect, but at least the
- *          LFP is working now)
- *        - Several other smaller bug fixes
- *
- *    06/09/2001 Abraham van der Merwe <abraham@2d3d.co.za>
- *        - Preliminary local memory support (works without agpgart)
- *        - DGA fixes (the code were still using i810 mode sets, etc.)
- *        - agpgart fixes
- *
- *    18/09/2001
- *        - Proper local memory support (should work correctly now
- *          with/without agpgart module)
- *        - more agpgart fixes
- *        - got rid of incorrect GTT adjustments
- *
- *    09/10/2001
- *        - Changed the DPRINTF() variadic macro to an ANSI C compatible
- *          version
- *
- *    10/10/2001
- *        - Fixed DPRINTF_stub(). I forgot the __...__ macros in there
- *          instead of the function arguments :P
- *        - Added a workaround for the 1600x1200 bug (Text mode corrupts
- *          when you exit from any 1600x1200 mode and 1280x1024@85Hz. I
- *          suspect this is a BIOS bug (hence the 1280x1024@85Hz case)).
- *          For now I'm switching to 800x600@60Hz then to 80x25 text mode
- *          and then restoring the registers - very ugly indeed.
- *
- *    15/10/2001
- *        - Improved 1600x1200 mode set workaround. The previous workaround
- *          was causing mode set problems later on.
- *
- *    18/10/2001
- *        - Fixed a bug in I830BIOSLeaveVT() which caused a bug when you
- *          switched VT's
- */
-/*
- *    07/2002 David Dawes
- *        - Add Intel(R) 855GM/852GM support.
- */
-/*
- *    07/2002 David Dawes
- *        - Cleanup code formatting.
- *        - Improve VESA mode selection, and fix refresh rate selection.
- *        - Don't duplicate functions provided in 4.2 vbe modules.
- *        - Don't duplicate functions provided in the vgahw module.
- *        - Rewrite memory allocation.
- *        - Rewrite initialisation and save/restore state handling.
- *        - Decouple the i810 support from i830 and later.
- *        - Remove various unnecessary hacks and workarounds.
- *        - Fix an 845G problem with the ring buffer not in pre-allocated
- *          memory.
- *        - Fix screen blanking.
- *        - Clear the screen at startup so you don't see the previous session.
- *        - Fix some HW cursor glitches, and turn HW cursor off at VT switch
- *          and exit.
- *
- *    08/2002 Keith Whitwell
- *        - Fix DRI initialisation.
- *
- *
- *    08/2002 Alan Hourihane and David Dawes
- *        - Add XVideo support.
- *
- *
- *    10/2002 David Dawes
- *        - Add Intel(R) 865G support.
- *
- *
- *    01/2004 Alan Hourihane
- *        - Add Intel(R) 915G support.
- *        - Add Dual Head and Clone capabilities.
- *        - Add lid status checking
- *        - Fix Xvideo with high-res LFP's
- *        - Add ARGB HW cursor support
- *
- *    05/2005 Alan Hourihane
- *        - Add Intel(R) 945G support.
- *
- *    09/2005 Alan Hourihane
- *        - Add Intel(R) 945GM support.
- *
- *    10/2005 Alan Hourihane, Keith Whitwell, Brian Paul
- *        - Added Rotation support
- *
- *    12/2005 Alan Hourihane, Keith Whitwell
- *        - Add Intel(R) 965G support.
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -172,6 +48,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
+#include <poll.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -192,7 +69,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "shadow.h"
 #include "i830.h"
 #include "i830_display.h"
-#include "i830_debug.h"
 #include "i830_bios.h"
 #include "i830_video.h"
 #if HAVE_SYS_MMAN_H && HAVE_MPROTECT
@@ -204,33 +80,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "i830_hwmc.h"
 #endif
 
-#ifdef XF86DRI
-#include "dri.h"
 #include <sys/ioctl.h>
 #include "i915_drm.h"
-#endif
-
-#ifdef XF86DRM_MODE
 #include <xf86drmMode.h>
-#endif
-
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
-#define xf86LoaderReqSymLists(...) do {} while (0)
-#define LoaderRefSymLists(...) do {} while (0)
-#else
-
-#ifdef I830_USE_EXA
-const char *I830exaSymbols[] = {
-    "exaGetVersion",
-    "exaDriverInit",
-    "exaDriverFini",
-    "exaOffscreenAlloc",
-    "exaOffscreenFree",
-    "exaWaitSync",
-    NULL
-};
-#endif
-#endif
 
 #define BIT(x) (1 << (x))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -248,8 +100,8 @@ static SymTabRec I830Chipsets[] = {
    {PCI_CHIP_I945_G,		"945G"},
    {PCI_CHIP_I945_GM,		"945GM"},
    {PCI_CHIP_I945_GME,		"945GME"},
-   {PCI_CHIP_IGD_GM,		"IGD"},
-   {PCI_CHIP_IGD_G,		"IGD"},
+   {PCI_CHIP_IGD_GM,		"Pineview GM"},
+   {PCI_CHIP_IGD_G,		"Pineview G"},
    {PCI_CHIP_I965_G,		"965G"},
    {PCI_CHIP_G35_G,		"G35"},
    {PCI_CHIP_I965_Q,		"965Q"},
@@ -259,42 +111,48 @@ static SymTabRec I830Chipsets[] = {
    {PCI_CHIP_G33_G,		"G33"},
    {PCI_CHIP_Q35_G,		"Q35"},
    {PCI_CHIP_Q33_G,		"Q33"},
-   {PCI_CHIP_GM45_GM,		"Mobile Intel® GM45 Express Chipset"},
-   {PCI_CHIP_IGD_E_G,		"Intel Integrated Graphics Device"},
+   {PCI_CHIP_GM45_GM,		"GM45"},
+   {PCI_CHIP_IGD_E_G,		"4 Series"},
    {PCI_CHIP_G45_G,		"G45/G43"},
    {PCI_CHIP_Q45_G,		"Q45/Q43"},
    {PCI_CHIP_G41_G,		"G41"},
+   {PCI_CHIP_B43_G,		"B43"},
+   {PCI_CHIP_IGDNG_D_G,		"Clarkdale"},
+   {PCI_CHIP_IGDNG_M_G,		"Arrandale"},
    {-1,				NULL}
 };
 
 static PciChipsets I830PciChipsets[] = {
-   {PCI_CHIP_I830_M,		PCI_CHIP_I830_M,	RES_SHARED_VGA},
-   {PCI_CHIP_845_G,		PCI_CHIP_845_G,		RES_SHARED_VGA},
-   {PCI_CHIP_I855_GM,		PCI_CHIP_I855_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I865_G,		PCI_CHIP_I865_G,	RES_SHARED_VGA},
-   {PCI_CHIP_I915_G,		PCI_CHIP_I915_G,	RES_SHARED_VGA},
-   {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	RES_SHARED_VGA},
-   {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	RES_SHARED_VGA},
-   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I945_GME,		PCI_CHIP_I945_GME,	RES_SHARED_VGA},
-   {PCI_CHIP_IGD_GM,		PCI_CHIP_IGD_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_IGD_G,		PCI_CHIP_IGD_G,		RES_SHARED_VGA},
-   {PCI_CHIP_I965_G,		PCI_CHIP_I965_G,	RES_SHARED_VGA},
-   {PCI_CHIP_G35_G,		PCI_CHIP_G35_G,		RES_SHARED_VGA},
-   {PCI_CHIP_I965_Q,		PCI_CHIP_I965_Q,	RES_SHARED_VGA},
-   {PCI_CHIP_I946_GZ,		PCI_CHIP_I946_GZ,	RES_SHARED_VGA},
-   {PCI_CHIP_I965_GM,		PCI_CHIP_I965_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_I965_GME,		PCI_CHIP_I965_GME,	RES_SHARED_VGA},
-   {PCI_CHIP_G33_G,		PCI_CHIP_G33_G,		RES_SHARED_VGA},
-   {PCI_CHIP_Q35_G,		PCI_CHIP_Q35_G,		RES_SHARED_VGA},
-   {PCI_CHIP_Q33_G,		PCI_CHIP_Q33_G,		RES_SHARED_VGA},
-   {PCI_CHIP_GM45_GM,		PCI_CHIP_GM45_GM,	RES_SHARED_VGA},
-   {PCI_CHIP_IGD_E_G,		PCI_CHIP_IGD_E_G,	RES_SHARED_VGA},
-   {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		RES_SHARED_VGA},
-   {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		RES_SHARED_VGA},
-   {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		RES_SHARED_VGA},
-   {-1,				-1,			RES_UNDEFINED}
+   {PCI_CHIP_I830_M,		PCI_CHIP_I830_M,	NULL},
+   {PCI_CHIP_845_G,		PCI_CHIP_845_G,		NULL},
+   {PCI_CHIP_I855_GM,		PCI_CHIP_I855_GM,	NULL},
+   {PCI_CHIP_I865_G,		PCI_CHIP_I865_G,	NULL},
+   {PCI_CHIP_I915_G,		PCI_CHIP_I915_G,	NULL},
+   {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	NULL},
+   {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	NULL},
+   {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	NULL},
+   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	NULL},
+   {PCI_CHIP_I945_GME,		PCI_CHIP_I945_GME,	NULL},
+   {PCI_CHIP_IGD_GM,		PCI_CHIP_IGD_GM,	NULL},
+   {PCI_CHIP_IGD_G,		PCI_CHIP_IGD_G,		NULL},
+   {PCI_CHIP_I965_G,		PCI_CHIP_I965_G,	NULL},
+   {PCI_CHIP_G35_G,		PCI_CHIP_G35_G,		NULL},
+   {PCI_CHIP_I965_Q,		PCI_CHIP_I965_Q,	NULL},
+   {PCI_CHIP_I946_GZ,		PCI_CHIP_I946_GZ,	NULL},
+   {PCI_CHIP_I965_GM,		PCI_CHIP_I965_GM,	NULL},
+   {PCI_CHIP_I965_GME,		PCI_CHIP_I965_GME,	NULL},
+   {PCI_CHIP_G33_G,		PCI_CHIP_G33_G,		NULL},
+   {PCI_CHIP_Q35_G,		PCI_CHIP_Q35_G,		NULL},
+   {PCI_CHIP_Q33_G,		PCI_CHIP_Q33_G,		NULL},
+   {PCI_CHIP_GM45_GM,		PCI_CHIP_GM45_GM,	NULL},
+   {PCI_CHIP_IGD_E_G,		PCI_CHIP_IGD_E_G,	NULL},
+   {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		NULL},
+   {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		NULL},
+   {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		NULL},
+   {PCI_CHIP_B43_G,		PCI_CHIP_B43_G,		NULL},
+   {PCI_CHIP_IGDNG_D_G,		PCI_CHIP_IGDNG_D_G,		NULL},
+   {PCI_CHIP_IGDNG_M_G,		PCI_CHIP_IGDNG_M_G,		NULL},
+   {-1,				-1,			NULL}
 };
 
 /*
@@ -304,9 +162,6 @@ static PciChipsets I830PciChipsets[] = {
  */
 
 typedef enum {
-   OPTION_ACCELMETHOD,
-   OPTION_NOACCEL,
-   OPTION_CACHE_LINES,
    OPTION_DRI,
    OPTION_VIDEO_KEY,
    OPTION_COLOR_KEY,
@@ -315,18 +170,19 @@ typedef enum {
    OPTION_LVDS24BITMODE,
    OPTION_FBC,
    OPTION_TILING,
+   OPTION_SWAPBUFFERS_WAIT,
    OPTION_LVDSFIXEDMODE,
    OPTION_FORCEENABLEPIPEA,
 #ifdef INTEL_XVMC
    OPTION_XVMC,
 #endif
    OPTION_PREFER_OVERLAY,
+   OPTION_DEBUG_FLUSH_BATCHES,
+   OPTION_DEBUG_FLUSH_CACHES,
+   OPTION_DEBUG_WAIT,
 } I830Opts;
 
 static OptionInfoRec I830Options[] = {
-   {OPTION_ACCELMETHOD,	"AccelMethod",	OPTV_ANYSTR,	{0},	FALSE},
-   {OPTION_NOACCEL,	"NoAccel",	OPTV_BOOLEAN,	{0},	FALSE},
-   {OPTION_CACHE_LINES,	"CacheLines",	OPTV_INTEGER,	{0},	FALSE},
    {OPTION_DRI,		"DRI",		OPTV_BOOLEAN,	{0},	TRUE},
    {OPTION_COLOR_KEY,	"ColorKey",	OPTV_INTEGER,	{0},	FALSE},
    {OPTION_VIDEO_KEY,	"VideoKey",	OPTV_INTEGER,	{0},	FALSE},
@@ -335,118 +191,90 @@ static OptionInfoRec I830Options[] = {
    {OPTION_LVDS24BITMODE, "LVDS24Bit",	OPTV_BOOLEAN,	{0},	FALSE},
    {OPTION_FBC,		"FramebufferCompression", OPTV_BOOLEAN, {0}, TRUE},
    {OPTION_TILING,	"Tiling",	OPTV_BOOLEAN,	{0},	TRUE},
+   {OPTION_SWAPBUFFERS_WAIT, "SwapbuffersWait", OPTV_BOOLEAN,	{0},	TRUE},
    {OPTION_LVDSFIXEDMODE, "LVDSFixedMode", OPTV_BOOLEAN,	{0},	FALSE},
    {OPTION_FORCEENABLEPIPEA, "ForceEnablePipeA", OPTV_BOOLEAN,	{0},	FALSE},
 #ifdef INTEL_XVMC
    {OPTION_XVMC,	"XvMC",		OPTV_BOOLEAN,	{0},	TRUE},
 #endif
    {OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, FALSE},
+   {OPTION_DEBUG_FLUSH_BATCHES, "DebugFlushBatches", OPTV_BOOLEAN, {0}, FALSE},
+   {OPTION_DEBUG_FLUSH_CACHES, "DebugFlushCaches", OPTV_BOOLEAN, {0}, FALSE},
+   {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE},
    {-1,			NULL,		OPTV_NONE,	{0},	FALSE}
 };
 /* *INDENT-ON* */
 
-const char *i830_output_type_names[] = {
-   "Unused",
-   "Analog",
-   "DVO",
-   "SDVO",
-   "LVDS",
-   "TVOUT",
-};
-
 static void i830AdjustFrame(int scrnIndex, int x, int y, int flags);
-static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen);
 static Bool I830EnterVT(int scrnIndex, int flags);
-static Bool SaveHWState(ScrnInfoPtr pScrn);
-static Bool RestoreHWState(ScrnInfoPtr pScrn);
+static Bool SaveHWState(ScrnInfoPtr scrn);
+static Bool RestoreHWState(ScrnInfoPtr scrn);
 
 /* temporary */
-extern void xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y);
+extern void xf86SetCursor(ScreenPtr screen, CursorPtr pCurs, int x, int y);
 
 #ifdef I830DEBUG
 void
-I830DPRINTF_stub(const char *filename, int line, const char *function,
-		 const char *fmt, ...)
+I830DPRINTF(const char *filename, int line, const char *function,
+	    const char *fmt, ...)
 {
-   va_list ap;
+	va_list ap;
 
-   ErrorF("\n##############################################\n"
-	  "*** In function %s, on line %d, in file %s ***\n",
-	  function, line, filename);
-   va_start(ap, fmt);
-   VErrorF(fmt, ap);
-   va_end(ap);
-   ErrorF("##############################################\n\n");
-}
-#else /* #ifdef I830DEBUG */
-void
-I830DPRINTF_stub(const char *filename, int line, const char *function,
-		 const char *fmt, ...)
-{
-   /* do nothing */
+	ErrorF("\n##############################################\n"
+	       "*** In function %s, on line %d, in file %s ***\n",
+	       function, line, filename);
+	va_start(ap, fmt);
+	VErrorF(fmt, ap);
+	va_end(ap);
+	ErrorF("##############################################\n\n");
 }
 #endif /* #ifdef I830DEBUG */
 
 /* Export I830 options to i830 driver where necessary */
-const OptionInfoRec *
-I830AvailableOptions(int chipid, int busid)
+const OptionInfoRec *I830AvailableOptions(int chipid, int busid)
 {
-   int i;
+	int i;
 
-   for (i = 0; I830PciChipsets[i].PCIid > 0; i++) {
-      if (chipid == I830PciChipsets[i].PCIid)
-	 return I830Options;
-   }
-   return NULL;
+	for (i = 0; I830PciChipsets[i].PCIid > 0; i++) {
+		if (chipid == I830PciChipsets[i].PCIid)
+			return I830Options;
+	}
+	return NULL;
 }
 
-static Bool
-I830GetRec(ScrnInfoPtr pScrn)
+static Bool I830GetRec(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830;
+	intel_screen_private *intel;
 
-   if (pScrn->driverPrivate)
-      return TRUE;
-   pI830 = pScrn->driverPrivate = xnfcalloc(sizeof(I830Rec), 1);
-   return TRUE;
+	if (scrn->driverPrivate)
+		return TRUE;
+	intel = scrn->driverPrivate = xnfcalloc(sizeof(intel_screen_private), 1);
+	return TRUE;
 }
 
-static void
-I830FreeRec(ScrnInfoPtr pScrn)
+static void I830FreeRec(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830;
-
-   if (!pScrn)
-      return;
-   if (!pScrn->driverPrivate)
-      return;
-
-   pI830 = I830PTR(pScrn);
+	if (!scrn)
+		return;
+	if (!scrn->driverPrivate)
+		return;
 
-   xfree(pScrn->driverPrivate);
-   pScrn->driverPrivate = NULL;
+	free(scrn->driverPrivate);
+	scrn->driverPrivate = NULL;
 }
 
 static int
-I830DetectMemory(ScrnInfoPtr pScrn)
+I830DetectMemory(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-#if !XSERVER_LIBPCIACCESS
-   PCITAG bridge;
-#endif
+   intel_screen_private *intel = intel_get_screen_private(scrn);
    uint16_t gmch_ctrl;
    int memsize = 0, gtt_size;
    int range;
-
-#if XSERVER_LIBPCIACCESS
    struct pci_device *bridge = intel_host_bridge ();
    pci_device_cfg_read_u16(bridge, & gmch_ctrl, I830_GMCH_CTRL);
-#else
-   bridge = pciTag(0, 0, 0);		/* This is always the host bridge */
-   gmch_ctrl = pciReadWord(bridge, I830_GMCH_CTRL);
-#endif
 
-   if (IS_I965G(pI830)) {
+   if (IS_I965G(intel)) {
       /* The 965 may have a GTT that is actually larger than is necessary
        * to cover the aperture, so check the hardware's reporting of the
        * GTT size.
@@ -473,7 +301,7 @@ I830DetectMemory(ScrnInfoPtr pScrn)
       default:
 	 FatalError("Unknown GTT size value: %08x\n", (int)INREG(PGETBL_CTL));
       }
-   } else if (IS_G33CLASS(pI830)) {
+   } else if (IS_G33CLASS(intel)) {
       /* G33's GTT size is detect in GMCH_CTRL */
       switch (gmch_ctrl & G33_PGETBL_SIZE_MASK) {
       case G33_PGETBL_SIZE_1M:
@@ -488,10 +316,10 @@ I830DetectMemory(ScrnInfoPtr pScrn)
       }
    } else {
       /* Older chipsets only had GTT appropriately sized for the aperture. */
-      gtt_size = pI830->FbMapSize / (1024*1024);
+      gtt_size = intel->FbMapSize / (1024*1024);
    }
 
-   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "detected %d kB GTT.\n", gtt_size);
+   xf86DrvMsg(scrn->scrnIndex, X_INFO, "detected %d kB GTT.\n", gtt_size);
 
    /* The stolen memory has the GTT at the top, and the 4KB popup below that.
     * Everything else can be freely used by the graphics driver.
@@ -499,10 +327,10 @@ I830DetectMemory(ScrnInfoPtr pScrn)
    range = gtt_size + 4;
 
    /* new 4 series hardware has seperate GTT stolen with GFX stolen */
-   if (IS_G4X(pI830) || IS_IGD(pI830))
+   if (IS_G4X(intel) || IS_IGD(intel) || IS_IGDNG(intel))
        range = 4;
 
-   if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
+   if (IS_I85X(intel) || IS_I865G(intel) || IS_I9XX(intel)) {
       switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
       case I855_GMCH_GMS_STOLEN_1M:
 	 memsize = MB(1) - KB(range);
@@ -520,35 +348,35 @@ I830DetectMemory(ScrnInfoPtr pScrn)
 	 memsize = MB(32) - KB(range);
 	 break;
       case I915G_GMCH_GMS_STOLEN_48M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	    memsize = MB(48) - KB(range);
 	 break;
       case I915G_GMCH_GMS_STOLEN_64M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	    memsize = MB(64) - KB(range);
 	 break;
       case G33_GMCH_GMS_STOLEN_128M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	     memsize = MB(128) - KB(range);
 	 break;
       case G33_GMCH_GMS_STOLEN_256M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	     memsize = MB(256) - KB(range);
 	 break;
       case INTEL_GMCH_GMS_STOLEN_96M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	     memsize = MB(96) - KB(range);
 	 break;
       case INTEL_GMCH_GMS_STOLEN_160M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	     memsize = MB(160) - KB(range);
 	 break;
       case INTEL_GMCH_GMS_STOLEN_224M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	     memsize = MB(224) - KB(range);
 	 break;
       case INTEL_GMCH_GMS_STOLEN_352M:
-	 if (IS_I9XX(pI830))
+	 if (IS_I9XX(intel))
 	     memsize = MB(352) - KB(range);
 	 break;
       }
@@ -565,7 +393,7 @@ I830DetectMemory(ScrnInfoPtr pScrn)
 	 break;
       case I830_GMCH_GMS_LOCAL:
 	 memsize = 0;
-	 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	 xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		    "Local memory found, but won't be used.\n");
 	 break;
       }
@@ -577,291 +405,196 @@ I830DetectMemory(ScrnInfoPtr pScrn)
 #endif
 
    if (memsize > 0) {
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+      xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		 "detected %d kB stolen memory.\n", memsize / 1024);
    } else {
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "no video memory detected.\n");
+      xf86DrvMsg(scrn->scrnIndex, X_INFO, "no video memory detected.\n");
    }
 
    return memsize;
 }
 
 static Bool
-I830MapMMIO(ScrnInfoPtr pScrn)
+I830MapMMIO(ScrnInfoPtr scrn)
 {
-#if XSERVER_LIBPCIACCESS
    int err;
    struct pci_device *device;
-#else
-   int mmioFlags;
-#endif
-   I830Ptr pI830 = I830PTR(pScrn);
+   intel_screen_private *intel = intel_get_screen_private(scrn);
 
-#if XSERVER_LIBPCIACCESS
-   device = pI830->PciInfo;
+   device = intel->PciInfo;
    err = pci_device_map_range (device,
-			       pI830->MMIOAddr,
-			       I810_REG_SIZE,
+			       intel->MMIOAddr,
+			       intel->MMIOSize,
 			       PCI_DEV_MAP_FLAG_WRITABLE,
-			       (void **) &pI830->MMIOBase);
+			       (void **) &intel->MMIOBase);
    if (err) 
    {
-      xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+      xf86DrvMsg (scrn->scrnIndex, X_ERROR,
 		  "Unable to map mmio range. %s (%d)\n",
 		  strerror (err), err);
       return FALSE;
    }
-#else
-
-#if !defined(__alpha__)
-   mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT;
-#else
-   mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT | VIDMEM_SPARSE;
-#endif
-
-   pI830->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
-				   pI830->PciTag,
-				   pI830->MMIOAddr, I810_REG_SIZE);
-   if (!pI830->MMIOBase)
-      return FALSE;
-#endif
 
    /* Set up the GTT mapping for the various places it has been moved over
     * time.
     */
-   if (IS_I9XX(pI830)) {
+   if (IS_I9XX(intel)) {
       uint32_t gttaddr;
 
-      if (IS_I965G(pI830)) 
+      if (IS_I965G(intel)) 
       {
-	 if (IS_G4X(pI830)) {
-	     gttaddr = pI830->MMIOAddr + MB(2);
-	     pI830->GTTMapSize = MB(2);
+	 if (IS_G4X(intel) || IS_IGDNG(intel)) {
+	     gttaddr = intel->MMIOAddr + MB(2);
+	     intel->GTTMapSize = MB(2);
 	 } else {
-	     gttaddr = pI830->MMIOAddr + KB(512);
-	     pI830->GTTMapSize = KB(512);
+	     gttaddr = intel->MMIOAddr + KB(512);
+	     intel->GTTMapSize = KB(512);
 	 }
       }
       else
       {
-	 gttaddr = I810_MEMBASE(pI830->PciInfo, 3) & 0xFFFFFF00;
-	 pI830->GTTMapSize = pI830->FbMapSize / 1024;
+	 gttaddr = I810_MEMBASE(intel->PciInfo, 3) & 0xFFFFFF00;
+	 intel->GTTMapSize = intel->FbMapSize / 1024;
       }
-#if XSERVER_LIBPCIACCESS
       err = pci_device_map_range (device,
-				  gttaddr, pI830->GTTMapSize,
+				  gttaddr, intel->GTTMapSize,
 				  PCI_DEV_MAP_FLAG_WRITABLE,
-				  (void **) &pI830->GTTBase);
+				  (void **) &intel->GTTBase);
       if (err)
       {
-	 xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+	 xf86DrvMsg (scrn->scrnIndex, X_ERROR,
 		     "Unable to map GTT range. %s (%d)\n",
 		     strerror (err), err);
 	 return FALSE;
       }
-#else
-      pI830->GTTBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
-				     pI830->PciTag,
-				     gttaddr, pI830->GTTMapSize);
-      if (pI830->GTTBase == NULL)
-	 return FALSE;
-#endif
    } else {
       /* The GTT aperture on i830 is write-only.  We could probably map the
        * actual physical pages that back it, but leave it alone for now.
        */
-      pI830->GTTBase = NULL;
-      pI830->GTTMapSize = 0;
+      intel->GTTBase = NULL;
+      intel->GTTMapSize = 0;
    }
 
    return TRUE;
 }
 
 static Bool
-I830MapMem(ScrnInfoPtr pScrn)
+I830MapMem(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+   intel_screen_private *intel = intel_get_screen_private(scrn);
    long i;
-#if XSERVER_LIBPCIACCESS
-   struct pci_device *const device = pI830->PciInfo;
+   struct pci_device *const device = intel->PciInfo;
    int err;
-#endif
-
-   for (i = 2; i < pI830->FbMapSize; i <<= 1) ;
-   pI830->FbMapSize = i;
 
-   if (!I830MapMMIO(pScrn))
-      return FALSE;
+   for (i = 2; i < intel->FbMapSize; i <<= 1) ;
+   intel->FbMapSize = i;
 
-#if XSERVER_LIBPCIACCESS
-   err = pci_device_map_range (device, pI830->LinearAddr, pI830->FbMapSize,
+   err = pci_device_map_range (device, intel->LinearAddr, intel->FbMapSize,
 			       PCI_DEV_MAP_FLAG_WRITABLE | PCI_DEV_MAP_FLAG_WRITE_COMBINE,
-			       (void **) &pI830->FbBase);
+			       (void **) &intel->FbBase);
     if (err)
 	return FALSE;
-#else
-   pI830->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-				 pI830->PciTag,
-				 pI830->LinearAddr, pI830->FbMapSize);
-   if (!pI830->FbBase)
-      return FALSE;
-#endif
-
-   if (pI830->ring.mem != NULL) {
-      pI830->ring.virtual_start = pI830->FbBase + pI830->ring.mem->offset;
-   }
 
    return TRUE;
 }
 
 static void
-I830UnmapMMIO(ScrnInfoPtr pScrn)
+I830UnmapMMIO(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+   intel_screen_private *intel = intel_get_screen_private(scrn);
 
-#if XSERVER_LIBPCIACCESS
-   pci_device_unmap_range (pI830->PciInfo, pI830->MMIOBase, I810_REG_SIZE);
-#else
-   xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pI830->MMIOBase,
-		   I810_REG_SIZE);
-#endif
-   pI830->MMIOBase = NULL;
+   pci_device_unmap_range (intel->PciInfo, intel->MMIOBase, intel->MMIOSize);
+   intel->MMIOBase = NULL;
 
-   if (IS_I9XX(pI830)) {
-#if XSERVER_LIBPCIACCESS
-      pci_device_unmap_range (pI830->PciInfo, pI830->GTTBase, pI830->GTTMapSize);
-#else
-      xf86UnMapVidMem(pScrn->scrnIndex, pI830->GTTBase, pI830->GTTMapSize);
-#endif
-      pI830->GTTBase = NULL;
+   if (IS_I9XX(intel)) {
+      pci_device_unmap_range (intel->PciInfo, intel->GTTBase, intel->GTTMapSize);
+      intel->GTTBase = NULL;
    }
 }
 
 static Bool
-I830UnmapMem(ScrnInfoPtr pScrn)
+I830UnmapMem(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+   intel_screen_private *intel = intel_get_screen_private(scrn);
 
-#if XSERVER_LIBPCIACCESS
-   pci_device_unmap_range (pI830->PciInfo, pI830->FbBase, pI830->FbMapSize);
-#else
-   xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pI830->FbBase,
-		   pI830->FbMapSize);
-#endif
-   pI830->FbBase = NULL;
-   I830UnmapMMIO(pScrn);
+   pci_device_unmap_range (intel->PciInfo, intel->FbBase, intel->FbMapSize);
+   intel->FbBase = NULL;
+   I830UnmapMMIO(scrn);
    return TRUE;
 }
 
 static void
-I830LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices,
 		LOCO * colors, VisualPtr pVisual)
 {
-   xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-   int i,j, index;
-   int p;
-   uint16_t lut_r[256], lut_g[256], lut_b[256];
-
-   DPRINTF(PFX, "I830LoadPalette: numColors: %d\n", numColors);
-
-   for(p = 0; p < xf86_config->num_crtc; p++) {
-      xf86CrtcPtr	   crtc = xf86_config->crtc[p];
-      I830CrtcPrivatePtr   intel_crtc = crtc->driver_private;
-
-      /* Initialize to the old lookup table values. */
-      for (i = 0; i < 256; i++) {
-	 lut_r[i] = intel_crtc->lut_r[i] << 8;
-	 lut_g[i] = intel_crtc->lut_g[i] << 8;
-	 lut_b[i] = intel_crtc->lut_b[i] << 8;
-      }
-
-      switch(pScrn->depth) {
-      case 15:
-	 for (i = 0; i < numColors; i++) {
-	    index = indices[i];
-	    for (j = 0; j < 8; j++) {
-	       lut_r[index * 8 + j] = colors[index].red << 8;
-	       lut_g[index * 8 + j] = colors[index].green << 8;
-	       lut_b[index * 8 + j] = colors[index].blue << 8;
-	    }
-         }
-	 break;
-      case 16:
-	 for (i = 0; i < numColors; i++) {
-	    index = indices[i];
-
-	    if (index <= 31) {
-	       for (j = 0; j < 8; j++) {
-		  lut_r[index * 8 + j] = colors[index].red << 8;
-		  lut_b[index * 8 + j] = colors[index].blue << 8;
-	       }
-	    }
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+	int i, j, index;
+	int p;
+	uint16_t lut_r[256], lut_g[256], lut_b[256];
+
+	DPRINTF(PFX, "I830LoadPalette: numColors: %d\n", numColors);
+
+	for (p = 0; p < xf86_config->num_crtc; p++) {
+		xf86CrtcPtr crtc = xf86_config->crtc[p];
+		I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+
+		/* Initialize to the old lookup table values. */
+		for (i = 0; i < 256; i++) {
+			lut_r[i] = intel_crtc->lut_r[i] << 8;
+			lut_g[i] = intel_crtc->lut_g[i] << 8;
+			lut_b[i] = intel_crtc->lut_b[i] << 8;
+		}
 
-	    for (j = 0; j < 4; j++) {
-	       lut_g[index * 4 + j] = colors[index].green << 8;
-	    }
-         }
-        break;
-      default:
-	 for (i = 0; i < numColors; i++) {
-	    index = indices[i];
-	    lut_r[index] = colors[index].red << 8;
-	    lut_g[index] = colors[index].green << 8;
-	    lut_b[index] = colors[index].blue << 8;
-	 }
-	 break;
-      }
+		switch (scrn->depth) {
+		case 15:
+			for (i = 0; i < numColors; i++) {
+				index = indices[i];
+				for (j = 0; j < 8; j++) {
+					lut_r[index * 8 + j] =
+					    colors[index].red << 8;
+					lut_g[index * 8 + j] =
+					    colors[index].green << 8;
+					lut_b[index * 8 + j] =
+					    colors[index].blue << 8;
+				}
+			}
+			break;
+		case 16:
+			for (i = 0; i < numColors; i++) {
+				index = indices[i];
+
+				if (index <= 31) {
+					for (j = 0; j < 8; j++) {
+						lut_r[index * 8 + j] =
+						    colors[index].red << 8;
+						lut_b[index * 8 + j] =
+						    colors[index].blue << 8;
+					}
+				}
+
+				for (j = 0; j < 4; j++) {
+					lut_g[index * 4 + j] =
+					    colors[index].green << 8;
+				}
+			}
+			break;
+		default:
+			for (i = 0; i < numColors; i++) {
+				index = indices[i];
+				lut_r[index] = colors[index].red << 8;
+				lut_g[index] = colors[index].green << 8;
+				lut_b[index] = colors[index].blue << 8;
+			}
+			break;
+		}
 
-      /* Make the change through RandR */
+		/* Make the change through RandR */
 #ifdef RANDR_12_INTERFACE
-      RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
+		RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
 #else
-      crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256);
+		crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256);
 #endif
-   }
-}
-
-void
-i830_update_front_offset(ScrnInfoPtr pScrn)
-{
-   ScreenPtr pScreen = pScrn->pScreen;
-   I830Ptr pI830 = I830PTR(pScrn);
-   int pitch = pScrn->displayWidth * pI830->cpp;
-   pointer data = NULL;
-
-   /* Update buffer locations, which may have changed as a result of
-    * i830_bind_all_memory().
-    */
-   pScrn->fbOffset = pI830->front_buffer->offset;
-
-   if (pI830->starting || pI830->accel == ACCEL_UXA)
-       return;
-
-   /* If we are still in ScreenInit, there is no screen pixmap to be updated
-    * yet.  We'll fix it up at CreateScreenResources.
-    */
-   if (!pI830->memory_manager) {
-       data = pI830->FbBase + pScrn->fbOffset; /* default to legacy */
-   } else {
-      dri_bo *bo = pI830->front_buffer->bo;
-
-      if (bo) {
-	  if (pI830->kernel_exec_fencing) {
-	      if (drm_intel_gem_bo_map_gtt(bo))
-		  xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s: bo map failed\n",
-			     __FUNCTION__);
-	      data = bo->virtual;
-	  } else {
-	      /* Will already be pinned by bind_all_memory in this case */
-	      drm_intel_gem_bo_start_gtt_access(bo, 1);
-	      data = pI830->FbBase + bo->offset;
-	  }
-      }
-   }
-   if (!pScreen->ModifyPixmapHeader(pScreen->GetScreenPixmap(pScreen),
-				       pScrn->virtualX, pScrn->virtualY, -1, -1,
-				       pitch, data))
-       FatalError("Couldn't adjust screen pixmap\n");
+	}
 }
 
 /**
@@ -870,40 +603,33 @@ i830_update_front_offset(ScrnInfoPtr pSc
  * have already been created, but the first EnterVT happens before
  * CreateScreenResources.
  */
-static Bool
-i830CreateScreenResources(ScreenPtr pScreen)
+static Bool i830CreateScreenResources(ScreenPtr screen)
 {
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   pScreen->CreateScreenResources = pI830->CreateScreenResources;
-   if (!(*pScreen->CreateScreenResources)(pScreen))
-      return FALSE;
+	screen->CreateScreenResources = intel->CreateScreenResources;
+	if (!(*screen->CreateScreenResources) (screen))
+		return FALSE;
 
-   i830_update_front_offset(pScrn);
+	i830_uxa_create_screen_resources(screen);
 
-#ifdef I830_USE_UXA
-   if (pI830->accel == ACCEL_UXA)
-      i830_uxa_create_screen_resources(pScreen);
-#endif
-   return TRUE;
+	return TRUE;
 }
 
-int
-i830_output_clones (ScrnInfoPtr pScrn, int type_mask)
+static int i830_output_clones (ScrnInfoPtr scrn, int type_mask)
 {
-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR (pScrn);
-    int			o;
-    int			index_mask = 0;
-
-    for (o = 0; o < config->num_output; o++)
-    {
-	xf86OutputPtr		output = config->output[o];
-	I830OutputPrivatePtr	intel_output = output->driver_private;
-	if (type_mask & (1 << intel_output->type))
-	    index_mask |= (1 << o);
-    }
-    return index_mask;
+	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR (scrn);
+	int			o;
+	int			index_mask = 0;
+
+	for (o = 0; o < config->num_output; o++) {
+		xf86OutputPtr		output = config->output[o];
+		I830OutputPrivatePtr	intel_output = output->driver_private;
+		if (type_mask & (1 << intel_output->type))
+			index_mask |= (1 << o);
+	}
+	return index_mask;
 }
 
 /**
@@ -912,282 +638,291 @@ i830_output_clones (ScrnInfoPtr pScrn, i
  * Some outputs may not initialize, due to allocation failure or because a
  * controller chip isn't found.
  */
-static void
-I830SetupOutputs(ScrnInfoPtr pScrn)
+static void I830SetupOutputs(ScrnInfoPtr scrn)
 {
-   xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR (pScrn);
-   I830Ptr  pI830 = I830PTR(pScrn);
-   int	    o, c;
-   Bool	    lvds_detected = FALSE;
-
-   /* everyone has at least a single analog output */
-   i830_crt_init(pScrn);
-
-   /* Set up integrated LVDS */
-   if (IS_MOBILE(pI830) && !IS_I830(pI830))
-      i830_lvds_init(pScrn);
-
-   if (IS_I9XX(pI830)) {
-      Bool found = FALSE;
-      if ((INREG(SDVOB) & SDVO_DETECTED)) {
-	 found = i830_sdvo_init(pScrn, SDVOB);
+	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR (scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int	    o, c;
+	Bool	    lvds_detected = FALSE;
+
+	/* everyone has at least a single analog output */
+	i830_crt_init(scrn);
+
+	/* Set up integrated LVDS */
+	if (IS_MOBILE(intel) && !IS_I830(intel))
+	i830_lvds_init(scrn);
+
+	if (IS_IGDNG(intel)) {
+		int found;
+
+		if (INREG(HDMIB) & PORT_DETECTED) {
+			/* check SDVOB */
+			/* found = intel_sdvo_init(dev, HDMIB); */
+			found = 0;
+			if (!found)
+				i830_hdmi_init(scrn, HDMIB);
+		}
 
-	 if (!found && SUPPORTS_INTEGRATED_HDMI(pI830))
-	    i830_hdmi_init(pScrn, SDVOB);
-      }
+		if (INREG(HDMIC) & PORT_DETECTED)
+			i830_hdmi_init(scrn, HDMIC);
 
-      if ((INREG(SDVOB) & SDVO_DETECTED))
-	 found = i830_sdvo_init(pScrn, SDVOC);
+		if (INREG(HDMID) & PORT_DETECTED)
+			i830_hdmi_init(scrn, HDMID);
 
-      if ((INREG(SDVOC) & SDVO_DETECTED) &&
-	    !found && SUPPORTS_INTEGRATED_HDMI(pI830))
-	 i830_hdmi_init(pScrn, SDVOC);
+		/* Disable DP by force */
+		OUTREG(PCH_DP_B, INREG(PCH_DP_B) & ~PORT_ENABLE);
+		OUTREG(PCH_DP_C, INREG(PCH_DP_C) & ~PORT_ENABLE);
+		OUTREG(PCH_DP_D, INREG(PCH_DP_D) & ~PORT_ENABLE);
+
+	} else if (IS_I9XX(intel)) {
+		Bool found = FALSE;
+		if ((INREG(SDVOB) & SDVO_DETECTED)) {
+			found = i830_sdvo_init(scrn, SDVOB);
 
-   } else {
-      i830_dvo_init(pScrn);
-   }
-   if (IS_I9XX(pI830) && IS_MOBILE(pI830))
-      i830_tv_init(pScrn);
+			if (!found && SUPPORTS_INTEGRATED_HDMI(intel))
+			i830_hdmi_init(scrn, SDVOB);
+		}
+
+		if ((INREG(SDVOB) & SDVO_DETECTED))
+			found = i830_sdvo_init(scrn, SDVOC);
+
+		if ((INREG(SDVOC) & SDVO_DETECTED) &&
+		    !found && SUPPORTS_INTEGRATED_HDMI(intel))
+			i830_hdmi_init(scrn, SDVOC);
+
+	} else {
+		i830_dvo_init(scrn);
+	}
+	if (IS_I9XX(intel) && IS_MOBILE(intel) && !IS_IGDNG(intel))
+		i830_tv_init(scrn);
    
-   for (o = 0; o < config->num_output; o++)
-   {
-      xf86OutputPtr	   output = config->output[o];
-      I830OutputPrivatePtr intel_output = output->driver_private;
-      int		   crtc_mask;
+	for (o = 0; o < config->num_output; o++) {
+		xf86OutputPtr	   output = config->output[o];
+		I830OutputPrivatePtr intel_output = output->driver_private;
+		int		   crtc_mask;
 
-      if (intel_output->type == I830_OUTPUT_LVDS)
-	  lvds_detected = TRUE;
+		if (intel_output->type == I830_OUTPUT_LVDS)
+			lvds_detected = TRUE;
       
-      crtc_mask = 0;
-      for (c = 0; c < config->num_crtc; c++)
-      {
-	 xf86CrtcPtr	      crtc = config->crtc[c];
-	 I830CrtcPrivatePtr   intel_crtc = crtc->driver_private;
+		crtc_mask = 0;
+		for (c = 0; c < config->num_crtc; c++) {
+			xf86CrtcPtr	      crtc = config->crtc[c];
+			I830CrtcPrivatePtr   intel_crtc = crtc->driver_private;
 
-	 if (intel_output->pipe_mask & (1 << intel_crtc->pipe))
-	    crtc_mask |= (1 << c);
-      }
-      output->possible_crtcs = crtc_mask;
-      output->possible_clones = i830_output_clones (pScrn, intel_output->clone_mask);
-   }
+			if (intel_output->pipe_mask & (1 << intel_crtc->pipe))
+				crtc_mask |= (1 << c);
+		}
+		output->possible_crtcs = crtc_mask;
+		output->possible_clones =
+		    i830_output_clones(scrn, intel_output->clone_mask);
+	}
 }
 
-static void
-i830_init_clock_gating(ScrnInfoPtr pScrn)
+static void i830_init_clock_gating(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     /* Disable clock gating reported to work incorrectly according to the specs.
      */
-    if (IS_G4X(pI830)) {
-	uint32_t dspclk_gate;
-	OUTREG(RENCLK_GATE_D1, 0);
-	OUTREG(RENCLK_GATE_D2, VF_UNIT_CLOCK_GATE_DISABLE |
-		GS_UNIT_CLOCK_GATE_DISABLE |
-		CL_UNIT_CLOCK_GATE_DISABLE);
-	OUTREG(RAMCLK_GATE_D, 0);
-	dspclk_gate = VRHUNIT_CLOCK_GATE_DISABLE |
-	    OVRUNIT_CLOCK_GATE_DISABLE |
-	    OVCUNIT_CLOCK_GATE_DISABLE;
-	if (IS_GM45(pI830))
-	    dspclk_gate |= DSSUNIT_CLOCK_GATE_DISABLE;
-	OUTREG(DSPCLK_GATE_D, dspclk_gate);
-    } else if (IS_I965GM(pI830)) {
-	OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
-	OUTREG(RENCLK_GATE_D2, 0);
-	OUTREG(DSPCLK_GATE_D, 0);
-	OUTREG(RAMCLK_GATE_D, 0);
-	OUTREG16(DEUC, 0);
-    } else if (IS_I965G(pI830)) {
-	OUTREG(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
-	       I965_RCC_CLOCK_GATE_DISABLE |
-	       I965_RCPB_CLOCK_GATE_DISABLE |
-	       I965_ISC_CLOCK_GATE_DISABLE |
-	       I965_FBC_CLOCK_GATE_DISABLE);
-	OUTREG(RENCLK_GATE_D2, 0);
-    } else if (IS_I855(pI830) || IS_I865G(pI830)) {
-	OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
-    } else if (IS_I830(pI830)) {
-	OUTREG(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
-    }
+	if (IS_G4X(intel)) {
+		uint32_t dspclk_gate;
+		OUTREG(RENCLK_GATE_D1, 0);
+		OUTREG(RENCLK_GATE_D2, VF_UNIT_CLOCK_GATE_DISABLE |
+		    GS_UNIT_CLOCK_GATE_DISABLE | CL_UNIT_CLOCK_GATE_DISABLE);
+		OUTREG(RAMCLK_GATE_D, 0);
+		dspclk_gate = VRHUNIT_CLOCK_GATE_DISABLE |
+		    OVRUNIT_CLOCK_GATE_DISABLE | OVCUNIT_CLOCK_GATE_DISABLE;
+		if (IS_GM45(intel))
+			dspclk_gate |= DSSUNIT_CLOCK_GATE_DISABLE;
+		OUTREG(DSPCLK_GATE_D, dspclk_gate);
+	} else if (IS_I965GM(intel)) {
+		OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
+		OUTREG(RENCLK_GATE_D2, 0);
+		OUTREG(DSPCLK_GATE_D, 0);
+		OUTREG(RAMCLK_GATE_D, 0);
+		OUTREG16(DEUC, 0);
+	} else if (IS_I965G(intel)) {
+		OUTREG(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
+		    I965_RCC_CLOCK_GATE_DISABLE | I965_RCPB_CLOCK_GATE_DISABLE |
+		    I965_ISC_CLOCK_GATE_DISABLE | I965_FBC_CLOCK_GATE_DISABLE);
+		OUTREG(RENCLK_GATE_D2, 0);
+	} else if (IS_I855(intel) || IS_I865G(intel)) {
+		OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
+	} else if (IS_I830(intel)) {
+		OUTREG(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
+	}
 }
 
-static void
-i830_init_bios_control(ScrnInfoPtr pScrn)
+static void i830_init_bios_control(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   /* Set "extended desktop" */
-   OUTREG(SWF0, INREG(SWF0) | (1 << 21));
+	/* Set "extended desktop" */
+	OUTREG(SWF0, INREG(SWF0) | (1 << 21));
 
-   /* Set "driver loaded",  "OS unknown", "APM 1.2" */
-   OUTREG(SWF4, (INREG(SWF4) & ~((3 << 19) | (7 << 16))) |
-		(1 << 23) | (2 << 16));
+	/* Set "driver loaded",  "OS unknown", "APM 1.2" */
+	OUTREG(SWF4, (INREG(SWF4) & ~((3 << 19) | (7 << 16))) |
+	    (1 << 23) | (2 << 16));
 }
 
 static int
-I830LVDSPresent(ScrnInfoPtr pScrn)
+I830LVDSPresent(ScrnInfoPtr scrn)
 {
-   xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn);
-   int o, lvds_detected = FALSE;
+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (scrn);
+	int o, lvds_detected = FALSE;
 
-   for (o = 0; o < config->num_output; o++) {
-      xf86OutputPtr	   output = config->output[o];
-      I830OutputPrivatePtr intel_output = output->driver_private;
+	for (o = 0; o < config->num_output; o++) {
+		xf86OutputPtr	   output = config->output[o];
+		I830OutputPrivatePtr intel_output = output->driver_private;
 
-      if (intel_output->type == I830_OUTPUT_LVDS)
-	  lvds_detected = TRUE;
-   }
+		if (intel_output->type == I830_OUTPUT_LVDS)
+			lvds_detected = TRUE;
+	}
 
-   return lvds_detected;
+	return lvds_detected;
 }
+
 /**
  * Setup the CRTCs
  */
 
-
 static void 
-I830PreInitDDC(ScrnInfoPtr pScrn)
+I830PreInitDDC(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   if (!xf86LoadSubModule(pScrn, "ddc")) {
-      pI830->ddc2 = FALSE;
-   } else {
-      xf86LoaderReqSymLists(I810ddcSymbols, NULL);
-      pI830->ddc2 = TRUE;
-   }
+	if (!xf86LoadSubModule(scrn, "ddc")) {
+		intel->ddc2 = FALSE;
+	} else {
+		intel->ddc2 = TRUE;
+	}
 
-   /* DDC can use I2C bus */
-   /* Load I2C if we have the code to use it */
-   if (pI830->ddc2) {
-      if (xf86LoadSubModule(pScrn, "i2c")) {
-	 xf86LoaderReqSymLists(I810i2cSymbols, NULL);
-
-	 pI830->ddc2 = TRUE;
-      } else {
-	 pI830->ddc2 = FALSE;
-      }
-   }
+	/* DDC can use I2C bus */
+	/* Load I2C if we have the code to use it */
+	if (intel->ddc2) {
+		if (xf86LoadSubModule(scrn, "i2c")) {
+			intel->ddc2 = TRUE;
+		} else {
+			intel->ddc2 = FALSE;
+		}
+	}
 }
 
-static void
-PreInitCleanup(ScrnInfoPtr pScrn)
+static void PreInitCleanup(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   if (pI830->MMIOBase)
-      I830UnmapMMIO(pScrn);
-   I830FreeRec(pScrn);
+	if (intel->MMIOBase)
+		I830UnmapMMIO(scrn);
+	I830FreeRec(scrn);
 }
 
 /*
  * Adjust *width to allow for tiling if possible
  */
-Bool
-i830_tiled_width(I830Ptr i830, int *width, int cpp)
+Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp)
 {
-    Bool    tiled = FALSE;
+	Bool tiled = FALSE;
 
-    /*
-     * Adjust the display width to allow for front buffer tiling if possible
-     */
-    if (i830->tiling) {
-	if (IS_I965G(i830)) {
-	    int tile_pixels = 512 / cpp;
-	    *width = (*width + tile_pixels - 1) &
-		~(tile_pixels - 1);
-	    tiled = TRUE;
-	} else {
-	    /* Good pitches to allow tiling.  Don't care about pitches < 1024
-	     * pixels.
-	     */
-	    static const int pitches[] = {
-		1024,
-		2048,
-		4096,
-		8192,
-		0
-	    };
-	    int i;
-
-	    for (i = 0; pitches[i] != 0; i++) {
-		if (pitches[i] >= *width) {
-		    *width = pitches[i];
-		    tiled = TRUE;
-		    break;
+	/*
+	 * Adjust the display width to allow for front buffer tiling if possible
+	 */
+	if (intel->tiling) {
+		if (IS_I965G(intel)) {
+			int tile_pixels = 512 / cpp;
+			*width = (*width + tile_pixels - 1) &
+			    ~(tile_pixels - 1);
+			tiled = TRUE;
+		} else {
+			/* Good pitches to allow tiling.  Don't care about pitches < 1024
+			 * pixels.
+			 */
+			static const int pitches[] = {
+				1024,
+				2048,
+				4096,
+				8192,
+				0
+			};
+			int pitch;
+			int i;
+
+			pitch = *width * cpp;
+			for (i = 0; pitches[i] != 0; i++) {
+				if (pitches[i] >= pitch) {
+					*width = pitches[i] / cpp;
+					tiled = TRUE;
+					break;
+				}
+			}
 		}
-	    }
 	}
-    }
-    return tiled;
-}
-
-/*
- * Pad to accelerator requirement
- */
-int
-i830_pad_drawable_width(int width, int cpp)
-{
-    return (width + 63) & ~63;
+	return tiled;
 }
 
-static Bool
-i830_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 {
 #ifdef DRI2
-    I830Ptr	i830 = I830PTR(scrn);
-    int		old_width = scrn->displayWidth;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int old_width = scrn->displayWidth;
 #endif
-    int		old_x = scrn->virtualX;
-    int		old_y = scrn->virtualY;
+	int old_x = scrn->virtualX;
+	int old_y = scrn->virtualY;
 
-    if (old_x == width && old_y == height)
-	return TRUE;
+	if (old_x == width && old_y == height)
+		return TRUE;
 
-    scrn->virtualX = width;
-    scrn->virtualY = height;
+	scrn->virtualX = width;
+	scrn->virtualY = height;
 #ifdef DRI2
-    if (i830->can_resize && i830->front_buffer)
-    {
-	i830_memory *new_front, *old_front;
-	Bool	    tiled;
-	ScreenPtr   screen = screenInfo.screens[scrn->scrnIndex];
-
-	scrn->displayWidth = i830_pad_drawable_width(width, i830->cpp);
-	tiled = i830_tiled_width(i830, &scrn->displayWidth, i830->cpp);
-	xf86DrvMsg(scrn->scrnIndex, X_INFO, "Allocate new frame buffer %dx%d stride %d\n",
-		   width, height, scrn->displayWidth);
-	I830Sync(scrn);
-	i830WaitForVblank(scrn);
-	new_front = i830_allocate_framebuffer(scrn);
-	if (!new_front) {
-	    scrn->virtualX = old_x;
-	    scrn->virtualY = old_y;
-	    scrn->displayWidth = old_width;
-	    return FALSE;
-	}
-	old_front = i830->front_buffer;
-	i830->front_buffer = new_front;
-	i830_set_pixmap_bo(screen->GetScreenPixmap(screen),
-			   new_front->bo);
-	scrn->fbOffset = i830->front_buffer->offset;
-	screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
-				   width, height, -1, -1, scrn->displayWidth * i830->cpp,
-				   NULL);
-	xf86DrvMsg(scrn->scrnIndex, X_INFO, "New front buffer at 0x%lx\n",
-		   i830->front_buffer->offset);
-	i830_set_new_crtc_bo(scrn);
-	I830Sync(scrn);
-	i830WaitForVblank(scrn);
-	i830_free_memory(scrn, old_front);
-    }
+	if (intel->front_buffer) {
+		i830_memory *new_front, *old_front;
+		Bool tiled;
+		ScreenPtr screen = screenInfo.screens[scrn->scrnIndex];
+
+		scrn->displayWidth = i830_pad_drawable_width(width);
+		tiled = i830_tiled_width(intel, &scrn->displayWidth, intel->cpp);
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "Allocate new frame buffer %dx%d stride %d\n", width,
+			   height, scrn->displayWidth);
+		intel_sync(scrn);
+		i830WaitForVblank(scrn);
+		new_front = i830_allocate_framebuffer(scrn);
+		if (!new_front) {
+			scrn->virtualX = old_x;
+			scrn->virtualY = old_y;
+			scrn->displayWidth = old_width;
+			return FALSE;
+		}
+		old_front = intel->front_buffer;
+		intel->front_buffer = new_front;
+		i830_set_pixmap_bo(screen->GetScreenPixmap(screen),
+				   new_front->bo);
+		scrn->fbOffset = intel->front_buffer->offset;
+
+		screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
+					   width, height, -1, -1,
+					   scrn->displayWidth * intel->cpp,
+					   intel->FbBase + scrn->fbOffset);
+
+		/* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
+		 * so update the value it uses
+		 */
+		scrn->pixmapPrivate.ptr = intel->FbBase + scrn->fbOffset;
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "New front buffer at 0x%lx\n",
+			   intel->front_buffer->offset);
+		i830_set_new_crtc_bo(scrn);
+		intel_sync(scrn);
+		i830WaitForVblank(scrn);
+		i830_free_memory(scrn, old_front);
+	}
 #endif
-    return TRUE;
+	return TRUE;
 }
 
 static const xf86CrtcConfigFuncsRec i830_xf86crtc_config_funcs = {
-    i830_xf86crtc_resize
+	i830_xf86crtc_resize
 };
 
 #define HOTKEY_BIOS_SWITCH	0
@@ -1202,1393 +937,1192 @@ static const xf86CrtcConfigFuncsRec i830
  * will just update the state to represent what it would have been switched to.
  */
 static void
-i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode)
+i830SetHotkeyControl(ScrnInfoPtr scrn, int mode)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+   intel_screen_private *intel = intel_get_screen_private(scrn);
    uint8_t gr18;
 
    /* Don't mess with kernel settings... */
-   if (pI830->use_drm_mode)
+   if (intel->use_drm_mode)
        return;
 
-   gr18 = pI830->readControl(pI830, GRX, 0x18);
+   gr18 = intel->readControl(intel, GRX, 0x18);
    if (mode == HOTKEY_BIOS_SWITCH)
       gr18 &= ~HOTKEY_VBIOS_SWITCH_BLOCK;
    else
       gr18 |= HOTKEY_VBIOS_SWITCH_BLOCK;
-   pI830->writeControl(pI830, GRX, 0x18, gr18);
+   intel->writeControl(intel, GRX, 0x18, gr18);
 }
 
-#ifdef XF86DRM_MODE
 /*
  * DRM mode setting Linux only at this point... later on we could
  * add a wrapper here.
  */
-static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
+static Bool i830_kernel_mode_enabled(ScrnInfoPtr scrn)
 {
-#if XSERVER_LIBPCIACCESS
-    struct pci_device *PciInfo;
-#else
-    pciVideoPtr PciInfo;
-#endif
-    EntityInfoPtr pEnt;
-    char *busIdString;
-    int ret;
+	struct pci_device *PciInfo;
+	EntityInfoPtr pEnt;
+	char *busIdString;
+	int ret;
 
-    pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
-    PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+	pEnt = xf86GetEntityInfo(scrn->entityList[0]);
+	PciInfo = xf86GetPciInfoForEntity(pEnt->index);
 
-    if (!xf86LoaderCheckSymbol("DRICreatePCIBusID"))
-	return FALSE;
+	if (!xf86LoaderCheckSymbol("DRICreatePCIBusID"))
+		return FALSE;
 
-    busIdString = DRICreatePCIBusID(PciInfo);
+	busIdString = DRICreatePCIBusID(PciInfo);
 
-    ret = drmCheckModesettingSupported(busIdString);
-    xfree(busIdString);
-    if (ret)
-	return FALSE;
+	ret = drmCheckModesettingSupported(busIdString);
+	if (ret) {
+		if (xf86LoadKernelModule("i915"))
+			ret = drmCheckModesettingSupported(busIdString);
+	}
+	/* Be nice to the user and load fbcon too */
+	if (!ret)
+		(void)xf86LoadKernelModule("fbcon");
+	free(busIdString);
+	if (ret)
+		return FALSE;
 
-    return TRUE;
+	return TRUE;
 }
-#else
-#define i830_kernel_mode_enabled(x) FALSE
-#endif
 
-static Bool
-i830_detect_chipset(ScrnInfoPtr pScrn)
+static Bool i830_detect_chipset(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    MessageType from = X_PROBED;
-    const char *chipname;
-    uint32_t capid;
-    int fb_bar, mmio_bar;
-
-
-    /* We have to use PIO to probe, because we haven't mapped yet. */
-    if (!pI830->use_drm_mode)
-	I830SetPIOAccess(pI830);
-
-    switch (DEVICE_ID(pI830->PciInfo)) {
-    case PCI_CHIP_I830_M:
-	chipname = "830M";
-	break;
-    case PCI_CHIP_845_G:
-	chipname = "845G";
-	break;
-    case PCI_CHIP_I855_GM:
-	/* Check capid register to find the chipset variant */
-#if XSERVER_LIBPCIACCESS
-	pci_device_cfg_read_u32 (pI830->PciInfo, &capid, I85X_CAPID);
-#else
-	capid = pciReadLong (pI830->PciTag, I85X_CAPID);
-#endif
-	pI830->variant = (capid >> I85X_VARIANT_SHIFT) & I85X_VARIANT_MASK;
-	switch (pI830->variant) {
-	case I855_GM:
-	    chipname = "855GM";
-	    break;
-	case I855_GME:
-	    chipname = "855GME";
-	    break;
-	case I852_GM:
-	    chipname = "852GM";
-	    break;
-	case I852_GME:
-	    chipname = "852GME";
-	    break;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	MessageType from = X_PROBED;
+	const char *chipname;
+	uint32_t capid;
+	int fb_bar, mmio_bar;
+
+	/* We have to use PIO to probe, because we haven't mapped yet. */
+	if (!intel->use_drm_mode)
+		I830SetPIOAccess(intel);
+
+	switch (DEVICE_ID(intel->PciInfo)) {
+	case PCI_CHIP_I830_M:
+		chipname = "830M";
+		break;
+	case PCI_CHIP_845_G:
+		chipname = "845G";
+		break;
+	case PCI_CHIP_I855_GM:
+		/* Check capid register to find the chipset variant */
+		pci_device_cfg_read_u32(intel->PciInfo, &capid, I85X_CAPID);
+		intel->variant =
+		    (capid >> I85X_VARIANT_SHIFT) & I85X_VARIANT_MASK;
+		switch (intel->variant) {
+		case I855_GM:
+			chipname = "855GM";
+			break;
+		case I855_GME:
+			chipname = "855GME";
+			break;
+		case I852_GM:
+			chipname = "852GM";
+			break;
+		case I852_GME:
+			chipname = "852GME";
+			break;
+		default:
+			xf86DrvMsg(scrn->scrnIndex, X_INFO,
+				   "Unknown 852GM/855GM variant: 0x%x)\n",
+				   intel->variant);
+			chipname = "852GM/855GM (unknown variant)";
+			break;
+		}
+		break;
+	case PCI_CHIP_I865_G:
+		chipname = "865G";
+		break;
+	case PCI_CHIP_I915_G:
+		chipname = "915G";
+		break;
+	case PCI_CHIP_E7221_G:
+		chipname = "E7221 (i915)";
+		break;
+	case PCI_CHIP_I915_GM:
+		chipname = "915GM";
+		break;
+	case PCI_CHIP_I945_G:
+		chipname = "945G";
+		break;
+	case PCI_CHIP_I945_GM:
+		chipname = "945GM";
+		break;
+	case PCI_CHIP_I945_GME:
+		chipname = "945GME";
+		break;
+	case PCI_CHIP_IGD_GM:
+		chipname = "Pineview GM";
+		break;
+	case PCI_CHIP_IGD_G:
+		chipname = "Pineview G";
+		break;
+	case PCI_CHIP_I965_G:
+		chipname = "965G";
+		break;
+	case PCI_CHIP_G35_G:
+		chipname = "G35";
+		break;
+	case PCI_CHIP_I965_Q:
+		chipname = "965Q";
+		break;
+	case PCI_CHIP_I946_GZ:
+		chipname = "946GZ";
+		break;
+	case PCI_CHIP_I965_GM:
+		chipname = "965GM";
+		break;
+	case PCI_CHIP_I965_GME:
+		chipname = "965GME/GLE";
+		break;
+	case PCI_CHIP_G33_G:
+		chipname = "G33";
+		break;
+	case PCI_CHIP_Q35_G:
+		chipname = "Q35";
+		break;
+	case PCI_CHIP_Q33_G:
+		chipname = "Q33";
+		break;
+	case PCI_CHIP_GM45_GM:
+		chipname = "GM45";
+		break;
+	case PCI_CHIP_IGD_E_G:
+		chipname = "4 Series";
+		break;
+	case PCI_CHIP_G45_G:
+		chipname = "G45/G43";
+		break;
+	case PCI_CHIP_Q45_G:
+		chipname = "Q45/Q43";
+		break;
+	case PCI_CHIP_G41_G:
+		chipname = "G41";
+		break;
+	case PCI_CHIP_B43_G:
+		chipname = "B43";
+		break;
+	case PCI_CHIP_IGDNG_D_G:
+		chipname = "Clarkdale";
+		break;
+	case PCI_CHIP_IGDNG_M_G:
+		chipname = "Arrandale";
+		break;
 	default:
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		       "Unknown 852GM/855GM variant: 0x%x)\n", pI830->variant);
-	    chipname = "852GM/855GM (unknown variant)";
-	    break;
-	}
-	break;
-    case PCI_CHIP_I865_G:
-	chipname = "865G";
-	break;
-    case PCI_CHIP_I915_G:
-	chipname = "915G";
-	break;
-    case PCI_CHIP_E7221_G:
-	chipname = "E7221 (i915)";
-	break;
-    case PCI_CHIP_I915_GM:
-	chipname = "915GM";
-	break;
-    case PCI_CHIP_I945_G:
-	chipname = "945G";
-	break;
-    case PCI_CHIP_I945_GM:
-	chipname = "945GM";
-	break;
-    case PCI_CHIP_I945_GME:
-	chipname = "945GME";
-	break;
-    case PCI_CHIP_IGD_GM:
-	chipname = "IGD";
-	break;
-    case PCI_CHIP_IGD_G:
-	chipname = "IGD";
-	break;
-    case PCI_CHIP_I965_G:
-	chipname = "965G";
-	break;
-    case PCI_CHIP_G35_G:
-	chipname = "G35";
-	break;
-    case PCI_CHIP_I965_Q:
-	chipname = "965Q";
-	break;
-    case PCI_CHIP_I946_GZ:
-	chipname = "946GZ";
-	break;
-    case PCI_CHIP_I965_GM:
-	chipname = "965GM";
-	break;
-    case PCI_CHIP_I965_GME:
-	chipname = "965GME/GLE";
-	break;
-    case PCI_CHIP_G33_G:
-	chipname = "G33";
-	break;
-    case PCI_CHIP_Q35_G:
-	chipname = "Q35";
-	break;
-    case PCI_CHIP_Q33_G:
-	chipname = "Q33";
-	break;
-    case PCI_CHIP_GM45_GM:
-	chipname = "Mobile Intel® GM45 Express Chipset";
-	break;
-    case PCI_CHIP_IGD_E_G:
-	chipname = "Intel Integrated Graphics Device";
-	break;
-    case PCI_CHIP_G45_G:
-	chipname = "G45/G43";
-	break;
-    case PCI_CHIP_Q45_G:
-	chipname = "Q45/Q43";
-	break;
-    case PCI_CHIP_G41_G:
-	chipname = "G41";
-	break;
-   default:
-	chipname = "unknown chipset";
-	break;
-    }
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "Integrated Graphics Chipset: Intel(R) %s\n", chipname);
-
-    /* Set the Chipset and ChipRev, allowing config file entries to override. */
-    if (pI830->pEnt->device->chipset && *pI830->pEnt->device->chipset) {
-	pScrn->chipset = pI830->pEnt->device->chipset;
-	from = X_CONFIG;
-    } else if (pI830->pEnt->device->chipID >= 0) {
-	pScrn->chipset = (char *)xf86TokenToString(I830Chipsets,
-						   pI830->pEnt->device->chipID);
-	from = X_CONFIG;
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipID override: 0x%04X\n",
-		   pI830->pEnt->device->chipID);
-	DEVICE_ID(pI830->PciInfo) = pI830->pEnt->device->chipID;
-    } else {
-	from = X_PROBED;
-	pScrn->chipset = (char *)xf86TokenToString(I830Chipsets,
-						   DEVICE_ID(pI830->PciInfo));
-    }
-
-    if (pI830->pEnt->device->chipRev >= 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
-		   pI830->pEnt->device->chipRev);
-    }
-
-    xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n",
-	       (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown i8xx");
-
-    /* Check if the HW cursor needs physical address. */
-    if (IS_MOBILE(pI830) || IS_I9XX(pI830))
-	pI830->CursorNeedsPhysical = TRUE;
-    else
-	pI830->CursorNeedsPhysical = FALSE;
+		chipname = "unknown chipset";
+		break;
+	}
 
-    if (IS_I965G(pI830) || IS_G33CLASS(pI830))
-	pI830->CursorNeedsPhysical = FALSE;
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
+		   "Integrated Graphics Chipset: Intel(R) %s\n", chipname);
 
-    /* Skip the rest if the kernel is taking care of things */
-    if (pI830->use_drm_mode)
-	return TRUE;
+	/* Set the Chipset and ChipRev, allowing config file entries to override. */
+	if (intel->pEnt->device->chipset && *intel->pEnt->device->chipset) {
+		scrn->chipset = intel->pEnt->device->chipset;
+		from = X_CONFIG;
+	} else if (intel->pEnt->device->chipID >= 0) {
+		scrn->chipset = (char *)xf86TokenToString(I830Chipsets,
+							   intel->pEnt->device->
+							   chipID);
+		from = X_CONFIG;
+		xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
+			   "ChipID override: 0x%04X\n",
+			   intel->pEnt->device->chipID);
+		DEVICE_ID(intel->PciInfo) = intel->pEnt->device->chipID;
+	} else {
+		from = X_PROBED;
+		scrn->chipset = (char *)xf86TokenToString(I830Chipsets,
+							   DEVICE_ID(intel->
+								     PciInfo));
+	}
 
-    /* Now that we know the chipset, figure out the resource base addrs */
-    if (IS_I9XX(pI830)) {
-	fb_bar = 2;
-	mmio_bar = 0;
-    } else {
-	fb_bar = 0;
-	mmio_bar = 1;
-    }
-
-    if (pI830->pEnt->device->MemBase != 0) {
-	pI830->LinearAddr = pI830->pEnt->device->MemBase;
-	from = X_CONFIG;
-    } else {
-	pI830->LinearAddr = I810_MEMBASE (pI830->PciInfo, fb_bar);
-	if (pI830->LinearAddr == 0) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "No valid FB address in PCI config space\n");
-	    PreInitCleanup(pScrn);
-	    return FALSE;
-	}
-    }
-
-    xf86DrvMsg(pScrn->scrnIndex, from, "Linear framebuffer at 0x%lX\n",
-	       (unsigned long)pI830->LinearAddr);
-
-    if (pI830->pEnt->device->IOBase != 0) {
-	pI830->MMIOAddr = pI830->pEnt->device->IOBase;
-	from = X_CONFIG;
-    } else {
-	pI830->MMIOAddr = I810_MEMBASE (pI830->PciInfo, mmio_bar);
-	if (pI830->MMIOAddr == 0) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "No valid MMIO address in PCI config space\n");
-	    PreInitCleanup(pScrn);
-	    return FALSE;
-	}
-    }
-
-    xf86DrvMsg(pScrn->scrnIndex, from, "IO registers at addr 0x%lX\n",
-	       (unsigned long)pI830->MMIOAddr);
-
-    /* Now figure out mapsize on 8xx chips */
-    if (IS_I830(pI830) || IS_845G(pI830)) {
-#if XSERVER_LIBPCIACCESS
-	uint16_t		gmch_ctrl;
-	struct pci_device *bridge;
+	if (intel->pEnt->device->chipRev >= 0) {
+		xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
+			   intel->pEnt->device->chipRev);
+	}
 
-	bridge = intel_host_bridge ();
-	pci_device_cfg_read_u16 (bridge, &gmch_ctrl, I830_GMCH_CTRL);
-#else
-	PCITAG bridge;
-	uint16_t gmch_ctrl;
+	xf86DrvMsg(scrn->scrnIndex, from, "Chipset: \"%s\"\n",
+		   (scrn->chipset != NULL) ? scrn->chipset : "Unknown i8xx");
+	/* Check if the HW cursor needs physical address. */
+	if (IS_MOBILE(intel) || IS_I9XX(intel))
+		intel->CursorNeedsPhysical = TRUE;
+	else
+		intel->CursorNeedsPhysical = FALSE;
 
-	bridge = pciTag(0, 0, 0);		/* This is always the host bridge */
-	gmch_ctrl = pciReadWord(bridge, I830_GMCH_CTRL);
-#endif
-	if ((gmch_ctrl & I830_GMCH_MEM_MASK) == I830_GMCH_MEM_128M) {
-	    pI830->FbMapSize = 0x8000000;
+	if (IS_I965G(intel) || IS_G33CLASS(intel))
+		intel->CursorNeedsPhysical = FALSE;
+
+	/* Skip the rest if the kernel is taking care of things */
+	if (intel->use_drm_mode)
+		return TRUE;
+
+	/* Now that we know the chipset, figure out the resource base addrs */
+	if (IS_I9XX(intel)) {
+		fb_bar = 2;
+		mmio_bar = 0;
 	} else {
-	    pI830->FbMapSize = 0x4000000; /* 64MB - has this been tested ?? */
+		fb_bar = 0;
+		mmio_bar = 1;
 	}
-    } else {
-	if (IS_I9XX(pI830)) {
-#if XSERVER_LIBPCIACCESS
-	    pI830->FbMapSize = pI830->PciInfo->regions[fb_bar].size;
-#else
-	    pI830->FbMapSize = 1UL << pciGetBaseSize(pI830->PciTag, 2, TRUE,
-						     NULL);
-#endif
+
+	if (intel->pEnt->device->MemBase != 0) {
+		intel->LinearAddr = intel->pEnt->device->MemBase;
+		from = X_CONFIG;
+	} else {
+		intel->LinearAddr = I810_MEMBASE (intel->PciInfo, fb_bar);
+		if (intel->LinearAddr == 0) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			    "No valid FB address in PCI config space\n");
+			PreInitCleanup(scrn);
+			return FALSE;
+		}
+	}
+
+	xf86DrvMsg(scrn->scrnIndex, from, "Linear framebuffer at 0x%lX\n",
+	    (unsigned long)intel->LinearAddr);
+
+	if (intel->pEnt->device->IOBase != 0) {
+		intel->MMIOAddr = intel->pEnt->device->IOBase;
+		from = X_CONFIG;
+		intel->MMIOSize = I810_REG_SIZE;
+	} else {
+		intel->MMIOAddr = I810_MEMBASE (intel->PciInfo, mmio_bar);
+		if (intel->MMIOAddr == 0) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			    "No valid MMIO address in PCI config space\n");
+			PreInitCleanup(scrn);
+			return FALSE;
+		}
+		intel->MMIOSize = intel->PciInfo->regions[mmio_bar].size;
+	}
+
+	xf86DrvMsg(scrn->scrnIndex, from,
+	    "IO registers at addr 0x%lX size %u\n",
+	    (unsigned long)intel->MMIOAddr, intel->MMIOSize);
+
+	/* Now figure out mapsize on 8xx chips */
+	if (IS_I830(intel) || IS_845G(intel)) {
+		uint16_t		gmch_ctrl;
+		struct pci_device *bridge;
+
+		bridge = intel_host_bridge ();
+		pci_device_cfg_read_u16 (bridge, &gmch_ctrl, I830_GMCH_CTRL);
+		if ((gmch_ctrl & I830_GMCH_MEM_MASK) == I830_GMCH_MEM_128M) {
+			intel->FbMapSize = 0x8000000;
+		} else {
+			/* 64MB - has this been tested ?? */
+			intel->FbMapSize = 0x4000000;
+		}
 	} else {
-	    /* 128MB aperture for later i8xx series. */
-	    pI830->FbMapSize = 0x8000000;
+		if (IS_I9XX(intel)) {
+			intel->FbMapSize = intel->PciInfo->regions[fb_bar].size;
+		} else {
+			/* 128MB aperture for later i8xx series. */
+			intel->FbMapSize = 0x8000000;
+		}
 	}
-    }
 
     return TRUE;
 }
 
-static const char *accel_name[] = 
-{
-   "unspecified",
-   "no",
-   "XAA",
-   "EXA",
-   "UXA",
-};
-
-static Bool
-I830LoadSyms(ScrnInfoPtr pScrn)
+static Bool I830LoadSyms(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (pI830->use_drm_mode)
-	return TRUE;
+	if (intel->use_drm_mode)
+		return TRUE;
 
-    /* The vgahw module should be loaded here when needed */
-    if (!xf86LoadSubModule(pScrn, "vgahw"))
-	return FALSE;
-    xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
+	/* The vgahw module should be loaded here when needed */
+	if (!xf86LoadSubModule(scrn, "vgahw"))
+		return FALSE;
 
-    if (!xf86LoadSubModule(pScrn, "ramdac"))
-       return FALSE;
-    xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
+	if (!xf86LoadSubModule(scrn, "ramdac"))
+		return FALSE;
 
-    return TRUE;
+	return TRUE;
 }
 
-static Bool
-I830GetEarlyOptions(ScrnInfoPtr pScrn)
+static Bool I830GetEarlyOptions(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    /* Process the options */
-    xf86CollectOptions(pScrn, NULL);
-    if (!(pI830->Options = xalloc(sizeof(I830Options))))
-	return FALSE;
-    memcpy(pI830->Options, I830Options, sizeof(I830Options));
-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI830->Options);
+	/* Process the options */
+	xf86CollectOptions(scrn, NULL);
+	if (!(intel->Options = malloc(sizeof(I830Options))))
+		return FALSE;
+	memcpy(intel->Options, I830Options, sizeof(I830Options));
+	xf86ProcessOptions(scrn->scrnIndex, scrn->options, intel->Options);
+
+	intel->fallback_debug = xf86ReturnOptValBool(intel->Options,
+						     OPTION_FALLBACKDEBUG,
+						     FALSE);
 
-    pI830->fallback_debug = xf86ReturnOptValBool(pI830->Options,
-						 OPTION_FALLBACKDEBUG, FALSE);
+	if (xf86ReturnOptValBool(intel->Options, OPTION_MODEDEBUG, FALSE)) {
+		intel->debug_modes = TRUE;
+	} else {
+		intel->debug_modes = FALSE;
+	}
 
-    if (xf86ReturnOptValBool(pI830->Options, OPTION_MODEDEBUG, FALSE)) {
-	pI830->debug_modes = TRUE;
-    } else {
-	pI830->debug_modes = FALSE;
-    }
-
-    if (xf86ReturnOptValBool(pI830->Options, OPTION_LVDS24BITMODE, FALSE)) {
-	pI830->lvds_24_bit_mode = TRUE;
-    } else {
-	pI830->lvds_24_bit_mode = FALSE;
-    }
-
-    if (xf86ReturnOptValBool(pI830->Options, OPTION_LVDSFIXEDMODE, TRUE)) {
-	pI830->skip_panel_detect = FALSE;
-    } else {
-	pI830->skip_panel_detect = TRUE;
-    }
+	if (xf86ReturnOptValBool(intel->Options, OPTION_LVDS24BITMODE, FALSE)) {
+		intel->lvds_24_bit_mode = TRUE;
+	} else {
+		intel->lvds_24_bit_mode = FALSE;
+	}
 
-    if (xf86ReturnOptValBool(pI830->Options, OPTION_FORCEENABLEPIPEA, FALSE))
-	pI830->quirk_flag |= QUIRK_PIPEA_FORCE;
+	if (xf86ReturnOptValBool(intel->Options, OPTION_LVDSFIXEDMODE, TRUE)) {
+		intel->skip_panel_detect = FALSE;
+	} else {
+		intel->skip_panel_detect = TRUE;
+	}
 
-    return TRUE;
+	if (xf86ReturnOptValBool(intel->Options,
+	    OPTION_FORCEENABLEPIPEA, FALSE))
+		intel->quirk_flag |= QUIRK_PIPEA_FORCE;
+	intel->debug_flush = 0;
+
+	if (xf86ReturnOptValBool(intel->Options,
+				 OPTION_DEBUG_FLUSH_BATCHES,
+				 FALSE))
+		intel->debug_flush |= DEBUG_FLUSH_BATCHES;
+
+	if (xf86ReturnOptValBool(intel->Options,
+				 OPTION_DEBUG_FLUSH_CACHES,
+				 FALSE))
+		intel->debug_flush |= DEBUG_FLUSH_CACHES;
+
+	if (xf86ReturnOptValBool(intel->Options,
+				 OPTION_DEBUG_WAIT,
+				 FALSE))
+		intel->debug_flush |= DEBUG_FLUSH_WAIT;
+
+	return TRUE;
 }
 
 static void
-I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
+I830PreInitCrtcConfig(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config;
-    I830Ptr pI830 = I830PTR(pScrn);
-    int max_width, max_height;
-
-    /* check quirks */
-    i830_fixup_devices(pScrn);
-
-    /* Allocate an xf86CrtcConfig */
-    xf86CrtcConfigInit (pScrn, &i830_xf86crtc_config_funcs);
-    xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-
-    /* See i830_exa.c comments for why we limit the framebuffer size like this.
-     */
-    if (IS_I965G(pI830)) {
-	max_height = max_width = min(16384 / pI830->cpp, 8192);
-    } else {
-	max_width = 2048;
-	max_height = 2048;
-    }
-    xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
+	xf86CrtcConfigPtr   xf86_config;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int max_width, max_height;
+
+	/* check quirks */
+	i830_fixup_devices(scrn);
+
+	/* Allocate an xf86CrtcConfig */
+	xf86CrtcConfigInit (scrn, &i830_xf86crtc_config_funcs);
+	xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+	/* See i830_exa.c comments for why we limit the framebuffer size like
+	 * this.
+	 */
+	if (IS_I965G(intel)) {
+		max_height = max_width = min(16384 / intel->cpp, 8192);
+	} else {
+		max_width = 2048;
+		max_height = 2048;
+	}
+	xf86CrtcSetSizeRange (scrn, 320, 200, max_width, max_height);
 }
 
-static Bool
-I830AccelMethodInit(ScrnInfoPtr pScrn)
+static void i830_check_dri_option(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    MessageType from = X_PROBED;
-    char *s;
-    int i, num_pipe;
-
-    if (xf86ReturnOptValBool(pI830->Options, OPTION_NOACCEL, FALSE)) {
-	pI830->accel = ACCEL_NONE;
-    }
-
-    /*
-     * The ugliness below:
-     * If either XAA or EXA (exclusive) is compiled in, default to it.
-     *
-     * If both are compiled in, and the user didn't specify noAccel, use the
-     * config option AccelMethod to determine which to use, defaulting to EXA
-     * if none is specified, or if the string was unrecognized.
-     *
-     * Then, just to make things more confusing, the default EXA will
-     * be overridden to UXA if KMS is available. See I830DrmModeInit.
-     *
-     * All this *will* go away when we remov XAA and EXA support from
-     * this driver. (And there will be much rejoicing.)
-     */
-    if (!(pI830->accel == ACCEL_NONE)) {
-#ifdef I830_USE_UXA
-	pI830->accel = ACCEL_UXA;
-#endif
-#ifdef I830_USE_EXA
-	pI830->accel = ACCEL_EXA;
-#endif
-#if I830_USE_XAA + I830_USE_EXA + I830_USE_UXA >= 2
-	from = X_DEFAULT;
-	if ((s = (char *)xf86GetOptValString(pI830->Options,
-					     OPTION_ACCELMETHOD))) {
-	    if (!xf86NameCmp(s, "EXA")) {
-		from = X_CONFIG;
-		pI830->accel = ACCEL_EXA;
-	    }
-	    else if (!xf86NameCmp(s, "XAA")) {
-		from = X_CONFIG;
-		pI830->accel = ACCEL_XAA;
-	    }
-	    else if (!xf86NameCmp(s, "UXA")) {
-		from = X_CONFIG;
-	       pI830->accel = ACCEL_UXA;
-	    }
-	}
-#endif
-	xf86DrvMsg(pScrn->scrnIndex, from, "Using %s for acceleration\n",
-		   accel_name[pI830->accel]);
-    }
-
-    pI830->directRenderingType = DRI_NONE;
-    if (!xf86ReturnOptValBool(pI830->Options, OPTION_DRI, TRUE))
-	pI830->directRenderingType = DRI_DISABLED;
-
-#ifdef XF86DRI
-    if (pI830->accel == ACCEL_NONE) {
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it "
-		"needs 2D acceleration.\n");
-	pI830->directRenderingType = DRI_DISABLED;
-    } else if (pScrn->depth != 16 && pScrn->depth != 24) {
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it "
-		"runs only at depths 16 and 24.\n");
-	pI830->directRenderingType = DRI_DISABLED;
-    }
-#endif /* XF86DRI */
-
-    I830MapMMIO(pScrn);
-
-    if (pI830->debug_modes) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "Hardware state on X startup:\n");
-	i830DumpRegs (pScrn);
-    }
-
-    i830TakeRegSnapshot(pScrn);
-
-    if (DEVICE_ID(pI830->PciInfo) == PCI_CHIP_E7221_G)
-	num_pipe = 1;
-    else
-	if (IS_MOBILE(pI830) || IS_I9XX(pI830))
-	    num_pipe = 2;
-	else
-	    num_pipe = 1;
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%d display pipe%s available.\n",
-	       num_pipe, num_pipe > 1 ? "s" : "");
-
-    I830PreInitDDC(pScrn);
-    for (i = 0; i < num_pipe; i++) {
-	i830_crtc_init(pScrn, i);
-    }
-    I830SetupOutputs(pScrn);
-
-    SaveHWState(pScrn);
-    pI830->can_resize = FALSE;
-    if (pI830->accel == ACCEL_UXA && pI830->directRenderingType != DRI_XF86DRI)
-	pI830->can_resize = TRUE;
-#if !defined(DRI2) && defined(XF86DRI)
-    /* Disable resizing so that DRI1 can initialize and give us GEM support. */
-    pI830->can_resize = FALSE;
-#endif
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	intel->directRenderingType = DRI_NONE;
+	if (!xf86ReturnOptValBool(intel->Options, OPTION_DRI, TRUE))
+		intel->directRenderingType = DRI_DISABLED;
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "Resizable framebuffer: %s (%d %d)\n",
-	       pI830->can_resize ? "available" : "not available",
-	       pI830->directRenderingType, pI830->accel);
-
-    if (!xf86InitialConfiguration (pScrn, pI830->can_resize))
-    {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n");
-	RestoreHWState(pScrn);
-	PreInitCleanup(pScrn);
-	return FALSE;
-    }
-    RestoreHWState(pScrn);
+	if (scrn->depth != 16 && scrn->depth != 24) {
+		xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
+			   "DRI is disabled because it "
+			   "runs only at depths 16 and 24.\n");
+		intel->directRenderingType = DRI_DISABLED;
+	}
+}
 
-    /* XXX This should go away, replaced by xf86Crtc.c support for it */
-    pI830->rotation = RR_Rotate_0;
+#ifdef notyet
+static void
+drm_vblank_handler(int fd, unsigned int frame, unsigned int tv_sec,
+    unsigned int tv_usec, void *event_data)
+{
+	I830DRI2FrameEventHandler(frame, tv_sec, tv_usec, event_data);
+}
 
-    pI830->stolen_size = I830DetectMemory(pScrn);
+static void
+drm_wakeup_handler(pointer data, int err, pointer p)
+{
+	intel_screen_private *intel = data;
+	fd_set *read_mask = p;
 
-    return TRUE;
+	if (err >= 0 && FD_ISSET(intel->drmSubFD, read_mask))
+	    drmHandleEvent(intel->drmSubFD, &intel->event_context);
 }
+#endif
 
-static Bool
-I830DrmModeInit(ScrnInfoPtr pScrn)
+static Bool i830_user_modesetting_init(ScrnInfoPtr scrn)
 {
-#ifdef XF86DRM_MODE
-    I830Ptr pI830 = I830PTR(pScrn);
-    char *bus_id;
-    char *s;
-    int ret;
-
-    /* Default to UXA but allow override */
-    pI830->accel = ACCEL_UXA;
-
-    if ((s = (char *)xf86GetOptValString(pI830->Options, OPTION_ACCELMETHOD))) {
-	if (xf86NameCmp(s, "UXA"))
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "kernel mode setting active,overridding accelmethod and using UXA\n");
-    }
-
-    pI830->can_resize = FALSE;
-    if (pI830->accel == ACCEL_UXA && pI830->directRenderingType != DRI_XF86DRI)
-	pI830->can_resize = TRUE;
-
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "Resizable framebuffer: %s (%d %d)\n",
-	       pI830->can_resize ? "available" : "not available",
-	       pI830->directRenderingType, pI830->accel);
-
-    bus_id = DRICreatePCIBusID(pI830->PciInfo);
-
-    /* Create a bus Id */
-    /* Low level DRM open */
-    ret = DRIOpenDRMMaster(pScrn, SAREA_MAX, bus_id, "i915");
-    xfree(bus_id);
-    if (!ret) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "[dri] DRIGetVersion failed to open the DRM\n"
-		       "[dri] Disabling DRI.\n");
-	    return FALSE;
-    }
-
-    pI830->drmSubFD = DRIMasterFD(pScrn);
-    if (drmmode_pre_init(pScrn, pI830->drmSubFD, pI830->cpp) == FALSE) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "Kernel modesetting setup failed\n");
-	PreInitCleanup(pScrn);
-	return FALSE;
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int i, num_pipe;
 
-    pI830->directRenderingType = DRI_NONE;
-    pI830->allocate_classic_textures = FALSE;
+	I830MapMMIO(scrn);
 
-    i830_init_bufmgr(pScrn);
-#endif
+	if (DEVICE_ID(intel->PciInfo) == PCI_CHIP_E7221_G)
+		num_pipe = 1;
+	else
+		if (IS_MOBILE(intel) || IS_I9XX(intel))
+			num_pipe = 2;
+		else
+			num_pipe = 1;
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "%d display pipe%s available.\n",
+	    num_pipe, num_pipe > 1 ? "s" : "");
+
+	I830PreInitDDC(scrn);
+	for (i = 0; i < num_pipe; i++) {
+		i830_crtc_init(scrn, i);
+	}
+	I830SetupOutputs(scrn);
 
-    return TRUE;
-}
+	SaveHWState(scrn);
 
-static void
-I830XvInit(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    MessageType from = X_PROBED;
-
-   pI830->XvPreferOverlay = xf86ReturnOptValBool(pI830->Options, OPTION_PREFER_OVERLAY, FALSE);
+	if (!xf86InitialConfiguration (scrn, TRUE)) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR, "No valid modes.\n");
+		RestoreHWState(scrn);
+		PreInitCleanup(scrn);
+		return FALSE;
+	}
+	RestoreHWState(scrn);
 
-#ifdef I830_XV
-    if (xf86GetOptValInteger(pI830->Options, OPTION_VIDEO_KEY,
-			     &(pI830->colorKey))) {
-	from = X_CONFIG;
-    } else if (xf86GetOptValInteger(pI830->Options, OPTION_COLOR_KEY,
-				    &(pI830->colorKey))) {
-	from = X_CONFIG;
-    } else {
-	pI830->colorKey =
-	    (1 << pScrn->offset.red) | (1 << pScrn->offset.green) |
-	    (((pScrn->mask.blue >> pScrn->offset.blue) - 1) <<
-	     pScrn->offset.blue);
-	from = X_DEFAULT;
-    }
-    xf86DrvMsg(pScrn->scrnIndex, from, "video overlay key set to 0x%x\n",
-	       pI830->colorKey);
+	intel->stolen_size = I830DetectMemory(scrn);
+#ifdef notyet
+	intel->event_context.version = DRM_EVENT_CONTEXT_VERSION;
+	intel->event_context.vblank_handler = drm_vblank_handler;
+	AddGeneralSocket(intel->drmSubFD);
+	RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
+	    drm_wakeup_handler, intel);
 #endif
-}
 
-/**
- * This is called per zaphod head (so usually just once) to do initialization
- * before the Screen is created.
- *
- * This code generally covers probing, module loading, option handling
- * card mapping, and RandR setup.
- */
-static Bool
-I830PreInit(ScrnInfoPtr pScrn, int flags)
-{
-   vgaHWPtr hwp;
-   I830Ptr pI830;
-   rgb defaultWeight = { 0, 0, 0 };
-   EntityInfoPtr pEnt;
-   int flags24;
-   Gamma zeros = { 0.0, 0.0, 0.0 };
-   int drm_mode_setting;
 
-   if (pScrn->numEntities != 1)
-      return FALSE;
+	return TRUE;
+}
 
-   drm_mode_setting = i830_kernel_mode_enabled(pScrn);
+static Bool i830_open_drm_master(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct pci_device *dev = intel->PciInfo;
+	char *busid;
+	drmSetVersion sv;
+	struct drm_i915_getparam gp;
+	int err, has_gem;
+
+	/* We wish we had asprintf, but all we get is XNFprintf. */
+	busid = XNFprintf("pci:%04x:%02x:%02x.%d",
+			  dev->domain, dev->bus, dev->dev, dev->func);
+
+	intel->drmSubFD = drmOpen("i915", busid);
+	if (intel->drmSubFD == -1) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "[drm] Failed to open DRM device for %s: %s\n",
+			   busid, strerror(errno));
+		free(busid);
+		return FALSE;
+	}
 
-   pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+	free(busid);
 
-   if (flags & PROBE_DETECT)
-       return TRUE;
+	/* Check that what we opened was a master or a master-capable FD,
+	 * by setting the version of the interface we'll use to talk to it.
+	 * (see DRIOpenDRMMaster() in DRI1)
+	 */
+	sv.drm_di_major = 1;
+	sv.drm_di_minor = 1;
+	sv.drm_dd_major = -1;
+	sv.drm_dd_minor = -1;
+	err = drmSetInterfaceVersion(intel->drmSubFD, &sv);
+	if (err != 0) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "[drm] failed to set drm interface version.\n");
+		drmClose(intel->drmSubFD);
+		intel->drmSubFD = -1;
+		return FALSE;
+	}
 
-   /* Allocate driverPrivate */
-   if (!I830GetRec(pScrn))
-      return FALSE;
+	has_gem = FALSE;
+	gp.param = I915_PARAM_HAS_GEM;
+	gp.value = &has_gem;
+	(void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM,
+				  &gp, sizeof(gp));
+	if (!has_gem) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "[drm] Failed to detect GEM.  Kernel 2.6.28 required.\n");
+		drmClose(intel->drmSubFD);
+		intel->drmSubFD = -1;
+		return FALSE;
+	}
 
-   pI830 = I830PTR(pScrn);
-   pI830->SaveGeneration = -1;
-   pI830->pEnt = pEnt;
-   pI830->use_drm_mode = drm_mode_setting;
-   pI830->kernel_exec_fencing = pI830->use_drm_mode;
-
-   if (!I830LoadSyms(pScrn))
-       return FALSE;
-
-   if (!drm_mode_setting) {
-       /* Allocate a vgaHWRec */
-       if (!vgaHWGetHWRec(pScrn))
-	   return FALSE;
-       hwp = VGAHWPTR(pScrn);
-   }
+	return TRUE;
+}
 
-   pScrn->displayWidth = 640; /* default it */
+static void i830_close_drm_master(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	if (intel && intel->drmSubFD > 0) {
+		drmClose(intel->drmSubFD);
+		intel->drmSubFD = -1;
+	}
+}
 
-   if (pI830->pEnt->location.type != BUS_PCI)
-      return FALSE;
+static Bool I830DrmModeInit(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   pI830->PciInfo = xf86GetPciInfoForEntity(pI830->pEnt->index);
-#if !XSERVER_LIBPCIACCESS
-   pI830->PciTag = pciTag(pI830->PciInfo->bus, pI830->PciInfo->device,
-			  pI830->PciInfo->func);
-#endif
+	if (drmmode_pre_init(scrn, intel->drmSubFD, intel->cpp) == FALSE) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Kernel modesetting setup failed\n");
+		PreInitCleanup(scrn);
+		return FALSE;
+	}
 
-#if 0
-   if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
-      PreInitCleanup(pScrn);
-      return FALSE;
-   }
+	i830_init_bufmgr(scrn);
 
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-#endif
-   pScrn->monitor = pScrn->confScreen->monitor;
-   pScrn->progClock = TRUE;
-   pScrn->rgbBits = 8;
+	return TRUE;
+}
 
-   flags24 = Support32bppFb | PreferConvert24to32 | SupportConvert24to32;
+static void I830XvInit(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	MessageType from = X_PROBED;
 
-   if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24))
-      return FALSE;
+	intel->XvPreferOverlay =
+	    xf86ReturnOptValBool(intel->Options, OPTION_PREFER_OVERLAY, FALSE);
 
-   switch (pScrn->depth) {
-   case 8:
-   case 15:
-   case 16:
-   case 24:
-      break;
-   default:
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "Given depth (%d) is not supported by I830 driver\n",
-		 pScrn->depth);
-      return FALSE;
-   }
-   xf86PrintDepthBpp(pScrn);
+	if (xf86GetOptValInteger(intel->Options, OPTION_VIDEO_KEY,
+				 &(intel->colorKey))) {
+		from = X_CONFIG;
+	} else if (xf86GetOptValInteger(intel->Options, OPTION_COLOR_KEY,
+					&(intel->colorKey))) {
+		from = X_CONFIG;
+	} else {
+		intel->colorKey =
+		    (1 << scrn->offset.red) | (1 << scrn->offset.green) |
+		    (((scrn->mask.blue >> scrn->offset.blue) - 1) <<
+		     scrn->offset.blue);
+		from = X_DEFAULT;
+	}
+	xf86DrvMsg(scrn->scrnIndex, from, "video overlay key set to 0x%x\n",
+		   intel->colorKey);
+}
 
-   if (!xf86SetWeight(pScrn, defaultWeight, defaultWeight))
-      return FALSE;
-   if (!xf86SetDefaultVisual(pScrn, -1))
-      return FALSE;
+/**
+ * This is called before ScreenInit to do any require probing of screen
+ * configuration.
+ *
+ * This code generally covers probing, module loading, option handling
+ * card mapping, and RandR setup.
+ *
+ * Since xf86InitialConfiguration ends up requiring that we set video modes
+ * in order to detect configuration, we end up having to do a lot of driver
+ * setup (talking to the DRM, mapping the device, etc.) in this function.
+ * As a result, we want to set up that server initialization once rather
+ * that doing it per generation.
+ */
+static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
+{
+	vgaHWPtr hwp;
+	intel_screen_private *intel;
+	rgb defaultWeight = { 0, 0, 0 };
+	EntityInfoPtr pEnt;
+	int flags24;
+	Gamma zeros = { 0.0, 0.0, 0.0 };
+	int drm_mode_setting;
+
+	if (scrn->numEntities != 1)
+		return FALSE;
+
+	drm_mode_setting = i830_kernel_mode_enabled(scrn);
+
+	pEnt = xf86GetEntityInfo(scrn->entityList[0]);
+
+	if (flags & PROBE_DETECT)
+		return TRUE;
+
+	/* Allocate driverPrivate */
+	if (!I830GetRec(scrn))
+		return FALSE;
+
+	intel = intel_get_screen_private(scrn);
+	intel->SaveGeneration = -1;
+	intel->pEnt = pEnt;
+	intel->use_drm_mode = drm_mode_setting;
+
+	if (!I830LoadSyms(scrn))
+		return FALSE;
+
+	if (!drm_mode_setting) {
+		/* Allocate a vgaHWRec */
+		if (!vgaHWGetHWRec(scrn))
+			return FALSE;
+		hwp = VGAHWPTR(scrn);
+	}
 
-   if (!pI830->use_drm_mode)
-       hwp = VGAHWPTR(pScrn);
+	scrn->displayWidth = 640;	/* default it */
 
-   pI830->cpp = pScrn->bitsPerPixel / 8;
+	if (intel->pEnt->location.type != BUS_PCI)
+		return FALSE;
 
-   pI830->preinit = TRUE;
+	intel->PciInfo = xf86GetPciInfoForEntity(intel->pEnt->index);
 
-   if (!I830GetEarlyOptions(pScrn))
-       return FALSE;
+	if (!i830_open_drm_master(scrn))
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Failed to become DRM master.\n");
 
-   if (!i830_detect_chipset(pScrn))
-       return FALSE;
+	scrn->monitor = scrn->confScreen->monitor;
+	scrn->progClock = TRUE;
+	scrn->rgbBits = 8;
 
-   if (i830_bios_init(pScrn))
-       xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		  "VBIOS initialization failed.\n");
+	flags24 = Support32bppFb | PreferConvert24to32 | SupportConvert24to32;
 
-   if (pI830->use_drm_mode) {
-       if (!I830DrmModeInit(pScrn))
-	   return FALSE;
-   } else {
-      I830PreInitCrtcConfig(pScrn);
-      if (!I830AccelMethodInit(pScrn))
-         return FALSE;
-   }
+	if (!xf86SetDepthBpp(scrn, 0, 0, 0, flags24))
+		return FALSE;
 
-   I830XvInit(pScrn);
+	switch (scrn->depth) {
+	case 8:
+	case 15:
+	case 16:
+	case 24:
+		break;
+	default:
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Given depth (%d) is not supported by I830 driver\n",
+			   scrn->depth);
+		return FALSE;
+	}
+	xf86PrintDepthBpp(scrn);
 
-   if (!xf86SetGamma(pScrn, zeros)) {
-       PreInitCleanup(pScrn);
-       return FALSE;
-   }
+	if (!xf86SetWeight(scrn, defaultWeight, defaultWeight))
+		return FALSE;
+	if (!xf86SetDefaultVisual(scrn, -1))
+		return FALSE;
 
-   if (pScrn->modes == NULL) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n");
-      PreInitCleanup(pScrn);
-      return FALSE;
-   }
-   pScrn->currentMode = pScrn->modes;
+	if (!intel->use_drm_mode)
+		hwp = VGAHWPTR(scrn);
 
-   if (!IS_I965G(pI830) && pScrn->virtualY > 2048) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot support > 2048 vertical lines. disabling acceleration.\n");
-      pI830->accel = ACCEL_NONE;
-   }
+	intel->cpp = scrn->bitsPerPixel / 8;
 
-   /* Set display resolution */
-   xf86SetDpi(pScrn, 0, 0);
+	intel->preinit = TRUE;
 
-   /* Load the required sub modules */
-   if (!xf86LoadSubModule(pScrn, "fb")) {
-      PreInitCleanup(pScrn);
-      return FALSE;
-   }
+	if (!I830GetEarlyOptions(scrn))
+		return FALSE;
 
-   xf86LoaderReqSymLists(I810fbSymbols, NULL);
+	if (!i830_detect_chipset(scrn))
+		return FALSE;
 
-   switch (pI830->accel) {
-#ifdef I830_USE_XAA
-   case ACCEL_XAA:
-      if (!xf86LoadSubModule(pScrn, "xaa")) {
-	 PreInitCleanup(pScrn);
-	 return FALSE;
-      }
-      xf86LoaderReqSymLists(I810xaaSymbols, NULL);
-      break;
-#endif
+	i830_check_dri_option(scrn);
 
-#ifdef I830_USE_EXA
-   case ACCEL_EXA: {
-      XF86ModReqInfo req;
-      int errmaj, errmin;
-
-      memset(&req, 0, sizeof(req));
-      req.majorversion = 2;
-#if EXA_VERSION_MINOR >= 2
-      req.minorversion = 2;
-#else
-      req.minorversion = 1;
-#endif
-      if (!LoadSubModule(pScrn->module, "exa", NULL, NULL, NULL, &req,
-		&errmaj, &errmin)) {
-	 LoaderErrorMsg(NULL, "exa", errmaj, errmin);
-	 PreInitCleanup(pScrn);
-	 return FALSE;
-      }
-      xf86LoaderReqSymLists(I830exaSymbols, NULL);
-      break;
-   }
-#endif
-   default:
-      break;
-   }
+	if (intel->use_drm_mode) {
+		if (!I830DrmModeInit(scrn))
+			return FALSE;
+	} else {
+		if (i830_bios_init(scrn))
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			    "VBIOS initialization failed.\n");
+		I830PreInitCrtcConfig(scrn);
+		if (!i830_user_modesetting_init(scrn))
+			return FALSE;
+	}
 
-   if (!pI830->use_drm_mode) {
-       i830CompareRegsToSnapshot(pScrn, "After PreInit");
+	I830XvInit(scrn);
 
-       I830UnmapMMIO(pScrn);
+	if (!xf86SetGamma(scrn, zeros)) {
+		PreInitCleanup(scrn);
+		return FALSE;
+	}
 
-       /*  We won't be using the VGA access after the probe. */
-       I830SetMMIOAccess(pI830);
-#if 0
-       xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
-       xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
-#endif
-   }
+	if (scrn->modes == NULL) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR, "No modes.\n");
+		PreInitCleanup(scrn);
+		return FALSE;
+	}
+	scrn->currentMode = scrn->modes;
 
-#if defined(XF86DRI)
-   /* Load the dri module if requested. */
-   if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
-       pI830->directRenderingType != DRI_DISABLED) {
-      if (xf86LoadSubModule(pScrn, "dri")) {
-	 xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
-      }
-   }
-#endif
+	/* Set display resolution */
+	xf86SetDpi(scrn, 0, 0);
 
-#if defined(DRI2)
-   /* Load the dri2 module if requested. */
-   if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
-       pI830->directRenderingType != DRI_DISABLED) {
-       xf86LoadSubModule(pScrn, "dri2");
-   }
-#endif
+	/* Load the required sub modules */
+	if (!xf86LoadSubModule(scrn, "fb")) {
+		PreInitCleanup(scrn);
+		return FALSE;
+	}
 
-   pI830->preinit = FALSE;
+	if (!intel->use_drm_mode) {
+   /* console hack, stolen from G80 */
+	   if (IS_IGDNG(intel)) {
+	       if (xf86LoadSubModule(scrn, "int10")) {
+	       intel->int10 = xf86InitInt10(pEnt->index);
+	       if (intel->int10) {
+		       intel->int10->num = 0x10;
+		       intel->int10->ax = 0x4f03;
+		       intel->int10->bx =
+		       intel->int10->cx =
+		       intel->int10->dx = 0;
+		       xf86ExecX86int10(intel->int10);
+		       intel->int10Mode = intel->int10->bx & 0x3fff;
+		       xf86DrvMsg(scrn->scrnIndex, X_PROBED,
+			  "Console VGA mode is 0x%x\n", intel->int10Mode);
+		   } else {
+		       xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			      "Failed int10 setup, VT switch won't work\n");
+		   }
+	       } else {
+		   xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+		       "Failed to load int10module, ironlake vt switch broken");
+	       }
+	       }
 
-   return TRUE;
-}
+		I830UnmapMMIO(scrn);
 
-/*
- * Reset registers that it doesn't make sense to save/restore to a sane state.
- * This is basically the ring buffer and fence registers.  Restoring these
- * doesn't make sense without restoring GTT mappings.  This is something that
- * whoever gets control next should do.
- */
-static void
-i830_stop_ring(ScrnInfoPtr pScrn, Bool flush)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   unsigned long temp;
+		/*  We won't be using the VGA access after the probe. */
+		I830SetMMIOAccess(intel);
+	}
 
-   DPRINTF(PFX, "ResetState: flush is %s\n", BOOLTOSTRING(flush));
+	/* Load the dri2 module if requested. */
+	if (xf86ReturnOptValBool(intel->Options, OPTION_DRI, FALSE) &&
+	    intel->directRenderingType != DRI_DISABLED) {
+		xf86LoadSubModule(scrn, "dri2");
+	}
 
-   /* Flush the ring buffer (if enabled), then disable it. */
-   if (pI830->accel != ACCEL_NONE) {
-      temp = INREG(LP_RING + RING_LEN);
-      if (temp & RING_VALID) {
-	 i830_refresh_ring(pScrn);
-	 i830_wait_ring_idle(pScrn);
-      }
+	intel->preinit = FALSE;
 
-      OUTREG(LP_RING + RING_LEN, 0);
-      OUTREG(LP_RING + RING_HEAD, 0);
-      OUTREG(LP_RING + RING_TAIL, 0);
-      OUTREG(LP_RING + RING_START, 0);
-   }
+	return TRUE;
 }
 
-static void
-i830_start_ring(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   unsigned int itemp;
-
-   DPRINTF(PFX, "SetRingRegs\n");
-
-   if (pI830->accel == ACCEL_NONE)
-      return;
-
-   OUTREG(LP_RING + RING_LEN, 0);
-   OUTREG(LP_RING + RING_TAIL, 0);
-   OUTREG(LP_RING + RING_HEAD, 0);
-
-   assert((pI830->ring.mem->offset & I830_RING_START_MASK) ==
-	   pI830->ring.mem->offset);
-
-   /* Don't care about the old value.  Reserved bits must be zero anyway. */
-   itemp = pI830->ring.mem->offset;
-   OUTREG(LP_RING + RING_START, itemp);
-
-   if (((pI830->ring.mem->size - 4096) & I830_RING_NR_PAGES) !=
-       pI830->ring.mem->size - 4096) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "I830SetRingRegs: Ring buffer size - 4096 (%lx) violates its "
-		 "mask (%x)\n", pI830->ring.mem->size - 4096,
-		 I830_RING_NR_PAGES);
-   }
-   /* Don't care about the old value.  Reserved bits must be zero anyway. */
-   itemp = (pI830->ring.mem->size - 4096) & I830_RING_NR_PAGES;
-   itemp |= (RING_NO_REPORT | RING_VALID);
-   OUTREG(LP_RING + RING_LEN, itemp);
-   i830_refresh_ring(pScrn);
-}
+enum pipe {
+	PIPE_A = 0,
+	PIPE_B,
+};
 
-void
-i830_refresh_ring(ScrnInfoPtr pScrn)
+static Bool i830_pipe_enabled(intel_screen_private *intel, enum pipe pipe)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+	uint32_t dpll_reg;
 
-   /* If we're reaching RefreshRing as a result of grabbing the DRI lock
-    * before we've set up the ringbuffer, don't bother.
-    */
-   if (pI830->ring.mem == NULL)
-       return;
+	if (IS_IGDNG(intel)) {
+		dpll_reg = (pipe == PIPE_A) ? PCH_DPLL_A : PCH_DPLL_B;
+	} else {
+		dpll_reg = (pipe == PIPE_A) ? DPLL_A : DPLL_B;
+	}
 
-   pI830->ring.head = INREG(LP_RING + RING_HEAD) & I830_HEAD_MASK;
-   pI830->ring.tail = INREG(LP_RING + RING_TAIL);
-   pI830->ring.space = pI830->ring.head - (pI830->ring.tail + 8);
-   if (pI830->ring.space < 0)
-      pI830->ring.space += pI830->ring.mem->size;
-   i830MarkSync(pScrn);
+	return (INREG(dpll_reg) & DPLL_VCO_ENABLE);
 }
 
-enum pipe {
-    PIPE_A = 0,
-    PIPE_B,
-};
-
-static Bool
-i830_pipe_enabled(I830Ptr pI830, enum pipe pipe)
+static void i830_save_palette(intel_screen_private *intel, enum pipe pipe)
 {
-    if (pipe == PIPE_A)
-	return (INREG(PIPEACONF) & PIPEACONF_ENABLE);
-    else
-	return (INREG(PIPEBCONF) & PIPEBCONF_ENABLE);
-}
+	uint32_t reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);
+	uint32_t *array;
+	int i;
 
-static void
-i830_save_palette(I830Ptr pI830, enum pipe pipe)
-{
-    int i;
+	if (!i830_pipe_enabled(intel, pipe))
+		return;
 
-    if (!i830_pipe_enabled(pI830, pipe))
-	return;
+	if (IS_IGDNG(intel))
+		reg = (pipe == PIPE_A) ? LGC_PALETTE_A : LGC_PALETTE_B;
 
-    for(i= 0; i < 256; i++) {
 	if (pipe == PIPE_A)
-	    pI830->savePaletteA[i] = INREG(PALETTE_A + (i << 2));
+		array = intel->savePaletteA;
 	else
-	    pI830->savePaletteB[i] = INREG(PALETTE_B + (i << 2));
-    }
+		array = intel->savePaletteB;
+
+	for (i = 0; i < 256; i++)
+		array[i] = INREG(reg + (i << 2));
 }
 
-static void
-i830_restore_palette(I830Ptr pI830, enum pipe pipe)
+static void i830_restore_palette(intel_screen_private *intel, enum pipe pipe)
 {
-    int i;
+	uint32_t reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);
+	uint32_t *array;
+	int i;
 
-    if (!i830_pipe_enabled(pI830, pipe))
-	return;
+	if (!i830_pipe_enabled(intel, pipe))
+		return;
+
+	if (IS_IGDNG(intel))
+		reg = (pipe == PIPE_A) ? LGC_PALETTE_A : LGC_PALETTE_B;
 
-    for(i= 0; i < 256; i++) {
 	if (pipe == PIPE_A)
-	    OUTREG(PALETTE_A + (i << 2), pI830->savePaletteA[i]);
+		array = intel->savePaletteA;
 	else
-	    OUTREG(PALETTE_B + (i << 2), pI830->savePaletteB[i]);
-    }
+		array = intel->savePaletteB;
+
+	for (i = 0; i < 256; i++)
+		OUTREG(reg + (i << 2), array[i]);
 }
 
-static Bool
-SaveHWState(ScrnInfoPtr pScrn)
+static Bool SaveHWState(ScrnInfoPtr scrn)
 {
-   xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-   I830Ptr pI830 = I830PTR(pScrn);
-   vgaHWPtr hwp = VGAHWPTR(pScrn);
-   vgaRegPtr vgaReg = &hwp->SavedReg;
-   int i;
-
-   if (pI830->fb_compression) {
-       pI830->saveFBC_CFB_BASE = INREG(FBC_CFB_BASE);
-       pI830->saveFBC_LL_BASE = INREG(FBC_LL_BASE);
-       pI830->saveFBC_CONTROL2 = INREG(FBC_CONTROL2);
-       pI830->saveFBC_CONTROL = INREG(FBC_CONTROL);
-       pI830->saveFBC_FENCE_OFF = INREG(FBC_FENCE_OFF);
-   }
+	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	vgaHWPtr hwp = VGAHWPTR(scrn);
+	vgaRegPtr vgaReg = &hwp->SavedReg;
+	int i;
 
-   /* Save video mode information for native mode-setting. */
-   if (!DSPARB_HWCONTROL(pI830))
-       pI830->saveDSPARB = INREG(DSPARB);
-
-   pI830->saveDSPACNTR = INREG(DSPACNTR);
-   pI830->savePIPEACONF = INREG(PIPEACONF);
-   pI830->savePIPEASRC = INREG(PIPEASRC);
-   pI830->saveFPA0 = INREG(FPA0);
-   pI830->saveFPA1 = INREG(FPA1);
-   pI830->saveDPLL_A = INREG(DPLL_A);
-   if (IS_I965G(pI830))
-      pI830->saveDPLL_A_MD = INREG(DPLL_A_MD);
-   pI830->saveHTOTAL_A = INREG(HTOTAL_A);
-   pI830->saveHBLANK_A = INREG(HBLANK_A);
-   pI830->saveHSYNC_A = INREG(HSYNC_A);
-   pI830->saveVTOTAL_A = INREG(VTOTAL_A);
-   pI830->saveVBLANK_A = INREG(VBLANK_A);
-   pI830->saveVSYNC_A = INREG(VSYNC_A);
-   pI830->saveBCLRPAT_A = INREG(BCLRPAT_A);
-   pI830->saveDSPASTRIDE = INREG(DSPASTRIDE);
-   pI830->saveDSPASIZE = INREG(DSPASIZE);
-   pI830->saveDSPAPOS = INREG(DSPAPOS);
-   pI830->saveDSPABASE = INREG(DSPABASE);
-
-   i830_save_palette(pI830, PIPE_A);
-
-   if(xf86_config->num_crtc == 2) {
-      pI830->savePIPEBCONF = INREG(PIPEBCONF);
-      pI830->savePIPEBSRC = INREG(PIPEBSRC);
-      pI830->saveDSPBCNTR = INREG(DSPBCNTR);
-      pI830->saveFPB0 = INREG(FPB0);
-      pI830->saveFPB1 = INREG(FPB1);
-      pI830->saveDPLL_B = INREG(DPLL_B);
-      if (IS_I965G(pI830))
-	 pI830->saveDPLL_B_MD = INREG(DPLL_B_MD);
-      pI830->saveHTOTAL_B = INREG(HTOTAL_B);
-      pI830->saveHBLANK_B = INREG(HBLANK_B);
-      pI830->saveHSYNC_B = INREG(HSYNC_B);
-      pI830->saveVTOTAL_B = INREG(VTOTAL_B);
-      pI830->saveVBLANK_B = INREG(VBLANK_B);
-      pI830->saveVSYNC_B = INREG(VSYNC_B);
-      pI830->saveBCLRPAT_B = INREG(BCLRPAT_B);
-      pI830->saveDSPBSTRIDE = INREG(DSPBSTRIDE);
-      pI830->saveDSPBSIZE = INREG(DSPBSIZE);
-      pI830->saveDSPBPOS = INREG(DSPBPOS);
-      pI830->saveDSPBBASE = INREG(DSPBBASE);
+       if (IS_IGDNG(intel))
+	   return TRUE;
 
-      i830_save_palette(pI830, PIPE_B);
-   }
+	if (intel->fb_compression) {
+		intel->saveFBC_CFB_BASE = INREG(FBC_CFB_BASE);
+		intel->saveFBC_LL_BASE = INREG(FBC_LL_BASE);
+		intel->saveFBC_CONTROL2 = INREG(FBC_CONTROL2);
+		intel->saveFBC_CONTROL = INREG(FBC_CONTROL);
+		intel->saveFBC_FENCE_OFF = INREG(FBC_FENCE_OFF);
+	}
 
-   if (IS_I965G(pI830)) {
-      pI830->saveDSPASURF = INREG(DSPASURF);
-      pI830->saveDSPBSURF = INREG(DSPBSURF);
-      pI830->saveDSPATILEOFF = INREG(DSPATILEOFF);
-      pI830->saveDSPBTILEOFF = INREG(DSPBTILEOFF);
-   }
+	/* Save video mode information for native mode-setting. */
+	if (!DSPARB_HWCONTROL(intel))
+		intel->saveDSPARB = INREG(DSPARB);
+
+	intel->saveDSPACNTR = INREG(DSPACNTR);
+	intel->savePIPEACONF = INREG(PIPEACONF);
+	intel->savePIPEASRC = INREG(PIPEASRC);
+	intel->saveFPA0 = INREG(FPA0);
+	intel->saveFPA1 = INREG(FPA1);
+	intel->saveDPLL_A = INREG(DPLL_A);
+	if (IS_I965G(intel))
+		intel->saveDPLL_A_MD = INREG(DPLL_A_MD);
+	intel->saveHTOTAL_A = INREG(HTOTAL_A);
+	intel->saveHBLANK_A = INREG(HBLANK_A);
+	intel->saveHSYNC_A = INREG(HSYNC_A);
+	intel->saveVTOTAL_A = INREG(VTOTAL_A);
+	intel->saveVBLANK_A = INREG(VBLANK_A);
+	intel->saveVSYNC_A = INREG(VSYNC_A);
+	intel->saveBCLRPAT_A = INREG(BCLRPAT_A);
+	intel->saveDSPASTRIDE = INREG(DSPASTRIDE);
+	intel->saveDSPASIZE = INREG(DSPASIZE);
+	intel->saveDSPAPOS = INREG(DSPAPOS);
+	intel->saveDSPABASE = INREG(DSPABASE);
+
+	i830_save_palette(intel, PIPE_A);
+
+	if(xf86_config->num_crtc == 2) {
+	intel->savePIPEBCONF = INREG(PIPEBCONF);
+	intel->savePIPEBSRC = INREG(PIPEBSRC);
+	intel->saveDSPBCNTR = INREG(DSPBCNTR);
+	intel->saveFPB0 = INREG(FPB0);
+	intel->saveFPB1 = INREG(FPB1);
+	intel->saveDPLL_B = INREG(DPLL_B);
+	if (IS_I965G(intel))
+		intel->saveDPLL_B_MD = INREG(DPLL_B_MD);
+	intel->saveHTOTAL_B = INREG(HTOTAL_B);
+	intel->saveHBLANK_B = INREG(HBLANK_B);
+	intel->saveHSYNC_B = INREG(HSYNC_B);
+	intel->saveVTOTAL_B = INREG(VTOTAL_B);
+	intel->saveVBLANK_B = INREG(VBLANK_B);
+	intel->saveVSYNC_B = INREG(VSYNC_B);
+	intel->saveBCLRPAT_B = INREG(BCLRPAT_B);
+	intel->saveDSPBSTRIDE = INREG(DSPBSTRIDE);
+	intel->saveDSPBSIZE = INREG(DSPBSIZE);
+	intel->saveDSPBPOS = INREG(DSPBPOS);
+	intel->saveDSPBBASE = INREG(DSPBBASE);
 
-   pI830->saveVCLK_DIVISOR_VGA0 = INREG(VCLK_DIVISOR_VGA0);
-   pI830->saveVCLK_DIVISOR_VGA1 = INREG(VCLK_DIVISOR_VGA1);
-   pI830->saveVCLK_POST_DIV = INREG(VCLK_POST_DIV);
-   pI830->saveVGACNTRL = INREG(VGACNTRL);
-
-   pI830->saveCURSOR_A_CONTROL = INREG(CURSOR_A_CONTROL);
-   pI830->saveCURSOR_A_POSITION = INREG(CURSOR_A_POSITION);
-   pI830->saveCURSOR_A_BASE = INREG(CURSOR_A_BASE);
-   pI830->saveCURSOR_B_CONTROL = INREG(CURSOR_B_CONTROL);
-   pI830->saveCURSOR_B_POSITION = INREG(CURSOR_B_POSITION);
-   pI830->saveCURSOR_B_BASE = INREG(CURSOR_B_BASE);
-
-   for(i = 0; i < 7; i++) {
-      pI830->saveSWF[i] = INREG(SWF0 + (i << 2));
-      pI830->saveSWF[i+7] = INREG(SWF00 + (i << 2));
-   }
-   pI830->saveSWF[14] = INREG(SWF30);
-   pI830->saveSWF[15] = INREG(SWF31);
-   pI830->saveSWF[16] = INREG(SWF32);
-
-   pI830->saveDSPCLK_GATE_D = INREG(DSPCLK_GATE_D);
-   pI830->saveRENCLK_GATE_D1 = INREG(RENCLK_GATE_D1);
-
-   if (IS_I965G(pI830)) {
-      pI830->saveRENCLK_GATE_D2 = INREG(RENCLK_GATE_D2);
-      pI830->saveRAMCLK_GATE_D = INREG(RAMCLK_GATE_D);
-   }
+	i830_save_palette(intel, PIPE_B);
+	}
 
-   if (IS_I965GM(pI830) || IS_GM45(pI830))
-      pI830->savePWRCTXA = INREG(PWRCTXA);
+	if (IS_I965G(intel)) {
+		intel->saveDSPASURF = INREG(DSPASURF);
+		intel->saveDSPBSURF = INREG(DSPBSURF);
+		intel->saveDSPATILEOFF = INREG(DSPATILEOFF);
+		intel->saveDSPBTILEOFF = INREG(DSPBTILEOFF);
+	}
 
-   if (IS_MOBILE(pI830) && !IS_I830(pI830))
-      pI830->saveLVDS = INREG(LVDS);
-   pI830->savePFIT_CONTROL = INREG(PFIT_CONTROL);
-
-   for (i = 0; i < xf86_config->num_output; i++) {
-      xf86OutputPtr   output = xf86_config->output[i];
-      if (output->funcs->save)
-	 (*output->funcs->save) (output);
-   }
+	intel->saveVCLK_DIVISOR_VGA0 = INREG(VCLK_DIVISOR_VGA0);
+	intel->saveVCLK_DIVISOR_VGA1 = INREG(VCLK_DIVISOR_VGA1);
+	intel->saveVCLK_POST_DIV = INREG(VCLK_POST_DIV);
+	intel->saveVGACNTRL = INREG(VGACNTRL);
+
+	intel->saveCURSOR_A_CONTROL = INREG(CURSOR_A_CONTROL);
+	intel->saveCURSOR_A_POSITION = INREG(CURSOR_A_POSITION);
+	intel->saveCURSOR_A_BASE = INREG(CURSOR_A_BASE);
+	intel->saveCURSOR_B_CONTROL = INREG(CURSOR_B_CONTROL);
+	intel->saveCURSOR_B_POSITION = INREG(CURSOR_B_POSITION);
+	intel->saveCURSOR_B_BASE = INREG(CURSOR_B_BASE);
+
+	for(i = 0; i < 7; i++) {
+		intel->saveSWF[i] = INREG(SWF0 + (i << 2));
+		intel->saveSWF[i+7] = INREG(SWF00 + (i << 2));
+	}
+	intel->saveSWF[14] = INREG(SWF30);
+	intel->saveSWF[15] = INREG(SWF31);
+	intel->saveSWF[16] = INREG(SWF32);
+
+	intel->saveDSPCLK_GATE_D = INREG(DSPCLK_GATE_D);
+	intel->saveRENCLK_GATE_D1 = INREG(RENCLK_GATE_D1);
+
+	if (IS_I965G(intel)) {
+		intel->saveRENCLK_GATE_D2 = INREG(RENCLK_GATE_D2);
+		intel->saveRAMCLK_GATE_D = INREG(RAMCLK_GATE_D);
+	}
 
-   vgaHWUnlock(hwp);
-   vgaHWSave(pScrn, vgaReg, VGA_SR_FONTS);
+	if (IS_I965GM(intel) || IS_GM45(intel))
+		intel->savePWRCTXA = INREG(PWRCTXA);
 
-   return TRUE;
+	if (IS_MOBILE(intel) && !IS_I830(intel))
+		intel->saveLVDS = INREG(LVDS);
+	intel->savePFIT_CONTROL = INREG(PFIT_CONTROL);
+
+	for (i = 0; i < xf86_config->num_output; i++) {
+		xf86OutputPtr   output = xf86_config->output[i];
+		if (output->funcs->save)
+			(*output->funcs->save) (output);
+	}
+
+	vgaHWUnlock(hwp);
+	vgaHWSave(scrn, vgaReg, VGA_SR_FONTS);
+
+	return TRUE;
 }
 
 /* Wait for the PLL to settle down after programming */
-static void
-i830_dpll_settle(void)
+static void i830_dpll_settle(void)
 {
-    usleep(10000); /* 10 ms *should* be plenty */
+	usleep(10000); /* 10 ms *should* be plenty */
 }
 
-static Bool
-RestoreHWState(ScrnInfoPtr pScrn)
+static Bool RestoreHWState(ScrnInfoPtr scrn)
 {
-   xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-   I830Ptr pI830 = I830PTR(pScrn);
-   vgaHWPtr hwp = VGAHWPTR(pScrn);
-   vgaRegPtr vgaReg = &hwp->SavedReg;
-   int i;
+	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	vgaHWPtr hwp = VGAHWPTR(scrn);
+	vgaRegPtr vgaReg = &hwp->SavedReg;
+	int i;
 
-   DPRINTF(PFX, "RestoreHWState\n");
+       if (IS_IGDNG(intel))
+	   return TRUE;
 
-#ifdef XF86DRI
-   I830DRISetVBlankInterrupt (pScrn, FALSE);
-#endif
-   /* Disable outputs */
-   for (i = 0; i < xf86_config->num_output; i++) {
-      xf86OutputPtr   output = xf86_config->output[i];
-      output->funcs->dpms(output, DPMSModeOff);
-   }
-   i830WaitForVblank(pScrn);
+	DPRINTF(PFX, "RestoreHWState\n");
+
+	/* Disable outputs */
+	for (i = 0; i < xf86_config->num_output; i++) {
+		xf86OutputPtr   output = xf86_config->output[i];
+		output->funcs->dpms(output, DPMSModeOff);
+	}
+	i830WaitForVblank(scrn);
    
-   /* Disable pipes */
-   for (i = 0; i < xf86_config->num_crtc; i++) {
-      xf86CrtcPtr crtc = xf86_config->crtc[i];
-      i830_crtc_disable(crtc, TRUE);
-   }
-   i830WaitForVblank(pScrn);
+	/* Disable pipes */
+	for (i = 0; i < xf86_config->num_crtc; i++) {
+		xf86CrtcPtr crtc = xf86_config->crtc[i];
+		i830_crtc_disable(crtc, TRUE);
+	}
+	i830WaitForVblank(scrn);
 
-   if (IS_MOBILE(pI830) && !IS_I830(pI830))
-      OUTREG(LVDS, pI830->saveLVDS);
+	if (IS_MOBILE(intel) && !IS_I830(intel))
+		OUTREG(LVDS, intel->saveLVDS);
 
-   if (!IS_I830(pI830) && !IS_845G(pI830))
-     OUTREG(PFIT_CONTROL, pI830->savePFIT_CONTROL);
+	if (!IS_I830(intel) && !IS_845G(intel))
+		OUTREG(PFIT_CONTROL, intel->savePFIT_CONTROL);
 
-   if (!DSPARB_HWCONTROL(pI830))
-       OUTREG(DSPARB, pI830->saveDSPARB);
+	if (!DSPARB_HWCONTROL(intel))
+		OUTREG(DSPARB, intel->saveDSPARB);
 
-   OUTREG(DSPCLK_GATE_D, pI830->saveDSPCLK_GATE_D);
-   OUTREG(RENCLK_GATE_D1, pI830->saveRENCLK_GATE_D1);
+	OUTREG(DSPCLK_GATE_D, intel->saveDSPCLK_GATE_D);
+	OUTREG(RENCLK_GATE_D1, intel->saveRENCLK_GATE_D1);
 
-   if (IS_I965G(pI830)) {
-      OUTREG(RENCLK_GATE_D2, pI830->saveRENCLK_GATE_D2);
-      OUTREG(RAMCLK_GATE_D, pI830->saveRAMCLK_GATE_D);
-   }
-
-   if (IS_I965GM(pI830) || IS_GM45(pI830))
-      OUTREG(PWRCTXA, pI830->savePWRCTXA);
+	if (IS_I965G(intel)) {
+		OUTREG(RENCLK_GATE_D2, intel->saveRENCLK_GATE_D2);
+		OUTREG(RAMCLK_GATE_D, intel->saveRAMCLK_GATE_D);
+	}
 
-   /*
-    * Pipe regs
-    * To restore the saved state, we first need to program the PLL regs,
-    * followed by the pipe configuration and finally the display plane
-    * configuration.  The VGA registers can program one, both or neither
-    * of the PLL regs, depending on their VGA_MOD_DIS bit value.
-    */
+	if (IS_I965GM(intel) || IS_GM45(intel))
+		OUTREG(PWRCTXA, intel->savePWRCTXA);
 
-   /*
-    * Since either or both pipes may use the VGA clocks, make sure the
-    * regs are valid.
-    */
-   OUTREG(VCLK_DIVISOR_VGA0, pI830->saveVCLK_DIVISOR_VGA0);
-   OUTREG(VCLK_DIVISOR_VGA1, pI830->saveVCLK_DIVISOR_VGA1);
-   OUTREG(VCLK_POST_DIV, pI830->saveVCLK_POST_DIV);
+	/*
+	 * Pipe regs
+	 * To restore the saved state, we first need to program the PLL regs,
+	 * followed by the pipe configuration and finally the display plane
+	 * configuration.  The VGA registers can program one, both or neither
+	 * of the PLL regs, depending on their VGA_MOD_DIS bit value.
+	 */
+
+	/*
+	 * Since either or both pipes may use the VGA clocks, make sure the
+	 * regs are valid.
+	 */
+	OUTREG(VCLK_DIVISOR_VGA0, intel->saveVCLK_DIVISOR_VGA0);
+	OUTREG(VCLK_DIVISOR_VGA1, intel->saveVCLK_DIVISOR_VGA1);
+	OUTREG(VCLK_POST_DIV, intel->saveVCLK_POST_DIV);
+
+	/* If the pipe A PLL is active, we can restore the pipe & plane config */
+	if (intel->saveDPLL_A & DPLL_VCO_ENABLE) {
+		OUTREG(FPA0, intel->saveFPA0);
+		OUTREG(DPLL_A, intel->saveDPLL_A & ~DPLL_VCO_ENABLE);
+		POSTING_READ(DPLL_A);
+		usleep(150);
+	}
+	OUTREG(FPA0, intel->saveFPA0);
+	OUTREG(FPA1, intel->saveFPA1);
+	OUTREG(DPLL_A, intel->saveDPLL_A);
+	POSTING_READ(DPLL_A);
+	i830_dpll_settle();
+	if (IS_I965G(intel))
+		OUTREG(DPLL_A_MD, intel->saveDPLL_A_MD);
+	else
+		OUTREG(DPLL_A, intel->saveDPLL_A);
+	POSTING_READ(DPLL_A);
+	i830_dpll_settle();
+
+	/* Restore mode config */
+	OUTREG(HTOTAL_A, intel->saveHTOTAL_A);
+	OUTREG(HBLANK_A, intel->saveHBLANK_A);
+	OUTREG(HSYNC_A, intel->saveHSYNC_A);
+	OUTREG(VTOTAL_A, intel->saveVTOTAL_A);
+	OUTREG(VBLANK_A, intel->saveVBLANK_A);
+	OUTREG(VSYNC_A, intel->saveVSYNC_A);
+	OUTREG(BCLRPAT_A, intel->saveBCLRPAT_A);
+
+	OUTREG(DSPASTRIDE, intel->saveDSPASTRIDE);
+	OUTREG(DSPASIZE, intel->saveDSPASIZE);
+	OUTREG(DSPAPOS, intel->saveDSPAPOS);
+	OUTREG(PIPEASRC, intel->savePIPEASRC);
+	OUTREG(DSPABASE, intel->saveDSPABASE);
+	if (IS_I965G(intel)) {
+		OUTREG(DSPASURF, intel->saveDSPASURF);
+		OUTREG(DSPATILEOFF, intel->saveDSPATILEOFF);
+	}
 
-   /* If the pipe A PLL is active, we can restore the pipe & plane config */
-   if (pI830->saveDPLL_A & DPLL_VCO_ENABLE)
-   {
-      OUTREG(FPA0, pI830->saveFPA0);
-      OUTREG(DPLL_A, pI830->saveDPLL_A & ~DPLL_VCO_ENABLE);
-      POSTING_READ(DPLL_A);
-      usleep(150);
-   }
-   OUTREG(FPA0, pI830->saveFPA0);
-   OUTREG(FPA1, pI830->saveFPA1);
-   OUTREG(DPLL_A, pI830->saveDPLL_A);
-   POSTING_READ(DPLL_A);
-   i830_dpll_settle();
-   if (IS_I965G(pI830))
-      OUTREG(DPLL_A_MD, pI830->saveDPLL_A_MD);
-   else
-      OUTREG(DPLL_A, pI830->saveDPLL_A);
-   POSTING_READ(DPLL_A);
-   i830_dpll_settle();
-
-   /* Restore mode config */
-   OUTREG(HTOTAL_A, pI830->saveHTOTAL_A);
-   OUTREG(HBLANK_A, pI830->saveHBLANK_A);
-   OUTREG(HSYNC_A, pI830->saveHSYNC_A);
-   OUTREG(VTOTAL_A, pI830->saveVTOTAL_A);
-   OUTREG(VBLANK_A, pI830->saveVBLANK_A);
-   OUTREG(VSYNC_A, pI830->saveVSYNC_A);
-   OUTREG(BCLRPAT_A, pI830->saveBCLRPAT_A);
-   
-   OUTREG(DSPASTRIDE, pI830->saveDSPASTRIDE);
-   OUTREG(DSPASIZE, pI830->saveDSPASIZE);
-   OUTREG(DSPAPOS, pI830->saveDSPAPOS);
-   OUTREG(PIPEASRC, pI830->savePIPEASRC);
-   OUTREG(DSPABASE, pI830->saveDSPABASE);
-   if (IS_I965G(pI830))
-   {
-      OUTREG(DSPASURF, pI830->saveDSPASURF);
-      OUTREG(DSPATILEOFF, pI830->saveDSPATILEOFF);
-   }
+	OUTREG(PIPEACONF, intel->savePIPEACONF);
+	POSTING_READ(PIPEACONF);
+	i830WaitForVblank(scrn);
 
-   OUTREG(PIPEACONF, pI830->savePIPEACONF);
-   POSTING_READ(PIPEACONF);
-   i830WaitForVblank(pScrn);
-
-   /*
-    * Program Pipe A's plane
-    * The corresponding display plane may be disabled, and should only be
-    * enabled if pipe A is actually on (otherwise we have a bug in the initial
-    * state).
-    */
-   if ((pI830->saveDSPACNTR & DISPPLANE_SEL_PIPE_MASK) ==
-       DISPPLANE_SEL_PIPE_A) {
-       OUTREG(DSPACNTR, pI830->saveDSPACNTR);
-       OUTREG(DSPABASE, INREG(DSPABASE));
-       POSTING_READ(DSPABASE);
-       i830WaitForVblank(pScrn);
-   }
-   if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
-       DISPPLANE_SEL_PIPE_A) {
-       OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
-       OUTREG(DSPBBASE, INREG(DSPBBASE));
-       POSTING_READ(DSPBBASE);
-       i830WaitForVblank(pScrn);
-   }
+	/*
+	 * Program Pipe A's plane
+	 * The corresponding display plane may be disabled, and should only be
+	 * enabled if pipe A is actually on (otherwise we have a bug in the initial
+	 * state).
+	 */
+	if ((intel->saveDSPACNTR & DISPPLANE_SEL_PIPE_MASK) ==
+		DISPPLANE_SEL_PIPE_A) {
+		OUTREG(DSPACNTR, intel->saveDSPACNTR);
+		OUTREG(DSPABASE, INREG(DSPABASE));
+		POSTING_READ(DSPABASE);
+		i830WaitForVblank(scrn);
+	}
+	if ((intel->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
+	    DISPPLANE_SEL_PIPE_A) {
+		OUTREG(DSPBCNTR, intel->saveDSPBCNTR);
+		OUTREG(DSPBBASE, INREG(DSPBBASE));
+		POSTING_READ(DSPBBASE);
+		i830WaitForVblank(scrn);
+	}
 
-   /* See note about pipe programming above */
-   if(xf86_config->num_crtc == 2) 
-   {
-      /* If the pipe B PLL is active, we can restore the pipe & plane config */
-      if (pI830->saveDPLL_B & DPLL_VCO_ENABLE)
-      {
-	 OUTREG(FPB0, pI830->saveFPB0);
-	 OUTREG(DPLL_B, pI830->saveDPLL_B & ~DPLL_VCO_ENABLE);
-	 POSTING_READ(DPLL_B);
-	 usleep(150);
-      }
-      OUTREG(FPB0, pI830->saveFPB0);
-      OUTREG(FPB1, pI830->saveFPB1);
-      OUTREG(DPLL_B, pI830->saveDPLL_B);
-      POSTING_READ(DPLL_B);
-      i830_dpll_settle();
-      if (IS_I965G(pI830))
-	 OUTREG(DPLL_B_MD, pI830->saveDPLL_B_MD);
-      else
-	 OUTREG(DPLL_B, pI830->saveDPLL_B);
-      POSTING_READ(DPLL_B);
-      i830_dpll_settle();
+	/* See note about pipe programming above */
+	if(xf86_config->num_crtc == 2) {
+		/* If the pipe B PLL is active, we can restore the pipe
+		 * & plane config
+		 */
+		if (intel->saveDPLL_B & DPLL_VCO_ENABLE) {
+			OUTREG(FPB0, intel->saveFPB0);
+			OUTREG(DPLL_B, intel->saveDPLL_B & ~DPLL_VCO_ENABLE);
+			POSTING_READ(DPLL_B);
+			usleep(150);
+		}
+		OUTREG(FPB0, intel->saveFPB0);
+		OUTREG(FPB1, intel->saveFPB1);
+		OUTREG(DPLL_B, intel->saveDPLL_B);
+		POSTING_READ(DPLL_B);
+		i830_dpll_settle();
+		if (IS_I965G(intel))
+			OUTREG(DPLL_B_MD, intel->saveDPLL_B_MD);
+		else
+			OUTREG(DPLL_B, intel->saveDPLL_B);
+		POSTING_READ(DPLL_B);
+		i830_dpll_settle();
    
-      /* Restore mode config */
-      OUTREG(HTOTAL_B, pI830->saveHTOTAL_B);
-      OUTREG(HBLANK_B, pI830->saveHBLANK_B);
-      OUTREG(HSYNC_B, pI830->saveHSYNC_B);
-      OUTREG(VTOTAL_B, pI830->saveVTOTAL_B);
-      OUTREG(VBLANK_B, pI830->saveVBLANK_B);
-      OUTREG(VSYNC_B, pI830->saveVSYNC_B);
-      OUTREG(BCLRPAT_B, pI830->saveBCLRPAT_B);
-      OUTREG(DSPBSTRIDE, pI830->saveDSPBSTRIDE);
-      OUTREG(DSPBSIZE, pI830->saveDSPBSIZE);
-      OUTREG(DSPBPOS, pI830->saveDSPBPOS);
-      OUTREG(PIPEBSRC, pI830->savePIPEBSRC);
-      OUTREG(DSPBBASE, pI830->saveDSPBBASE);
-      if (IS_I965G(pI830))
-      {
-	 OUTREG(DSPBSURF, pI830->saveDSPBSURF);
-	 OUTREG(DSPBTILEOFF, pI830->saveDSPBTILEOFF);
-      }
-
-      OUTREG(PIPEBCONF, pI830->savePIPEBCONF);
-      POSTING_READ(PIPEBCONF);
-      i830WaitForVblank(pScrn);
-
-      /*
-       * Program Pipe B's plane
-       * Note that pipe B may be disabled, and in that case, the plane
-       * should also be disabled or we must have had a bad initial state.
-       */
-      if ((pI830->saveDSPACNTR & DISPPLANE_SEL_PIPE_MASK) ==
-	  DISPPLANE_SEL_PIPE_B) {
-	  OUTREG(DSPACNTR, pI830->saveDSPACNTR);
-	  OUTREG(DSPABASE, INREG(DSPABASE));
-	  i830WaitForVblank(pScrn);
-      }
-      if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
-	  DISPPLANE_SEL_PIPE_B) {
-	  OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
-	  OUTREG(DSPBBASE, INREG(DSPBBASE));
-	  i830WaitForVblank(pScrn);
-      }
-   }
-
-   OUTREG(VGACNTRL, pI830->saveVGACNTRL);
-
-   /*
-    * Restore cursors
-    * Even though the X cursor is hidden before we restore the hw state,
-    * we probably only disabled one cursor plane.  If we're going from
-    * e.g. plane b to plane a here in RestoreHWState, we need to restore
-    * both cursor plane settings.
-    */
-   OUTREG(CURSOR_A_POSITION, pI830->saveCURSOR_A_POSITION);
-   OUTREG(CURSOR_A_BASE, pI830->saveCURSOR_A_BASE);
-   OUTREG(CURSOR_A_CONTROL, pI830->saveCURSOR_A_CONTROL);
-   OUTREG(CURSOR_B_POSITION, pI830->saveCURSOR_B_POSITION);
-   OUTREG(CURSOR_B_BASE, pI830->saveCURSOR_B_BASE);
-   OUTREG(CURSOR_B_CONTROL, pI830->saveCURSOR_B_CONTROL);
-
-   /* Restore outputs */
-   for (i = 0; i < xf86_config->num_output; i++) {
-      xf86OutputPtr   output = xf86_config->output[i];
-      if (output->funcs->restore)
-	 output->funcs->restore(output);
-   }
-    
-   i830_restore_palette(pI830, PIPE_A);
-   i830_restore_palette(pI830, PIPE_B);
-
-   for(i = 0; i < 7; i++) {
-      OUTREG(SWF0 + (i << 2), pI830->saveSWF[i]);
-      OUTREG(SWF00 + (i << 2), pI830->saveSWF[i+7]);
-   }
-
-   OUTREG(SWF30, pI830->saveSWF[14]);
-   OUTREG(SWF31, pI830->saveSWF[15]);
-   OUTREG(SWF32, pI830->saveSWF[16]);
-
-   if (pI830->fb_compression) {
-       OUTREG(FBC_CFB_BASE, pI830->saveFBC_CFB_BASE);
-       OUTREG(FBC_LL_BASE, pI830->saveFBC_LL_BASE);
-       OUTREG(FBC_FENCE_OFF, pI830->saveFBC_FENCE_OFF);
-       OUTREG(FBC_CONTROL2, pI830->saveFBC_CONTROL2);
-       OUTREG(FBC_CONTROL, pI830->saveFBC_CONTROL);
-   }
-
-   vgaHWRestore(pScrn, vgaReg, VGA_SR_FONTS);
-   vgaHWLock(hwp);
-
-   return TRUE;
-}
+		/* Restore mode config */
+		OUTREG(HTOTAL_B, intel->saveHTOTAL_B);
+		OUTREG(HBLANK_B, intel->saveHBLANK_B);
+		OUTREG(HSYNC_B, intel->saveHSYNC_B);
+		OUTREG(VTOTAL_B, intel->saveVTOTAL_B);
+		OUTREG(VBLANK_B, intel->saveVBLANK_B);
+		OUTREG(VSYNC_B, intel->saveVSYNC_B);
+		OUTREG(BCLRPAT_B, intel->saveBCLRPAT_B);
+		OUTREG(DSPBSTRIDE, intel->saveDSPBSTRIDE);
+		OUTREG(DSPBSIZE, intel->saveDSPBSIZE);
+		OUTREG(DSPBPOS, intel->saveDSPBPOS);
+		OUTREG(PIPEBSRC, intel->savePIPEBSRC);
+		OUTREG(DSPBBASE, intel->saveDSPBBASE);
+		if (IS_I965G(intel)) {
+			OUTREG(DSPBSURF, intel->saveDSPBSURF);
+			OUTREG(DSPBTILEOFF, intel->saveDSPBTILEOFF);
+		}
 
-static void
-I830PointerMoved(int index, int x, int y)
-{
-   ScrnInfoPtr pScrn = xf86Screens[index];
-   I830Ptr pI830 = I830PTR(pScrn);
-   int newX = x, newY = y;
-
-   switch (pI830->rotation) {
-      case RR_Rotate_0:
-         break;
-      case RR_Rotate_90:
-         newX = y;
-         newY = pScrn->pScreen->width - x - 1;
-         break;
-      case RR_Rotate_180:
-         newX = pScrn->pScreen->width - x - 1;
-         newY = pScrn->pScreen->height - y - 1;
-         break;
-      case RR_Rotate_270:
-         newX = pScrn->pScreen->height - y - 1;
-         newY = x;
-         break;
-   }
+		OUTREG(PIPEBCONF, intel->savePIPEBCONF);
+		POSTING_READ(PIPEBCONF);
+		i830WaitForVblank(scrn);
+
+		/*
+		 * Program Pipe B's plane
+		 * Note that pipe B may be disabled, and in that case, the plane
+		 * should also be disabled or we must have had a bad initial state.
+		 */
+		if ((intel->saveDSPACNTR & DISPPLANE_SEL_PIPE_MASK) ==
+		    DISPPLANE_SEL_PIPE_B) {
+			OUTREG(DSPACNTR, intel->saveDSPACNTR);
+			OUTREG(DSPABASE, INREG(DSPABASE));
+			i830WaitForVblank(scrn);
+		}
+		if ((intel->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
+		    DISPPLANE_SEL_PIPE_B) {
+			OUTREG(DSPBCNTR, intel->saveDSPBCNTR);
+			OUTREG(DSPBBASE, INREG(DSPBBASE));
+			i830WaitForVblank(scrn);
+		}
+	}
 
-   (*pI830->PointerMoved)(index, newX, newY);
-}
+	OUTREG(VGACNTRL, intel->saveVGACNTRL);
 
-static Bool
-I830InitFBManager(
-    ScreenPtr pScreen,  
-    BoxPtr FullBox
-){
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   RegionRec ScreenRegion;
-   RegionRec FullRegion;
-   BoxRec ScreenBox;
-   Bool ret;
-
-   ScreenBox.x1 = 0;
-   ScreenBox.y1 = 0;
-   ScreenBox.x2 = pScrn->displayWidth;
-   if (pScrn->virtualX > pScrn->virtualY)
-      ScreenBox.y2 = pScrn->virtualX;
-   else
-      ScreenBox.y2 = pScrn->virtualY;
-
-   if((FullBox->x1 >  ScreenBox.x1) || (FullBox->y1 >  ScreenBox.y1) ||
-      (FullBox->x2 <  ScreenBox.x2) || (FullBox->y2 <  ScreenBox.y2)) {
-	return FALSE;   
-   }
+	/*
+	 * Restore cursors
+	 * Even though the X cursor is hidden before we restore the hw state,
+	 * we probably only disabled one cursor plane.  If we're going from
+	 * e.g. plane b to plane a here in RestoreHWState, we need to restore
+	 * both cursor plane settings.
+	 */
+	OUTREG(CURSOR_A_POSITION, intel->saveCURSOR_A_POSITION);
+	OUTREG(CURSOR_A_BASE, intel->saveCURSOR_A_BASE);
+	OUTREG(CURSOR_A_CONTROL, intel->saveCURSOR_A_CONTROL);
+	OUTREG(CURSOR_B_POSITION, intel->saveCURSOR_B_POSITION);
+	OUTREG(CURSOR_B_BASE, intel->saveCURSOR_B_BASE);
+	OUTREG(CURSOR_B_CONTROL, intel->saveCURSOR_B_CONTROL);
+
+	/* Restore outputs */
+	for (i = 0; i < xf86_config->num_output; i++) {
+		xf86OutputPtr   output = xf86_config->output[i];
+		if (output->funcs->restore)
+			output->funcs->restore(output);
+	}
 
-   if (FullBox->y2 < FullBox->y1) return FALSE;
-   if (FullBox->x2 < FullBox->x2) return FALSE;
+	i830_restore_palette(intel, PIPE_A);
+	i830_restore_palette(intel, PIPE_B);
 
-   REGION_INIT(pScreen, &ScreenRegion, &ScreenBox, 1); 
-   REGION_INIT(pScreen, &FullRegion, FullBox, 1); 
+	for(i = 0; i < 7; i++) {
+		OUTREG(SWF0 + (i << 2), intel->saveSWF[i]);
+		OUTREG(SWF00 + (i << 2), intel->saveSWF[i+7]);
+	}
 
-   REGION_SUBTRACT(pScreen, &FullRegion, &FullRegion, &ScreenRegion);
+	OUTREG(SWF30, intel->saveSWF[14]);
+	OUTREG(SWF31, intel->saveSWF[15]);
+	OUTREG(SWF32, intel->saveSWF[16]);
+
+	if (intel->fb_compression) {
+		OUTREG(FBC_CFB_BASE, intel->saveFBC_CFB_BASE);
+		OUTREG(FBC_LL_BASE, intel->saveFBC_LL_BASE);
+		OUTREG(FBC_FENCE_OFF, intel->saveFBC_FENCE_OFF);
+		OUTREG(FBC_CONTROL2, intel->saveFBC_CONTROL2);
+		OUTREG(FBC_CONTROL, intel->saveFBC_CONTROL);
+	}
 
-   ret = xf86InitFBManagerRegion(pScreen, &FullRegion);
+	vgaHWRestore(scrn, vgaReg, VGA_SR_FONTS);
+	vgaHWLock(hwp);
 
-   REGION_UNINIT(pScreen, &ScreenRegion);
-   REGION_UNINIT(pScreen, &FullRegion);
-    
-   return ret;
+	return TRUE;
 }
 
 /**
@@ -2598,160 +2132,123 @@ I830InitFBManager(
  * function is also responsible for marking the state as clobbered for DRI
  * clients.
  */
-void
-IntelEmitInvarientState(ScrnInfoPtr pScrn)
+void IntelEmitInvarientState(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   if (pI830->accel == ACCEL_NONE)
-      return;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-#ifdef XF86DRI
-   if (pI830->directRenderingType == DRI_XF86DRI) {
-      drmI830Sarea *sarea = DRIGetSAREAPrivate(pScrn->pScreen);
-
-      /* Mark that the X Server was the last holder of the context */
-      if (sarea)
-	 sarea->ctxOwner = DRIGetContext(pScrn->pScreen);
-   }
-#endif
-
-   /* If we've emitted our state since the last clobber by another client,
-    * skip it.
-    */
-   if (pI830->last_3d != LAST_3D_OTHER)
-      return;
-
-   if (!IS_I965G(pI830))
-   {
-      if (IS_I9XX(pI830))
-         I915EmitInvarientState(pScrn);
-      else
-         I830EmitInvarientState(pScrn);
-   }
+	/* If we've emitted our state since the last clobber by another client,
+	 * skip it.
+	 */
+	if (intel->last_3d != LAST_3D_OTHER)
+		return;
+
+	if (!IS_I965G(intel)) {
+		if (IS_I9XX(intel))
+			I915EmitInvarientState(scrn);
+		else
+			I830EmitInvarientState(scrn);
+	}
 }
 
 static void
-I830BlockHandler(int i,
-		 pointer blockData, pointer pTimeout, pointer pReadmask)
+I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[i];
-    ScrnInfoPtr pScrn = xf86Screens[i];
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    pScreen->BlockHandler = pI830->BlockHandler;
-
-    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-
-    pI830->BlockHandler = pScreen->BlockHandler;
-    pScreen->BlockHandler = I830BlockHandler;
-
-    if (pScrn->vtSema && pI830->accel != ACCEL_NONE) {
-       Bool flushed = FALSE;
-       /* Emit a flush of the rendering cache, or on the 965 and beyond
-	* rendering results may not hit the framebuffer until significantly
-	* later.
-	*/
-       if (pI830->accel != ACCEL_NONE && (pI830->need_mi_flush || pI830->batch_used))
-       {
-	  flushed = TRUE;
-	  I830EmitFlush(pScrn);
-       }
-
-       /* Flush the batch, so that any rendering is executed in a timely
-	* fashion.
-	*/
-       intel_batch_flush(pScrn, flushed);
-#ifdef XF86DRI
-       if (pI830->memory_manager)
-	 drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE);
-#endif
-
-       pI830->need_mi_flush = FALSE;
-    }
+	ScreenPtr screen = screenInfo.screens[i];
+	ScrnInfoPtr scrn = xf86Screens[i];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	screen->BlockHandler = intel->BlockHandler;
+
+	(*screen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+
+	intel->BlockHandler = screen->BlockHandler;
+	screen->BlockHandler = I830BlockHandler;
+
+	if (scrn->vtSema) {
+		/* Emit a flush of the rendering cache, or on the 965 and beyond
+		 * rendering results may not hit the framebuffer until significantly
+		 * later.
+		 */
+		intel_batch_submit(scrn,
+				   intel->need_mi_flush ||
+				   !list_is_empty(&intel->flush_pixmaps));
+		drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
+	}
 
-#ifdef I830_USE_UXA
-    if (pI830->accel == ACCEL_UXA)
-	i830_uxa_block_handler (pScreen);
-#endif
+	i830_uxa_block_handler(screen);
 
-    I830VideoBlockHandler(i, blockData, pTimeout, pReadmask);
+	I830VideoBlockHandler(i, blockData, pTimeout, pReadmask);
 }
 
-static void
-i830_fixup_mtrrs(ScrnInfoPtr pScrn)
+static void i830_fixup_mtrrs(ScrnInfoPtr scrn)
 {
 #ifdef HAS_MTRR_SUPPORT
-    I830Ptr pI830 = I830PTR(pScrn);
-    int fd;
-    struct mtrr_gentry gentry;
-    struct mtrr_sentry sentry;
-
-    if ( ( fd = open ("/proc/mtrr", O_RDONLY, 0) ) != -1 ) {
-	for (gentry.regnum = 0; ioctl (fd, MTRRIOC_GET_ENTRY, &gentry) == 0;
-		++gentry.regnum) {
-
-	    if (gentry.size < 1) {
-		/* DISABLED */
-		continue;
-	    }
-
-	    /* Check the MTRR range is one we like and if not - remove it.
-	     * The Xserver common layer will then setup the right range
-	     * for us.
-	     */
-	    if (gentry.base == pI830->LinearAddr && 
-		    gentry.size < pI830->FbMapSize) {
-
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-			"Removing bad MTRR range (base 0x%lx, size 0x%x)\n",
-			gentry.base, gentry.size);
-
-		sentry.base = gentry.base;
-		sentry.size = gentry.size;
-		sentry.type = gentry.type;
-
-		if (ioctl (fd, MTRRIOC_DEL_ENTRY, &sentry) == -1) {
-		    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			    "Failed to remove bad MTRR range\n");
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int fd;
+	struct mtrr_gentry gentry;
+	struct mtrr_sentry sentry;
+
+	if ((fd = open("/proc/mtrr", O_RDONLY, 0)) != -1) {
+		for (gentry.regnum = 0;
+		     ioctl(fd, MTRRIOC_GET_ENTRY, &gentry) == 0;
+		     ++gentry.regnum) {
+
+			if (gentry.size < 1) {
+				/* DISABLED */
+				continue;
+			}
+
+			/* Check the MTRR range is one we like and if not - remove it.
+			 * The Xserver common layer will then setup the right range
+			 * for us.
+			 */
+			if (gentry.base == intel->LinearAddr &&
+			    gentry.size < intel->FbMapSize) {
+
+				xf86DrvMsg(scrn->scrnIndex, X_INFO,
+					   "Removing bad MTRR range (base 0x%lx, size 0x%x)\n",
+					   gentry.base, gentry.size);
+
+				sentry.base = gentry.base;
+				sentry.size = gentry.size;
+				sentry.type = gentry.type;
+
+				if (ioctl(fd, MTRRIOC_DEL_ENTRY, &sentry) == -1) {
+					xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+						   "Failed to remove bad MTRR range\n");
+				}
+			}
 		}
-	    }
+		close(fd);
 	}
-	close(fd);
-    }
 #endif
 }
 
-static Bool
-i830_try_memory_allocation(ScrnInfoPtr pScrn)
+static Bool i830_try_memory_allocation(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    Bool tiled = pI830->tiling;
-    Bool xf86dri = pI830->directRenderingType == DRI_XF86DRI;
-
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	    "Attempting memory allocation with %stiled buffers.\n",
-	    tiled ? "" : "un");
-
-    if (!i830_allocate_2d_memory(pScrn))
-	goto failed;
-
-    if (IS_I965GM(pI830) || IS_GM45(pI830))
-	if (!i830_allocate_pwrctx(pScrn))
-	    goto failed;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	Bool tiled = intel->tiling;
 
-    if (xf86dri && !i830_allocate_3d_memory(pScrn))
-	goto failed;
-
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%siled allocation successful.\n",
-	    tiled ? "T" : "Unt");
-    return TRUE;
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
+		   "Attempting memory allocation with %stiled buffers.\n",
+		   tiled ? "" : "un");
+
+	if (!i830_allocate_2d_memory(scrn))
+		goto failed;
+
+	if (IS_I965GM(intel) || IS_GM45(intel))
+		if (!i830_allocate_pwrctx(scrn))
+			goto failed;
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "%siled allocation successful.\n",
+		   tiled ? "T" : "Unt");
+	return TRUE;
 
 failed:
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%siled allocation failed.\n",
-	    tiled ? "T" : "Unt");
-    return FALSE;
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "%siled allocation failed.\n",
+		   tiled ? "T" : "Unt");
+	return FALSE;
 }
+
 /*
  * Try to allocate memory in several ways:
  *  1) If direct rendering is enabled, try to allocate enough memory for tiled
@@ -2761,1012 +2258,812 @@ failed:
  *  3) And if all else fails, disable DRI and try just 2D allocations.
  *  4) Give up and fail ScreenInit.
  */
-static Bool
-i830_memory_init(ScrnInfoPtr pScrn)
+static Bool i830_memory_init(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int savedDisplayWidth = pScrn->displayWidth;
-    Bool tiled = FALSE;
-
-    tiled = i830_tiled_width(pI830, &pScrn->displayWidth, pI830->cpp);
-    /* Set up our video memory allocator for the chosen videoRam */
-    if (!i830_allocator_init(pScrn, 0, pScrn->videoRam * KB(1))) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		"Couldn't initialize video memory allocator\n");
-	PreInitCleanup(pScrn);
-	return FALSE;
-    }
-
-    xf86DrvMsg(pScrn->scrnIndex,
-	    pI830->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
-	    "VideoRam: %d KB\n", pScrn->videoRam);
-
-    if (xf86GetOptValInteger(pI830->Options, OPTION_CACHE_LINES,
-		&(pI830->CacheLines))) {
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Requested %d cache lines\n",
-		pI830->CacheLines);
-    } else {
-	pI830->CacheLines = -1;
-    }
-
-    /* Tiled first if we got a good displayWidth */
-    if (tiled) {
-	if (i830_try_memory_allocation(pScrn))
-	    return TRUE;
-	else {
-	    i830_reset_allocations(pScrn);
-	    pI830->tiling = FALSE;
-	}
-    }
-
-    /* If tiling fails we have to disable FBC */
-    pScrn->displayWidth = savedDisplayWidth;
-    if (pI830->fb_compression)
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Couldn't allocate tiled memory, fb compression "
-		"disabled\n");
-    pI830->fb_compression = FALSE;
-
-    /* Try again, but leave DRI enabled */
-    if (pI830->directRenderingType == DRI_XF86DRI) {
-	if (i830_try_memory_allocation(pScrn))
-	    return TRUE;
-	else {
-	    i830_reset_allocations(pScrn);
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Couldn't allocate 3D memory, "
-		    "disabling DRI.\n");
-	    pI830->directRenderingType = DRI_NONE;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int savedDisplayWidth = scrn->displayWidth;
+	Bool tiled = FALSE;
+
+	tiled = i830_tiled_width(intel, &scrn->displayWidth, intel->cpp);
+	/* Set up our video memory allocator for the chosen videoRam */
+	if (!i830_allocator_init(scrn, scrn->videoRam * KB(1))) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Couldn't initialize video memory allocator\n");
+		PreInitCleanup(scrn);
+		return FALSE;
 	}
-    }
-
-    if (i830_try_memory_allocation(pScrn))
-	return TRUE;
-
-    return FALSE;
-}
-
-void
-i830_init_bufmgr(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   if (pI830->bufmgr)
-       return;
 
-   if (pI830->memory_manager || pI830->use_drm_mode) {
-      int batch_size;
-
-      batch_size = 4096 * 4;
-
-      /* The 865 has issues with larger-than-page-sized batch buffers. */
-      if (IS_I865G(pI830))
-	 batch_size = 4096;
-
-      pI830->bufmgr = intel_bufmgr_gem_init(pI830->drmSubFD, batch_size);
-      intel_bufmgr_gem_enable_reuse(pI830->bufmgr);
-   } else {
-      assert(pI830->FbBase != NULL);
-      pI830->bufmgr = intel_bufmgr_fake_init(pI830->drmSubFD,
-					     pI830->fake_bufmgr_mem->offset,
-					     pI830->FbBase +
-					     pI830->fake_bufmgr_mem->offset,
-					     pI830->fake_bufmgr_mem->size,
-					     NULL);
-   }
-}
-
-
-static void
-I830AdjustMemory(ScreenPtr pScreen)
-{
-   ScrnInfoPtr pScrn;
-   I830Ptr pI830;
-   unsigned long sys_mem;
-   MessageType from;
-
-   pScrn = xf86Screens[pScreen->myNum];
-   pI830 = I830PTR(pScrn);
-
-   /* Limit videoRam to how much we might be able to allocate from AGP */
-   sys_mem = I830CheckAvailableMemory(pScrn);
-   if (sys_mem == -1) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "/dev/agpgart is either not available, or no memory "
-		 "is available\nfor allocation.  Please enable agpgart\n.");
-      pScrn->videoRam = pI830->stolen_size / KB(1);
-   }
-   if (sys_mem + (pI830->stolen_size / 1024) < pScrn->videoRam) {
-      pScrn->videoRam = sys_mem + (pI830->stolen_size / 1024);
-      from = X_PROBED;
-      if (sys_mem + (pI830->stolen_size / 1024) <
-	  pI830->pEnt->device->videoRam) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		    "VideoRAM reduced to %d kByte "
-		    "(limited to available sysmem)\n", pScrn->videoRam);
-      }
-   }
+	xf86DrvMsg(scrn->scrnIndex,
+		   intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
+		   "VideoRam: %d KB\n", scrn->videoRam);
+
+	/* Tiled first if we got a good displayWidth */
+	if (tiled) {
+		if (i830_try_memory_allocation(scrn))
+			return TRUE;
+		else {
+			i830_reset_allocations(scrn);
+			intel->tiling = FALSE;
+		}
+	}
 
-   /* Limit video RAM to the actual aperture size */
-   if (pScrn->videoRam > pI830->FbMapSize / 1024) {
-      pScrn->videoRam = pI830->FbMapSize / 1024;
-      if (pI830->FbMapSize / 1024 < pI830->pEnt->device->videoRam) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		    "VideoRam reduced to %d kByte (limited to aperture "
-		    "size)\n",
-		    pScrn->videoRam);
-      }
-   }
+	/* If tiling fails we have to disable FBC */
+	scrn->displayWidth = savedDisplayWidth;
+	if (intel->fb_compression)
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+		    "Couldn't allocate tiled memory, fb compression "
+		    "disabled\n");
+	intel->fb_compression = FALSE;
 
-   /* Make sure it's on a page boundary */
-   if (pScrn->videoRam & 3) {
-      xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "VideoRam reduced to %d KB "
-		 "(page aligned - was %d KB)\n",
-		 pScrn->videoRam & ~3, pScrn->videoRam);
-      pScrn->videoRam &= ~3;
-   }
+	if (i830_try_memory_allocation(scrn))
+		return TRUE;
 
-   if (!IS_I965G(pI830) && pScrn->displayWidth > 2048) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "Cannot support DRI with frame buffer width > 2048.\n");
-      pI830->directRenderingType = DRI_DISABLED;
-   }
+	return FALSE;
 }
 
-static void
-I830SwapPipes(ScrnInfoPtr pScrn)
+void i830_init_bufmgr(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-   xf86CrtcConfigPtr config;
-   int c;
-
-   config = XF86_CRTC_CONFIG_PTR(pScrn);
-
-   /*
-    * If an LVDS display is present, swap the plane/pipe mappings so we can
-    * use FBC on the builtin display.
-    * Note: 965+ chips can compress either plane, so we leave the mapping
-    *       alone in that case.
-    * Also make sure the DRM can handle the swap.
-    */
-   if (I830LVDSPresent(pScrn) && !IS_I965GM(pI830) && !IS_GM45(pI830) &&
-       (pI830->directRenderingType != DRI_XF86DRI ||
-	(pI830->directRenderingType == DRI_XF86DRI && pI830->drmMinor >= 10))) {
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "adjusting plane->pipe mappings "
-		  "to allow for framebuffer compression\n");
-       for (c = 0; c < config->num_crtc; c++) {
-	   xf86CrtcPtr	      crtc = config->crtc[c];
-	   I830CrtcPrivatePtr   intel_crtc = crtc->driver_private;
-
-	   if (intel_crtc->pipe == 0)
-	       intel_crtc->plane = 1;
-	   else if (intel_crtc->pipe == 1)
-	       intel_crtc->plane = 0;
-      }
-   }
-}
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int batch_size;
 
-static void
-i830_disable_render_standby(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-   uint32_t render_standby;
+	if (intel->bufmgr)
+		return;
 
-   /* Render Standby might cause hang issue, try always disable it.*/
-   if (IS_I965GM(pI830) || IS_GM45(pI830)) {
-       render_standby = INREG(MCHBAR_RENDER_STANDBY);
-       if (render_standby & RENDER_STANDBY_ENABLE) {
-	   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disable render standby.\n");
-	   OUTREG(MCHBAR_RENDER_STANDBY,
-		   (render_standby & (~RENDER_STANDBY_ENABLE)));
-       }
-   }
+	batch_size = 4096 * 4;
+
+	/* The 865 has issues with larger-than-page-sized batch buffers. */
+	if (IS_I865G(intel))
+		batch_size = 4096;
+
+	intel->bufmgr = intel_bufmgr_gem_init(intel->drmSubFD, batch_size);
+	intel_bufmgr_gem_enable_reuse(intel->bufmgr);
+	drm_intel_bufmgr_gem_enable_fenced_relocs(intel->bufmgr);
+
+	list_init(&intel->batch_pixmaps);
+	list_init(&intel->flush_pixmaps);
+	list_init(&intel->in_flight);
 }
 
-static Bool
-I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+Bool i830_crtc_on(xf86CrtcPtr crtc)
 {
-   ScrnInfoPtr pScrn;
-   vgaHWPtr hwp = NULL;
-   I830Ptr pI830;
-   VisualPtr visual;
-   MessageType from;
-
-   pScrn = xf86Screens[pScreen->myNum];
-   pI830 = I830PTR(pScrn);
-
-   if (!pI830->use_drm_mode)
-       hwp = VGAHWPTR(pScrn);
-
-   pScrn->displayWidth = i830_pad_drawable_width(pScrn->virtualX, pI830->cpp);
-
-   /*
-    * The "VideoRam" config file parameter specifies the maximum amount of
-    * memory that will be used/allocated.  When not present, we allow the
-    * driver to allocate as much memory as it wishes to satisfy its
-    * allocations, but if agpgart support isn't available, it gets limited
-    * to the amount of pre-allocated ("stolen") memory.
-    *
-    * Note that in using this value for allocator initialization, we're
-    * limiting aperture allocation to the VideoRam option, rather than limiting
-    * actual memory allocation, so alignment and things will cause less than
-    * VideoRam to be actually used.
-    */
-   if (pI830->pEnt->device->videoRam == 0) {
-      from = X_DEFAULT;
-      pScrn->videoRam = pI830->FbMapSize / KB(1);
-   } else {
-#if 0
-      from = X_CONFIG;
-      pScrn->videoRam = pI830->pEnt->device->videoRam;
-#else
-      /* Disable VideoRam configuration, at least for now.  Previously,
-       * VideoRam was necessary to avoid overly low limits on allocated
-       * memory, so users created larger, yet still small, fixed allocation
-       * limits in their config files.  Now, the driver wants to allocate more,
-       * and the old intention of the VideoRam lines that had been entered is
-       * obsolete.
-       */
-      from = X_DEFAULT;
-      pScrn->videoRam = pI830->FbMapSize / KB(1);
+	ScrnInfoPtr scrn = crtc->scrn;
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-      if (pScrn->videoRam != pI830->pEnt->device->videoRam) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		    "VideoRam configuration found, which is no longer "
-		    "recommended.\n");
-	 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		    "Continuing with default %dkB VideoRam instead of %d "
-		    "kB.\n",
-		    pScrn->videoRam, pI830->pEnt->device->videoRam);
-      }
-#endif
-   }
+	if (intel->use_drm_mode) {
+		int i, active_outputs = 0;
 
-   if (pI830->use_drm_mode) {
-#ifdef XF86DRM_MODE
-       pI830->stolen_size = 0;
-       pScrn->videoRam = ~0UL / KB(1);
-#endif
-   } else {
-       I830AdjustMemory(pScreen);
-   }
+		/* Kernel manages CRTC status based out output config */
+		for (i = 0; i < xf86_config->num_output; i++) {
+			xf86OutputPtr output = xf86_config->output[i];
+			if (output->crtc == crtc &&
+			    drmmode_output_dpms_status(output) == DPMSModeOn)
+				active_outputs++;
+		}
 
-#ifdef DRI2
-   if (pI830->directRenderingType == DRI_NONE && I830DRI2ScreenInit(pScreen))
-       pI830->directRenderingType = DRI_DRI2;
-#endif
+		if (active_outputs)
+			return TRUE;
+		return FALSE;
+	} else {
+		I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
 
-#ifdef XF86DRI
-   /* If DRI hasn't been explicitly disabled, try to initialize it.
-    * It will be used by the memory allocator.
-    */
-   if (!pI830->can_resize && pI830->directRenderingType == DRI_NONE && I830DRIScreenInit(pScreen))
-       pI830->directRenderingType = DRI_XF86DRI;
-#endif
+		if (intel_crtc->dpms_mode == DPMSModeOn)
+			return TRUE;
+		return FALSE;
+	}
+}
 
-   /* Enable tiling by default */
-   pI830->tiling = TRUE;
+int i830_crtc_to_pipe(xf86CrtcPtr crtc)
+{
+	ScrnInfoPtr scrn = crtc->scrn;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int pipe;
 
-   /* Allow user override if they set a value */
-   if (xf86IsOptionSet(pI830->Options, OPTION_TILING)) {
-       if (xf86ReturnOptValBool(pI830->Options, OPTION_TILING, FALSE))
-	   pI830->tiling = TRUE;
-       else
-	   pI830->tiling = FALSE;
-   }
+	if (intel->use_drm_mode) {
+		pipe = drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
+	} else {
+		I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
+		pipe = intel_crtc->pipe;
+	}
 
-   /* Enable FB compression if possible */
-   if (i830_fb_compression_supported(pI830))
-       pI830->fb_compression = TRUE;
-   else
-       pI830->fb_compression = FALSE;
+	return pipe;
+}
 
-   /* Again, allow user override if set */
-   if (xf86IsOptionSet(pI830->Options, OPTION_FBC)) {
-       if (xf86ReturnOptValBool(pI830->Options, OPTION_FBC, FALSE))
-	   pI830->fb_compression = TRUE;
-       else
-	   pI830->fb_compression = FALSE;
-   }
+static void
+I830AdjustMemory(ScreenPtr screen)
+{
+	ScrnInfoPtr scrn;
+	intel_screen_private *intel;
+	unsigned long sys_mem;
+	MessageType from;
 
-   if (pI830->use_drm_mode && pI830->fb_compression == TRUE) {
-       xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-		  "Kernel mode setting active, disabling FBC.\n");
-       pI830->fb_compression = FALSE;
-   }
+	scrn = xf86Screens[screen->myNum];
+	intel = intel_get_screen_private(scrn);
 
-   xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Framebuffer compression %sabled\n",
-	      pI830->fb_compression ? "en" : "dis");
-   xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Tiling %sabled\n", pI830->tiling ?
-	      "en" : "dis");
-
-   pI830->last_3d = LAST_3D_OTHER;
-   pI830->overlayOn = FALSE;
-
-#ifdef I830_XV
-    /*
-     * Set this so that the overlay allocation is factored in when
-     * appropriate.
-     */
-    pI830->XvEnabled = TRUE;
-#endif
+	/* Limit videoRam to how much we might be able to allocate from AGP */
+	sys_mem = I830CheckAvailableMemory(scrn);
+	if (sys_mem == -1) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+		    "/dev/agpgart is either not available, or no memory "
+		    "is available\nfor allocation.  Please enable agpgart\n.");
+		scrn->videoRam = intel->stolen_size / KB(1);
+	}
+	if (sys_mem + (intel->stolen_size / 1024) < scrn->videoRam) {
+		scrn->videoRam = sys_mem + (intel->stolen_size / 1024);
+		from = X_PROBED;
+		if (sys_mem + (intel->stolen_size / 1024) <
+		    intel->pEnt->device->videoRam) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			    "VideoRAM reduced to %d kByte "
+			    "(limited to available sysmem)\n", scrn->videoRam);
+		}
+	}
 
+	/* Limit video RAM to the actual aperture size */
+	if (scrn->videoRam > intel->FbMapSize / 1024) {
+		scrn->videoRam = intel->FbMapSize / 1024;
+		if (intel->FbMapSize / 1024 < intel->pEnt->device->videoRam) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			    "VideoRam reduced to %d kByte (limited to aperture "
+			    "size)\n", scrn->videoRam);
+		}
+	}
 
-   /* Need MMIO mapped to do GTT lookups during memory allocation. */
-   if (!pI830->use_drm_mode)
-       I830MapMMIO(pScrn);
-
-   if (!i830_memory_init(pScrn)) {
-       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-	       "Couldn't allocate video memory\n");
-       return FALSE;
-   }
+	/* Make sure it's on a page boundary */
+	if (scrn->videoRam & 3) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING, "VideoRam reduced to "
+		    "%d KB (page aligned - was %d KB)\n", scrn->videoRam & ~3,
+		    scrn->videoRam);
+		scrn->videoRam &= ~3;
+	}
 
-   I830UnmapMMIO(pScrn);
+	if (!IS_I965G(intel) && scrn->displayWidth > 2048) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+		    "Cannot support DRI with frame buffer width > 2048.\n");
+		intel->directRenderingType = DRI_DISABLED;
+	}
+}
 
-   i830_fixup_mtrrs(pScrn);
+static void
+I830SwapPipes(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	xf86CrtcConfigPtr config;
+	int c;
+
+	config = XF86_CRTC_CONFIG_PTR(scrn);
+
+	/*
+	 * If an LVDS display is present, swap the plane/pipe mappings so we can
+	 * use FBC on the builtin display.
+	 * Note: 965+ chips can compress either plane, so we leave the mapping
+	 *       alone in that case.
+	 * Also make sure the DRM can handle the swap.
+	 */
+	if (I830LVDSPresent(scrn) && !IS_I965GM(intel) && !IS_GM45(intel) &&
+	    !IS_IGDNG(intel)) {
+		xf86DrvMsg(scrn->scrnIndex, X_INFO, "adjusting plane->pipe "
+		    "mappings to allow for framebuffer compression\n");
+		for (c = 0; c < config->num_crtc; c++) {
+			xf86CrtcPtr	      crtc = config->crtc[c];
+			I830CrtcPrivatePtr   intel_crtc = crtc->driver_private;
+
+			if (intel_crtc->pipe == 0)
+				intel_crtc->plane = 1;
+			else if (intel_crtc->pipe == 1)
+				intel_crtc->plane = 0;
+		}
+	}
+}
 
-   pI830->starting = TRUE;
+static void
+i830_disable_render_standby(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint32_t render_standby;
 
-   miClearVisualTypes();
-   if (!miSetVisualTypes(pScrn->depth,
-			    miGetDefaultVisualMask(pScrn->depth),
-			    pScrn->rgbBits, pScrn->defaultVisual))
-	 return FALSE;
-   if (!miSetPixmapDepths())
-      return FALSE;
+	/* Render Standby might cause hang issue, try always disable it.*/
+	if (IS_I965GM(intel) || IS_GM45(intel)) {
+		render_standby = INREG(MCHBAR_RENDER_STANDBY);
+		if (render_standby & RENDER_STANDBY_ENABLE) {
+			xf86DrvMsg(scrn->scrnIndex, X_INFO, "Disable render standby.\n");
+			    OUTREG(MCHBAR_RENDER_STANDBY,
+			    (render_standby & (~RENDER_STANDBY_ENABLE)));
+	       }
+	}
+}
 
-#ifdef I830_XV
-   if (pI830->accel == ACCEL_NONE) {
-      xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Xv is disabled because it "
-		 "needs 2D acceleration.\n");
-      pI830->XvEnabled = FALSE;
-   }
+static Bool
+I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	vgaHWPtr hwp = NULL;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	VisualPtr visual;
+	MessageType from;
+
+	if (!intel->use_drm_mode)
+		hwp = VGAHWPTR(scrn);
+
+	scrn->displayWidth = i830_pad_drawable_width(scrn->virtualX);
+
+	/*
+	 * The "VideoRam" config file parameter specifies the maximum amount of
+	 * memory that will be used/allocated.  When not present, we allow the
+	 * driver to allocate as much memory as it wishes to satisfy its
+	 * allocations, but if agpgart support isn't available, it gets limited
+	 * to the amount of pre-allocated ("stolen") memory.
+	 *
+	 * Note that in using this value for allocator initialization, we're
+	 * limiting aperture allocation to the VideoRam option, rather than limiting
+	 * actual memory allocation, so alignment and things will cause less than
+	 * VideoRam to be actually used.
+	 */
+	if (intel->pEnt->device->videoRam == 0) {
+		from = X_DEFAULT;
+		scrn->videoRam = intel->FbMapSize / KB(1);
+	} else {
+#if 0
+		from = X_CONFIG;
+		scrn->videoRam = intel->pEnt->device->videoRam;
 #else
-   pI830->XvEnabled = FALSE;
+		/* Disable VideoRam configuration, at least for now.  Previously,
+		 * VideoRam was necessary to avoid overly low limits on allocated
+		 * memory, so users created larger, yet still small, fixed allocation
+		 * limits in their config files.  Now, the driver wants to allocate more,
+		 * and the old intention of the VideoRam lines that had been entered is
+		 * obsolete.
+		 */
+		from = X_DEFAULT;
+		scrn->videoRam = intel->FbMapSize / KB(1);
+
+		if (scrn->videoRam != intel->pEnt->device->videoRam) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "VideoRam configuration found, which is no longer "
+				   "recommended.\n");
+			xf86DrvMsg(scrn->scrnIndex, X_INFO,
+				   "Continuing with default %dkB VideoRam instead of %d "
+				   "kB.\n",
+				   scrn->videoRam,
+				   intel->pEnt->device->videoRam);
+		}
 #endif
+	}
 
-   if (pI830->accel != ACCEL_NONE && !pI830->use_drm_mode) {
-      if (pI830->memory_manager == NULL && pI830->ring.mem->size == 0) {
-	  xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		     "Disabling acceleration because the ring buffer "
-		      "allocation failed.\n");
-	   pI830->accel = ACCEL_NONE;
-      }
-   }
-
-   if (!pI830->use_drm_mode) {
-      DPRINTF(PFX, "assert( if(!I830MapMem(pScrn)) )\n");
-      if (!I830MapMem(pScrn))
-	 return FALSE;
-      pScrn->memPhysBase = (unsigned long)pI830->FbBase;
-   }
-   i830_init_bufmgr(pScrn);
-
-#ifdef XF86DRI
-   /*
-    * Setup DRI after visuals have been established, but before fbScreenInit
-    * is called.   fbScreenInit will eventually call into the drivers
-    * InitGLXVisuals call back.
-    */
-   if (pI830->directRenderingType == DRI_XF86DRI) {
-      if (pI830->accel == ACCEL_NONE) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "DRI is disabled because it "
-		    "needs 2D acceleration.\n");
-	 pI830->directRenderingType = DRI_NONE;
-      }
-   }
+	if (intel->use_drm_mode) {
+		struct pci_device *const device = intel->PciInfo;
+		int fb_bar = IS_I9XX(intel) ? 2 : 0;
 
-   if (pI830->directRenderingType == DRI_XF86DRI &&
-       !I830DRIDoMappings(pScreen))
-       pI830->directRenderingType = DRI_NONE;
-
-   /* If we failed for any reason, free DRI memory. */
-   if (pI830->directRenderingType != DRI_XF86DRI &&
-       pI830->back_buffer != NULL)
-       i830_free_3d_memory(pScrn);
+		scrn->videoRam = device->regions[fb_bar].size / 1024;
+	} else {
+		I830AdjustMemory(screen);
+	}
 
-   if (!pI830->use_drm_mode)
-       I830SwapPipes(pScrn);
+#ifdef DRI2
+	if (intel->directRenderingType == DRI_NONE
+	    && I830DRI2ScreenInit(screen))
+		intel->directRenderingType = DRI_DRI2;
 #endif
 
-   pScrn->fbOffset = pI830->front_buffer->offset;
-
-   pI830->xoffset = (pScrn->fbOffset / pI830->cpp) % pScrn->displayWidth;
-   pI830->yoffset = (pScrn->fbOffset / pI830->cpp) / pScrn->displayWidth;
-
-   if (!pI830->use_drm_mode) {
-       vgaHWSetMmioFuncs(hwp, pI830->MMIOBase, 0);
-       vgaHWGetIOBase(hwp);
-       DPRINTF(PFX, "assert( if(!vgaHWMapMem(pScrn)) )\n");
-       if (!vgaHWMapMem(pScrn))
-	   return FALSE;
-   }
-
-   DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");
-
-   if (pI830->accel <= ACCEL_XAA) {
-      if (!I830InitFBManager(pScreen, &(pI830->FbMemBox))) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "Failed to init memory manager\n");
-      }
-   }
+	/* Enable tiling by default */
+	intel->tiling = TRUE;
+
+	/* Allow user override if they set a value */
+	if (xf86IsOptionSet(intel->Options, OPTION_TILING)) {
+		if (xf86ReturnOptValBool(intel->Options, OPTION_TILING, FALSE))
+			intel->tiling = TRUE;
+		else
+			intel->tiling = FALSE;
+	}
 
-    if (pScrn->virtualX > pScrn->displayWidth)
-	pScrn->displayWidth = pScrn->virtualX;
+	/* Enable FB compression if possible */
+	if (i830_fb_compression_supported(intel))
+		intel->fb_compression = TRUE;
+	else
+		intel->fb_compression = FALSE;
 
-   DPRINTF(PFX, "assert( if(!fbScreenInit(pScreen, ...) )\n");
-   if (!fbScreenInit(pScreen, pI830->FbBase + pScrn->fbOffset, 
-                     pScrn->virtualX, pScrn->virtualY,
-		     pScrn->xDpi, pScrn->yDpi,
-		     pScrn->displayWidth, pScrn->bitsPerPixel))
-      return FALSE;
+	/* Again, allow user override if set */
+	if (xf86IsOptionSet(intel->Options, OPTION_FBC)) {
+		if (xf86ReturnOptValBool(intel->Options, OPTION_FBC, FALSE))
+			intel->fb_compression = TRUE;
+	else
+		intel->fb_compression = FALSE;
+	}
 
-   if (pScrn->bitsPerPixel > 8) {
-      /* Fixup RGB ordering */
-      visual = pScreen->visuals + pScreen->numVisuals;
-      while (--visual >= pScreen->visuals) {
-	 if ((visual->class | DynamicClass) == DirectColor) {
-	    visual->offsetRed = pScrn->offset.red;
-	    visual->offsetGreen = pScrn->offset.green;
-	    visual->offsetBlue = pScrn->offset.blue;
-	    visual->redMask = pScrn->mask.red;
-	    visual->greenMask = pScrn->mask.green;
-	    visual->blueMask = pScrn->mask.blue;
-	 }
-      }
-   }
+	if (intel->use_drm_mode && intel->fb_compression == TRUE) {
+		xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
+		    "Kernel mode setting active, disabling FBC.\n");
+		intel->fb_compression = FALSE;
+	}
 
-   fbPictureInit(pScreen, NULL, 0);
+	/* SwapBuffers delays to avoid tearing */
+	intel->swapbuffers_wait = TRUE;
 
-   xf86SetBlackWhitePixels(pScreen);
+	/* Allow user override if they set a value */
+	if (xf86IsOptionSet(intel->Options, OPTION_SWAPBUFFERS_WAIT)) {
+		if (xf86ReturnOptValBool
+		    (intel->Options, OPTION_SWAPBUFFERS_WAIT, FALSE))
+			intel->swapbuffers_wait = TRUE;
+		else
+			intel->swapbuffers_wait = FALSE;
+	}
 
-   xf86DiDGAInit (pScreen, pI830->LinearAddr + pScrn->fbOffset);
+	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer compression %sabled\n",
+		   intel->fb_compression ? "en" : "dis");
+	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Tiling %sabled\n",
+		   intel->tiling ? "en" : "dis");
+	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "SwapBuffers wait %sabled\n",
+		   intel->swapbuffers_wait ? "en" : "dis");
+
+	intel->last_3d = LAST_3D_OTHER;
+	intel->overlayOn = FALSE;
+
+	/*
+	 * Set this so that the overlay allocation is factored in when
+	 * appropriate.
+	 */
+	intel->XvEnabled = TRUE;
+
+	/* Need MMIO mapped to do GTT lookups during memory allocation. */
+	if (!intel->use_drm_mode)
+		I830MapMMIO(scrn);
+
+	/* Need FB mapped to access non-GEM objects like
+	 * a UMS frame buffer, or the fake bufmgr.
+	 */
+	if (!intel->use_drm_mode) {
+		if (!I830MapMem(scrn))
+			return FALSE;
+		scrn->memPhysBase = (unsigned long)intel->FbBase;
+	}
 
-   DPRINTF(PFX,
-	   "assert( if(!I830InitFBManager(pScreen, &(pI830->FbMemBox))) )\n");
+	if (!i830_memory_init(scrn)) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Couldn't allocate video memory\n");
+		return FALSE;
+	}
 
-   if (pI830->accel != ACCEL_NONE) {
-      if (!I830AccelInit(pScreen)) {
-	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "Hardware acceleration initialization failed\n");
-      }
-   }
+	i830_fixup_mtrrs(scrn);
 
-   if (IS_I965G(pI830))
-       pI830->batch_flush_notify = i965_batch_flush_notify;
-   else if (IS_I9XX(pI830))
-       pI830->batch_flush_notify = i915_batch_flush_notify;
-   else
-       pI830->batch_flush_notify = NULL;
+	intel->starting = TRUE;
 
-   miInitializeBackingStore(pScreen);
-   xf86SetBackingStore(pScreen);
-   xf86SetSilkenMouse(pScreen);
-   miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
-
-   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing HW Cursor\n");
-   if (!I830CursorInit(pScreen))
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "Hardware cursor initialization failed\n");
-
-#ifdef XF86DRI
-   /* Must be called before EnterVT, so we can acquire the DRI lock when
-    * binding our memory.
-    */
-   if (pI830->directRenderingType == DRI_XF86DRI &&
-       !I830DRIFinishScreenInit(pScreen))
-       pI830->directRenderingType = DRI_NONE;
-#endif
+	miClearVisualTypes();
+	if (!miSetVisualTypes(scrn->depth,
+			      miGetDefaultVisualMask(scrn->depth),
+			      scrn->rgbBits, scrn->defaultVisual))
+		return FALSE;
+	if (!miSetPixmapDepths())
+		return FALSE;
+
+	if (!intel->use_drm_mode) {
+		vgaHWSetMmioFuncs(hwp, intel->MMIOBase, 0);
+		vgaHWGetIOBase(hwp);
+		DPRINTF(PFX, "assert( if(!vgaHWMapMem(scrn)) )\n");
+		if (!vgaHWMapMem(scrn))
+			return FALSE;
+	}
 
-   /* Must force it before EnterVT, so we are in control of VT and
-    * later memory should be bound when allocating, e.g rotate_mem */
-   pScrn->vtSema = TRUE;
+	DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");
 
-   if (!I830EnterVT(scrnIndex, 0))
-      return FALSE;
+	if (scrn->virtualX > scrn->displayWidth)
+		scrn->displayWidth = scrn->virtualX;
 
-   pI830->BlockHandler = pScreen->BlockHandler;
-   pScreen->BlockHandler = I830BlockHandler;
+	/* If the front buffer is not a BO, we need to
+	 * set the initial framebuffer pixmap to point at
+	 * it
+	 */
+	scrn->fbOffset = intel->front_buffer->offset;
+
+	DPRINTF(PFX, "assert( if(!fbScreenInit(screen, ...) )\n");
+	if (!fbScreenInit(screen, NULL,
+			  scrn->virtualX, scrn->virtualY,
+			  scrn->xDpi, scrn->yDpi,
+			  scrn->displayWidth, scrn->bitsPerPixel))
+		return FALSE;
+
+	if (scrn->bitsPerPixel > 8) {
+		/* Fixup RGB ordering */
+		visual = screen->visuals + screen->numVisuals;
+		while (--visual >= screen->visuals) {
+			if ((visual->class | DynamicClass) == DirectColor) {
+				visual->offsetRed = scrn->offset.red;
+				visual->offsetGreen = scrn->offset.green;
+				visual->offsetBlue = scrn->offset.blue;
+				visual->redMask = scrn->mask.red;
+				visual->greenMask = scrn->mask.green;
+				visual->blueMask = scrn->mask.blue;
+			}
+		}
+	}
 
-   pScreen->SaveScreen = xf86SaveScreen;
-   pI830->CloseScreen = pScreen->CloseScreen;
-   pScreen->CloseScreen = I830CloseScreen;
-   pI830->CreateScreenResources = pScreen->CreateScreenResources;
-   pScreen->CreateScreenResources = i830CreateScreenResources;
+	fbPictureInit(screen, NULL, 0);
 
-   if (!xf86CrtcScreenInit (pScreen))
-       return FALSE;
+	xf86SetBlackWhitePixels(screen);
 
-   DPRINTF(PFX, "assert( if(!miCreateDefColormap(pScreen)) )\n");
-   if (!miCreateDefColormap(pScreen))
-      return FALSE;
+	if (!I830AccelInit(screen)) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Hardware acceleration initialization failed\n");
+		return FALSE;
+	}
 
-   DPRINTF(PFX, "assert( if(!xf86HandleColormaps(pScreen, ...)) )\n");
-   if (!xf86HandleColormaps(pScreen, 256, 8, I830LoadPalette, NULL,
-			    CMAP_RELOAD_ON_MODE_SWITCH |
-			    CMAP_PALETTED_TRUECOLOR)) {
-      return FALSE;
-   }
+	if (IS_I965G(intel)) {
+		intel->batch_flush_notify = i965_batch_flush_notify;
+	} else if (IS_I9XX(intel)) {
+		intel->vertex_flush = i915_vertex_flush;
+		intel->batch_flush_notify = i915_batch_flush_notify;
+	} else
+		intel->batch_flush_notify = i830_batch_flush_notify;
+
+	miInitializeBackingStore(screen);
+	xf86SetBackingStore(screen);
+	xf86SetSilkenMouse(screen);
+	miDCInitialize(screen, xf86GetPointerScreenFuncs());
+
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "Initializing HW Cursor\n");
+	if (!I830CursorInit(screen))
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+		    "Hardware cursor initialization failed\n");
+
+	/* Must force it before EnterVT, so we are in control of VT and
+	 * later memory should be bound when allocating, e.g rotate_mem */
+	scrn->vtSema = TRUE;
+
+	if (!I830EnterVT(scrnIndex, 0))
+		return FALSE;
+
+	intel->BlockHandler = screen->BlockHandler;
+	screen->BlockHandler = I830BlockHandler;
+
+	screen->SaveScreen = xf86SaveScreen;
+	intel->CloseScreen = screen->CloseScreen;
+	screen->CloseScreen = I830CloseScreen;
+	intel->CreateScreenResources = screen->CreateScreenResources;
+	screen->CreateScreenResources = i830CreateScreenResources;
+
+	if (!xf86CrtcScreenInit(screen))
+		return FALSE;
+
+	DPRINTF(PFX, "assert( if(!miCreateDefColormap(screen)) )\n");
+	if (!miCreateDefColormap(screen))
+		return FALSE;
+
+	DPRINTF(PFX, "assert( if(!xf86HandleColormaps(screen, ...)) )\n");
+	if (!xf86HandleColormaps(screen, 256, 8, I830LoadPalette, NULL,
+				 CMAP_RELOAD_ON_MODE_SWITCH |
+				 CMAP_PALETTED_TRUECOLOR)) {
+		return FALSE;
+	}
 
-   xf86DPMSInit(pScreen, xf86DPMSSet, 0);
+	xf86DPMSInit(screen, xf86DPMSSet, 0);
 
-#ifdef I830_XV
 #ifdef INTEL_XVMC
-    pI830->XvMCEnabled = FALSE;
-    from =  (pI830->directRenderingType == DRI_XF86DRI &&
-	     xf86GetOptValBool(pI830->Options, OPTION_XVMC,
-			       &pI830->XvMCEnabled)) ? X_CONFIG : X_DEFAULT;
-    xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
-	       pI830->XvMCEnabled ? "en" : "dis");
-#endif
-   /* Init video */
-   if (pI830->XvEnabled)
-      I830InitVideo(pScreen);
-#endif
+	if (IS_I965G(intel))
+		intel->XvMCEnabled = TRUE;
+	from = ((intel->directRenderingType == DRI_DRI2) &&
+		xf86GetOptValBool(intel->Options, OPTION_XVMC,
+				  &intel->XvMCEnabled) ? X_CONFIG : X_DEFAULT);
+	xf86DrvMsg(scrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
+		   intel->XvMCEnabled ? "en" : "dis");
+#endif
+	/* Init video */
+	if (intel->XvEnabled)
+		I830InitVideo(screen);
 
-   /* Setup 3D engine, needed for rotation too */
-   IntelEmitInvarientState(pScrn);
-
-#if defined(XF86DRI) || defined(DRI2)
-   switch (pI830->directRenderingType) {
-   case DRI_XF86DRI:
-      pI830->directRenderingOpen = TRUE;
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		 "direct rendering: XF86DRI Enabled\n");
-      break;
-   case DRI_DRI2:
-      pI830->directRenderingOpen = TRUE;
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: DRI2 Enabled\n");
-      break;
-   case DRI_DISABLED:
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Disabled\n");
-      break;
-   case DRI_NONE:
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Failed\n");
-      break;
-   }
+#if defined(DRI2)
+	switch (intel->directRenderingType) {
+	case DRI_DRI2:
+		intel->directRenderingOpen = TRUE;
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "direct rendering: DRI2 Enabled\n");
+		break;
+	case DRI_DISABLED:
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "direct rendering: Disabled\n");
+		break;
+	case DRI_NONE:
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "direct rendering: Failed\n");
+		break;
+	}
 #else
-   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Not available\n");
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
+		   "direct rendering: Not available\n");
 #endif
 
+	if (serverGeneration == 1)
+		xf86ShowUnusedOptions(scrn->scrnIndex, scrn->options);
 
-   /* Wrap pointer motion to flip touch screen around */
-   pI830->PointerMoved = pScrn->PointerMoved;
-   pScrn->PointerMoved = I830PointerMoved;
-
-   if (serverGeneration == 1)
-      xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
-
-   pI830->starting = FALSE;
-   pI830->closing = FALSE;
-   pI830->suspended = FALSE;
+	intel->starting = FALSE;
+	intel->closing = FALSE;
+	intel->suspended = FALSE;
 
-   return TRUE;
+	return uxa_resources_init(screen);
 }
 
-static void
-i830AdjustFrame(int scrnIndex, int x, int y, int flags)
+static void i830AdjustFrame(int scrnIndex, int x, int y, int flags)
 {
-   ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-   xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);
-   I830Ptr pI830 = I830PTR(pScrn);
+   ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+   xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+   intel_screen_private *intel = intel_get_screen_private(scrn);
    xf86OutputPtr  output = config->output[config->compat_output];
    xf86CrtcPtr	crtc = output->crtc;
 
    DPRINTF(PFX, "i830AdjustFrame: y = %d (+ %d), x = %d (+ %d)\n",
-	   x, pI830->xoffset, y, pI830->yoffset);
+	   x, crtc->desiredX, y, crtc->desiredY);
 
-   if (pI830->use_drm_mode)
+   if (intel->use_drm_mode)
       return;
 
    if (crtc && crtc->enabled)
    {
       /* Sync the engine before adjust frame */
-      i830WaitSync(pScrn);
+      intel_sync(scrn);
       i830PipeSetBase(crtc, crtc->desiredX + x, crtc->desiredY + y);
       crtc->x = output->initial_x + x;
       crtc->y = output->initial_y + y;
    }
 }
 
-static void
-I830FreeScreen(int scrnIndex, int flags)
-{
-#ifdef INTEL_XVMC
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-    I830Ptr pI830 = I830PTR(pScrn);
-    if (pI830 && pI830->XvMCEnabled)
-	intel_xvmc_finish(xf86Screens[scrnIndex]);
-#endif
-   I830FreeRec(xf86Screens[scrnIndex]);
-   if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
-      vgaHWFreeHWRec(xf86Screens[scrnIndex]);
-}
-
-static void
-I830LeaveVT(int scrnIndex, int flags)
+static void I830FreeScreen(int scrnIndex, int flags)
 {
-   ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-   I830Ptr pI830 = I830PTR(pScrn);
-   int ret;
-#ifndef HAVE_FREE_SHADOW
-   xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-   int o;
-#endif
+	ScrnInfoPtr scrn = xf86Screens[scrnIndex];
 
-   DPRINTF(PFX, "Leave VT\n");
+	i830_close_drm_master(scrn);
 
-   pI830->leaving = TRUE;
-
-   if (pI830->devicesTimer)
-      TimerFree(pI830->devicesTimer);
-   pI830->devicesTimer = NULL;
+	I830FreeRec(xf86Screens[scrnIndex]);
+	if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
+		vgaHWFreeHWRec(xf86Screens[scrnIndex]);
+}
 
-   i830SetHotkeyControl(pScrn, HOTKEY_BIOS_SWITCH);
+static void I830LeaveVT(int scrnIndex, int flags)
+{
+	ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int ret;
 
-#ifdef XF86DRI
-   if (pI830->directRenderingOpen &&
-       pI830->directRenderingType == DRI_XF86DRI) {
-      DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
+	DPRINTF(PFX, "Leave VT\n");
 
-      if (!pI830->memory_manager) {
-	  I830DRISetVBlankInterrupt (pScrn, FALSE);
-	  drmCtlUninstHandler(pI830->drmSubFD);
-      }
-   }
-#endif
+	intel->leaving = TRUE;
 
-#ifndef HAVE_FREE_SHADOW
-   for (o = 0; o < config->num_crtc; o++) {
-       xf86CrtcPtr crtc = config->crtc[o];
-
-       if (crtc->rotatedPixmap || crtc->rotatedData) {
-	   crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap,
-				crtc->rotatedData);
-	   crtc->rotatedPixmap = NULL;
-	   crtc->rotatedData = NULL;
-       }
-   }
-#else
-   xf86RotateFreeShadow(pScrn);
-#endif
+	i830SetHotkeyControl(scrn, HOTKEY_BIOS_SWITCH);
 
-   xf86_hide_cursors (pScrn);
+	xf86RotateFreeShadow(scrn);
 
-   I830Sync(pScrn);
+	xf86_hide_cursors(scrn);
 
-   if (!pI830->use_drm_mode) {
-       RestoreHWState(pScrn);
-       /* Evict everything from the bufmgr, as we're about to lose ownership of
-	* the graphics memory.
-	*/
-       if (!pI830->memory_manager)
-	   intel_bufmgr_fake_evict_all(pI830->bufmgr);
+	if (!intel->use_drm_mode) {
+		RestoreHWState(scrn);
 
-       if (!pI830->memory_manager)
-	   i830_stop_ring(pScrn, TRUE);
+		/* console restore hack */
+		if (IS_IGDNG(intel) && intel->int10 && intel->int10Mode) {
+		    xf86Int10InfoPtr int10 = intel->int10;
 
-       if (pI830->debug_modes) {
-	   i830CompareRegsToSnapshot(pScrn, "After LeaveVT");
-	   i830DumpRegs (pScrn);
-       }
-   }
+		    /* Use int10 to restore the console mode */
+		    int10->num = 0x10;
+		    int10->ax = 0x4f02;
+		    int10->bx = intel->int10Mode | 0x8000;
+		    int10->cx = int10->dx = 0;
+		    xf86ExecX86int10(int10);
+		}
 
-   intel_batch_teardown(pScrn);
+	}
 
-   i830_unbind_all_memory(pScrn);
+	intel_batch_teardown(scrn);
 
-#ifdef XF86DRI
-   if (pI830->memory_manager && !pI830->use_drm_mode) {
-      int ret;
+	i830_unbind_all_memory(scrn);
 
-      /* Tell the kernel to evict all buffer objects and block GTT usage while
-       * we're no longer in control of the chip.
-       */
-      ret = drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_LEAVEVT);
-      if (ret != 0)
-	 FatalError("DRM_I915_LEAVEVT failed: %s\n", strerror(ret));
-   }
-#endif /* XF86DRI */
+	if (!intel->use_drm_mode) {
+		int ret;
 
-   if ((pI830->accel == ACCEL_EXA || pI830->accel == ACCEL_UXA) && IS_I965G(pI830))
-      gen4_render_state_cleanup(pScrn);
+		/* Tell the kernel to evict all buffer objects and block GTT
+		 * usage while we're no longer in control of the chip.
+		 */
+		ret = drmCommandNone(intel->drmSubFD, DRM_I915_GEM_LEAVEVT);
+		if (ret != 0)
+			FatalError("DRM_I915_LEAVEVT failed: %s\n",
+			    strerror(ret));
+		}
 
-   if (pI830->AccelInfoRec)
-      pI830->AccelInfoRec->NeedToSync = FALSE;
+	if (IS_I965G(intel))
+		gen4_render_state_cleanup(scrn);
 
-#ifdef XF86DRI
-   ret = drmDropMaster(pI830->drmSubFD);
-   if (ret)
-      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		 "drmDropMaster failed: %s\n", strerror(ret));
-#endif
+	ret = drmDropMaster(intel->drmSubFD);
+	if (ret)
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "drmDropMaster failed: %s\n", strerror(errno));
 }
 
 /*
  * This gets called when gaining control of the VT, and from ScreenInit().
  */
-static Bool
-I830EnterVT(int scrnIndex, int flags)
+static Bool I830EnterVT(int scrnIndex, int flags)
 {
-   ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-   xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-   I830Ptr  pI830 = I830PTR(pScrn);
-   int i, ret;
-
-   DPRINTF(PFX, "Enter VT\n");
-
-#ifdef XF86DRI
-   ret = drmSetMaster(pI830->drmSubFD);
-   if (ret)
-      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		 "drmDropMaster failed: %s\n", strerror(ret));
-#endif
-
-   /*
-    * Only save state once per server generation since that's what most
-    * drivers do.  Could change this to save state at each VT enter.
-    */
-   if (pI830->SaveGeneration != serverGeneration) {
-      pI830->SaveGeneration = serverGeneration;
-      if (!pI830->use_drm_mode)
-	  SaveHWState(pScrn);
-   }
-
-   /* Get the hardware into a known state if needed */
-   if (!pI830->use_drm_mode) {
-       /* Disable outputs */
-       for (i = 0; i < xf86_config->num_output; i++) {
-	   xf86OutputPtr   output = xf86_config->output[i];
-	   output->funcs->dpms(output, DPMSModeOff);
-       }
-       i830WaitForVblank(pScrn);
-
-       /* Disable pipes */
-       for (i = 0; i < xf86_config->num_crtc; i++) {
-	   xf86CrtcPtr crtc = xf86_config->crtc[i];
-	   i830_crtc_disable(crtc, TRUE);
-       }
-       i830WaitForVblank(pScrn);
-   }
-
-   pI830->leaving = FALSE;
+	ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int i, ret;
+
+	DPRINTF(PFX, "Enter VT\n");
+
+	ret = drmSetMaster(intel->drmSubFD);
+	if (ret) {
+		if (errno == EINVAL) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "drmSetMaster failed: 2.6.29 or newer kernel required for "
+				   "multi-server DRI\n");
+		} else {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "drmSetMaster failed: %s\n",
+				   strerror(errno));
+		}
+	}
 
-   if (!pI830->use_drm_mode)
-       i830_disable_render_standby(pScrn);
+	/*
+	 * Only save state once per server generation since that's what most
+	 * drivers do.  Could change this to save state at each VT enter.
+	 */
+	if (intel->SaveGeneration != serverGeneration) {
+		intel->SaveGeneration = serverGeneration;
+		if (!intel->use_drm_mode)
+			SaveHWState(scrn);
+	}
 
-#ifdef XF86DRI
-   if (pI830->memory_manager && !pI830->use_drm_mode) {
-      int ret;
+	/* Get the hardware into a known state if needed */
+	if (!intel->use_drm_mode) {
 
-      /* Tell the kernel that we're back in control and ready for GTT
-       * usage.
-       */
-      ret = drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_ENTERVT);
-      if (ret != 0)
-	 FatalError("DRM_I915_ENTERVT failed: %s\n", strerror(ret));
-   }
-#endif /* XF86DRI */
+		I830SwapPipes(scrn);
 
-   if (!i830_bind_all_memory(pScrn))
-      return FALSE;
+		/* Disable outputs */
+		for (i = 0; i < xf86_config->num_output; i++) {
+			xf86OutputPtr   output = xf86_config->output[i];
+			output->funcs->dpms(output, DPMSModeOff);
+		}
+		i830WaitForVblank(scrn);
 
-   i830_describe_allocations(pScrn, 1, "");
+		/* Disable pipes */
+		for (i = 0; i < xf86_config->num_crtc; i++) {
+			xf86CrtcPtr crtc = xf86_config->crtc[i];
+			if (IS_IGDNG(intel))
+			    ironlake_crtc_disable(crtc);
+			else
+			    i830_crtc_disable(crtc, TRUE);
+		}
+		i830WaitForVblank(scrn);
+	}
 
-   /* Update the screen pixmap in case the buffer moved */
-   i830_update_front_offset(pScrn);
+	intel->leaving = FALSE;
 
-   intel_batch_init(pScrn);
+	if (!intel->use_drm_mode) {
+		int ret;
 
-   if ((pI830->accel == ACCEL_EXA || pI830->accel == ACCEL_UXA) &&
-       IS_I965G(pI830))
-      gen4_render_state_init(pScrn);
-
-   if (!pI830->use_drm_mode) {
-       if (i830_check_error_state(pScrn)) {
-	   xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		      "Existing errors found in hardware state.\n");
-       }
-
-       /* Re-set up the ring. */
-       if (!pI830->memory_manager) {
-	   i830_stop_ring(pScrn, FALSE);
-	   i830_start_ring(pScrn);
-       }
-       I830InitHWCursor(pScrn);
-
-       /* Tell the BIOS that we're in control of mode setting now. */
-       i830_init_bios_control(pScrn);
-
-       i830_init_clock_gating(pScrn);
-
-       if (pI830->power_context)
-	   OUTREG(PWRCTXA, pI830->power_context->offset | PWRCTX_EN);
-       /* Clear the framebuffer */
-       memset(pI830->FbBase + pScrn->fbOffset, 0,
-	      pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
-   }
+		i830_disable_render_standby(scrn);
 
-   if (!xf86SetDesiredModes (pScrn))
-      return FALSE;
+		/* Tell the kernel that we're back in control and ready for GTT
+		 * usage.
+		 */
+		ret = drmCommandNone(intel->drmSubFD, DRM_I915_GEM_ENTERVT);
+		if (ret != 0)
+			FatalError("DRM_I915_ENTERVT failed: %s\n",
+			    strerror(ret));
+	}
 
-   if (!pI830->use_drm_mode) {
-       if (pI830->debug_modes) {
-	   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Hardware state at EnterVT:\n");
-	   i830DumpRegs (pScrn);
-       }
-       i830DescribeOutputConfiguration(pScrn);
-   }
+	if (!i830_bind_all_memory(scrn))
+		return FALSE;
 
-#ifdef XF86DRI
-   if (pI830->directRenderingType == DRI_XF86DRI) {
-       /* HW status is fixed, we need to set it up before any drm
-	* operation which accessing that page, like irq install, etc.
-	*/
-       if (pI830->starting && !pI830->memory_manager) {
-	   if (pI830->hw_status != NULL && !I830DRISetHWS(pScrn)) {
-		   xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "Fail to setup hardware status page.\n");
-		   I830DRICloseScreen(pScrn->pScreen);
-		   return FALSE;
-	   }
-	   if (!pI830->memory_manager && !I830DRIInstIrqHandler(pScrn)) {
-	       I830DRICloseScreen(pScrn->pScreen);
-	       return FALSE;
-	   }
-       }
+	i830_describe_allocations(scrn, 1, "");
 
-      /* Update buffer offsets in sarea and mappings, since buffer offsets
-       * may have changed.
-       */
-      if (!i830_update_dri_buffers(pScrn))
-	 FatalError("i830_update_dri_buffers() failed\n");
+	intel_batch_init(scrn);
 
-      I830DRISetVBlankInterrupt (pScrn, TRUE);
+	if (IS_I965G(intel))
+		gen4_render_state_init(scrn);
 
-      if (!pI830->starting) {
-         ScreenPtr pScreen = pScrn->pScreen;
-         drmI830Sarea *sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen);
-         int i;
+	if (!intel->use_drm_mode) {
+		I830InitHWCursor(scrn);
 
-	 I830DRIResume(screenInfo.screens[scrnIndex]);
+		/* Tell the BIOS that we're in control of mode setting now. */
+		i830_init_bios_control(scrn);
 
-	 if (!pI830->memory_manager)
-	    i830_refresh_ring(pScrn);
-	 I830Sync(pScrn);
+		i830_init_clock_gating(scrn);
 
-	 sarea->texAge++;
-	 for(i = 0; i < I830_NR_TEX_REGIONS+1 ; i++)
-	    sarea->texList[i].age = sarea->texAge;
+		if (intel->power_context)
+			OUTREG(PWRCTXA, intel->power_context->offset |
+			    PWRCTX_EN);
+		/* Clear the framebuffer */
+		memset(intel->FbBase + scrn->fbOffset, 0,
+			scrn->virtualY * scrn->displayWidth * intel->cpp);
+	}
 
-	 DPRINTF(PFX, "calling dri unlock\n");
-	 DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
-      }
-      pI830->LockHeld = 0;
-   }
-#endif
+	if (!xf86SetDesiredModes(scrn))
+		return FALSE;
 
-   /* Set the hotkey to just notify us.  We could check its results
-    * periodically and attempt to do something, but it seems like we basically
-    * never get results when we should, and this should all be better handled
-    * through ACPI putting the key events out through evdev and your desktop
-    * environment picking it up.
-    */
-   i830SetHotkeyControl(pScrn, HOTKEY_DRIVER_NOTIFY);
+	if (!intel->use_drm_mode) {
+		i830DescribeOutputConfiguration(scrn);
+	}
 
-   /* Mark 3D state as being clobbered and setup the basics */
-   pI830->last_3d = LAST_3D_OTHER;
-   IntelEmitInvarientState(pScrn);
+	/* Set the hotkey to just notify us.  We could check its results
+	 * periodically and attempt to do something, but it seems like we
+	 * basically never get results when we should, and this should all
+	 * be better handled through ACPI putting the key events out through
+	 * evdev and your desktop environment picking it up.
+	*/
+	i830SetHotkeyControl(scrn, HOTKEY_DRIVER_NOTIFY);
 
-   return TRUE;
+	return TRUE;
 }
 
-static Bool
-I830SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+static Bool I830SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
-   ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-   I830Ptr pI830 = I830PTR(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[scrnIndex];
 
-   return xf86SetSingleMode (pScrn, mode, pI830->rotation);
+	return xf86SetSingleMode(scrn, mode, RR_Rotate_0);
 }
 
-static Bool
-I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
+static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen)
 {
-   ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-   I830Ptr pI830 = I830PTR(pScrn);
-#ifdef I830_USE_XAA
-   XAAInfoRecPtr infoPtr = pI830->AccelInfoRec;
-#endif
+	ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   pI830->closing = TRUE;
+	intel->closing = TRUE;
 
-   if (pScrn->vtSema == TRUE) {
-      I830LeaveVT(scrnIndex, 0);
-   }
+	if (scrn->vtSema == TRUE) {
+		I830LeaveVT(scrnIndex, 0);
+	}
 
-   if (pI830->devicesTimer)
-      TimerFree(pI830->devicesTimer);
-   pI830->devicesTimer = NULL;
-
-   if (!pI830->use_drm_mode) {
-       DPRINTF(PFX, "\nUnmapping memory\n");
-       I830UnmapMem(pScrn);
-       vgaHWUnmapMem(pScrn);
-   }
+	if (!intel->use_drm_mode) {
+		DPRINTF(PFX, "\nUnmapping memory\n");
+		I830UnmapMem(scrn);
+		vgaHWUnmapMem(scrn);
+	}
 
-   if (pI830->ScanlineColorExpandBuffers) {
-      xfree(pI830->ScanlineColorExpandBuffers);
-      pI830->ScanlineColorExpandBuffers = NULL;
-   }
-#ifdef I830_USE_XAA
-   if (infoPtr) {
-      if (infoPtr->ScanlineColorExpandBuffers)
-	 xfree(infoPtr->ScanlineColorExpandBuffers);
-      XAADestroyInfoRec(infoPtr);
-      pI830->AccelInfoRec = NULL;
-   }
-#endif
-#ifdef I830_USE_EXA
-   if (pI830->EXADriverPtr) {
-       exaDriverFini(pScreen);
-       xfree(pI830->EXADriverPtr);
-       pI830->EXADriverPtr = NULL;
-   }
-#endif
-#ifdef I830_USE_UXA
-   if (pI830->uxa_driver) {
-       uxa_driver_fini (pScreen);
-       xfree (pI830->uxa_driver);
-       pI830->uxa_driver = NULL;
-   }
-#endif
-   xf86_cursors_fini (pScreen);
+	if (intel->uxa_driver) {
+		uxa_driver_fini(screen);
+		free(intel->uxa_driver);
+		intel->uxa_driver = NULL;
+	}
+	if (intel->front_buffer) {
+		i830_set_pixmap_bo(screen->GetScreenPixmap(screen), NULL);
+		if (intel->use_drm_mode)
+			drmmode_closefb(scrn);
+		i830_free_memory(scrn, intel->front_buffer);
+		intel->front_buffer = NULL;
+	}
 
-   i830_allocator_fini(pScrn);
+	xf86_cursors_fini(screen);
 
-#ifdef I830_XV
-   i965_free_video(pScrn);
-#endif
+	i830_allocator_fini(scrn);
 
-   dri_bufmgr_destroy(pI830->bufmgr);
-   pI830->bufmgr = NULL;
+	i965_free_video(scrn);
+	free(intel->offscreenImages);
+	intel->offscreenImages = NULL;
 
-#ifdef XF86DRI
-   if (pI830->directRenderingOpen &&
-       pI830->directRenderingType == DRI_XF86DRI) {
-      pI830->directRenderingOpen = FALSE;
-      I830DRICloseScreen(pScreen);
-   }
-#endif
+	screen->CloseScreen = intel->CloseScreen;
+	(*screen->CloseScreen) (scrnIndex, screen);
 
-#ifdef DRI2
-   if (pI830->directRenderingOpen && pI830->directRenderingType == DRI_DRI2) {
-      pI830->directRenderingOpen = FALSE;
-      I830DRI2CloseScreen(pScreen);
-   }
-#endif
+	if (intel->directRenderingOpen
+	    && intel->directRenderingType == DRI_DRI2) {
+		intel->directRenderingOpen = FALSE;
+		I830DRI2CloseScreen(screen);
+	}
 
-   xf86GARTCloseScreen(scrnIndex);
+	xf86GARTCloseScreen(scrnIndex);
 
-   pScrn->PointerMoved = pI830->PointerMoved;
-   pScrn->vtSema = FALSE;
-   pI830->closing = FALSE;
-   pScreen->CloseScreen = pI830->CloseScreen;
-   return (*pScreen->CloseScreen) (scrnIndex, pScreen);
+	scrn->vtSema = FALSE;
+	intel->closing = FALSE;
+	return TRUE;
 }
 
 static ModeStatus
 I830ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
-   if (mode->Flags & V_INTERLACE) {
-      if (verbose) {
-	 xf86DrvMsg(scrnIndex, X_PROBED,
-		    "Removing interlaced mode \"%s\"\n", mode->name);
-      }
-      return MODE_BAD;
-   }
-   return MODE_OK;
+	if (mode->Flags & V_INTERLACE) {
+		if (verbose) {
+			xf86DrvMsg(scrnIndex, X_PROBED,
+				   "Removing interlaced mode \"%s\"\n",
+				   mode->name);
+		}
+		return MODE_BAD;
+	}
+	return MODE_OK;
 }
 
 #ifndef SUSPEND_SLEEP
@@ -3781,192 +3078,88 @@ I830ValidMode(int scrnIndex, DisplayMode
  * DoApmEvent() in common/xf86PM.c, including if we want to see events other
  * than suspend/resume.
  */
-static Bool
-I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
-{
-   ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   DPRINTF(PFX, "Enter VT, event %d, undo: %s\n", event, BOOLTOSTRING(undo));
- 
-   switch(event) {
-   case XF86_APM_SYS_SUSPEND:
-   case XF86_APM_CRITICAL_SUSPEND: /*do we want to delay a critical suspend?*/
-   case XF86_APM_USER_SUSPEND:
-   case XF86_APM_SYS_STANDBY:
-   case XF86_APM_USER_STANDBY:
-      if (!undo && !pI830->suspended) {
-	 pScrn->LeaveVT(scrnIndex, 0);
-	 pI830->suspended = TRUE;
-	 sleep(SUSPEND_SLEEP);
-      } else if (undo && pI830->suspended) {
-	 sleep(RESUME_SLEEP);
-	 pScrn->EnterVT(scrnIndex, 0);
-	 pI830->suspended = FALSE;
-      }
-      break;
-   case XF86_APM_STANDBY_RESUME:
-   case XF86_APM_NORMAL_RESUME:
-   case XF86_APM_CRITICAL_RESUME:
-      if (pI830->suspended) {
-	 sleep(RESUME_SLEEP);
-	 pScrn->EnterVT(scrnIndex, 0);
-	 pI830->suspended = FALSE;
-	 /*
-	  * Turn the screen saver off when resuming.  This seems to be
-	  * needed to stop xscreensaver kicking in (when used).
-	  *
-	  * XXX DoApmEvent() should probably call this just like
-	  * xf86VTSwitch() does.  Maybe do it here only in 4.2
-	  * compatibility mode.
-	  */
-	 SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
-      }
-      break;
-   /* This is currently used for ACPI */
-   case XF86_APM_CAPABILITY_CHANGED:
-      ErrorF("I830PMEvent: Capability change\n");
-
-      SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
-      if (pI830->quirk_flag & QUIRK_RESET_MODES)
-	 xf86SetDesiredModes(pScrn);
-
-      break;
-   default:
-      ErrorF("I830PMEvent: received APM event %d\n", event);
-   }
-   return TRUE;
-}
-
-xf86CrtcPtr
-i830_pipe_to_crtc(ScrnInfoPtr pScrn, int pipe)
+static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
 {
-   xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn);
-   int c;
-   
-   for (c = 0; c < config->num_crtc; c++) {
-      xf86CrtcPtr crtc = config->crtc[c];
-      I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-
-      if (intel_crtc->pipe == pipe)
-	  return crtc;
-   }
+	ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   return NULL;
-} 
+	DPRINTF(PFX, "Enter VT, event %d, undo: %s\n", event,
+		BOOLTOSTRING(undo));
 
-#if 0
-/**
- * This function is used for testing of the screen detect functions from the
- * periodic timer.
- */
-static void
-i830MonitorDetectDebugger(ScrnInfoPtr pScrn)
-{
-   Bool found_crt;
-   I830Ptr pI830 = I830PTR(pScrn);
-   int start, finish, i;
-
-   if (!pScrn->vtSema)
-      return 1000;
-
-   for (i = 0; i < xf86_config->num_output; i++) {
-      enum output_status ret;
-      char *result;
-
-      start = GetTimeInMillis();
-      ret = pI830->output[i].detect(pScrn, &pI830->output[i]);
-      finish = GetTimeInMillis();
-
-      if (ret == OUTPUT_STATUS_CONNECTED)
-	 result = "connected";
-      else if (ret == OUTPUT_STATUS_DISCONNECTED)
-	 result = "disconnected";
-      else
-	 result = "unknown";
+	switch (event) {
+	case XF86_APM_SYS_SUSPEND:
+	case XF86_APM_CRITICAL_SUSPEND:	/*do we want to delay a critical suspend? */
+	case XF86_APM_USER_SUSPEND:
+	case XF86_APM_SYS_STANDBY:
+	case XF86_APM_USER_STANDBY:
+		if (!undo && !intel->suspended) {
+			scrn->LeaveVT(scrnIndex, 0);
+			intel->suspended = TRUE;
+			sleep(SUSPEND_SLEEP);
+		} else if (undo && intel->suspended) {
+			sleep(RESUME_SLEEP);
+			scrn->EnterVT(scrnIndex, 0);
+			intel->suspended = FALSE;
+		}
+		break;
+	case XF86_APM_STANDBY_RESUME:
+	case XF86_APM_NORMAL_RESUME:
+	case XF86_APM_CRITICAL_RESUME:
+		if (intel->suspended) {
+			sleep(RESUME_SLEEP);
+			scrn->EnterVT(scrnIndex, 0);
+			intel->suspended = FALSE;
+			/*
+			 * Turn the screen saver off when resuming.  This seems to be
+			 * needed to stop xscreensaver kicking in (when used).
+			 *
+			 * XXX DoApmEvent() should probably call this just like
+			 * xf86VTSwitch() does.  Maybe do it here only in 4.2
+			 * compatibility mode.
+			 */
+			SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
+		}
+		break;
+		/* This is currently used for ACPI */
+	case XF86_APM_CAPABILITY_CHANGED:
+		ErrorF("I830PMEvent: Capability change\n");
+
+		SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
+		if (intel->quirk_flag & QUIRK_RESET_MODES)
+			xf86SetDesiredModes(scrn);
 
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Detected SDVO as %s in %dms\n",
-		 result, finish - start);
-   }
+		break;
+	default:
+		ErrorF("I830PMEvent: received APM event %d\n", event);
+	}
+	return TRUE;
 }
-#endif
 
-void
-i830WaitSync(ScrnInfoPtr pScrn)
+xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr scrn, int pipe)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+	int c;
 
-   switch (pI830->accel) {
-#ifdef I830_USE_XAA
-   case ACCEL_XAA:
-      if (pI830->AccelInfoRec && pI830->AccelInfoRec->NeedToSync) {
-	 (*pI830->AccelInfoRec->Sync)(pScrn);
-	 pI830->AccelInfoRec->NeedToSync = FALSE;
-      }
-      break;
-#endif
-#ifdef I830_USE_EXA
-   case ACCEL_EXA:
-      if (pI830->EXADriverPtr) {
-	 ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-	 exaWaitSync(pScreen);
-      }
-      break;
-#endif
-#ifdef I830_USE_UXA
-   case ACCEL_UXA:
-      if (pI830->uxa_driver && pI830->need_sync) {
-	 pI830->need_sync = FALSE;
-	 I830Sync(pScrn);
-      }
-      break;
-#endif
-   default:
-      break;
-   }
-}
+	for (c = 0; c < config->num_crtc; c++) {
+		xf86CrtcPtr crtc = config->crtc[c];
+		I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
 
-void
-i830MarkSync(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
+		if (intel_crtc->pipe == pipe)
+			return crtc;
+	}
 
-   switch (pI830->accel) {
-#ifdef I830_USE_XAA
-   case ACCEL_XAA:
-      if (pI830->AccelInfoRec)
-	 pI830->AccelInfoRec->NeedToSync = TRUE;
-      break;
-#endif
-#ifdef I830_USE_EXA
-   case ACCEL_EXA:
-      if (pI830->EXADriverPtr) {
-	 ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-	 exaMarkSync(pScreen);
-      }
-      break;
-#endif
-#ifdef I830_USE_UXA
-   case ACCEL_UXA:
-      if (pI830->uxa_driver)
-	 pI830->need_sync = TRUE;
-      break;
-#endif
-   default:
-      break;
-   }
+	return NULL;
 }
 
-void
-I830InitpScrn(ScrnInfoPtr pScrn)
+void intel_init_scrn(ScrnInfoPtr scrn)
 {
-   pScrn->PreInit = I830PreInit;
-   pScrn->ScreenInit = I830ScreenInit;
-   pScrn->SwitchMode = I830SwitchMode;
-   pScrn->AdjustFrame = i830AdjustFrame;
-   pScrn->EnterVT = I830EnterVT;
-   pScrn->LeaveVT = I830LeaveVT;
-   pScrn->FreeScreen = I830FreeScreen;
-   pScrn->ValidMode = I830ValidMode;
-   pScrn->PMEvent = I830PMEvent;
+	scrn->PreInit = I830PreInit;
+	scrn->ScreenInit = I830ScreenInit;
+	scrn->SwitchMode = I830SwitchMode;
+	scrn->AdjustFrame = i830AdjustFrame;
+	scrn->EnterVT = I830EnterVT;
+	scrn->LeaveVT = I830LeaveVT;
+	scrn->FreeScreen = I830FreeScreen;
+	scrn->ValidMode = I830ValidMode;
+	scrn->PMEvent = I830PMEvent;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c	2010-11-29 02:42:38.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c	2011-02-08 11:14:00.000000000 +0100
@@ -38,35 +38,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "ch7xxx/ch7xxx.h"
 #include "tfp410/tfp410.h"
 
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
-#define xf86LoaderReqSymLists(...) do {} while (0)
-#define LoaderRefSymLists(...) do {} while (0)
-#endif
-
-static const char *SIL164Symbols[] = {
-    "Sil164VidOutput",
-    NULL
-};
-static const char *TFP410Symbols[] = {
-    "Tfp410VidOutput",
-    NULL
-};
-static const char *CH7xxxSymbols[] = {
-    "CH7xxxVidOutput",
-    NULL
-};
-static const char *ivch_symbols[] = {
-    "ivch_methods",
-    NULL
-};
-
-static const char *ch7017_symbols[] = {
-    "ch7017_methods",
-    NULL
-};
-
 /* driver list */
-struct _I830DVODriver i830_dvo_drivers[] =
+static struct _I830DVODriver i830_dvo_drivers[] =
 {
     {
 	.type = I830_OUTPUT_DVO_TMDS,
@@ -74,7 +47,6 @@ struct _I830DVODriver i830_dvo_drivers[]
 	.fntablename = "SIL164VidOutput",
 	.dvo_reg = DVOC,
 	.address = (SIL164_ADDR_1<<1),
-	.symbols = SIL164Symbols
     },
     {
 	.type = I830_OUTPUT_DVO_TMDS,
@@ -82,7 +54,6 @@ struct _I830DVODriver i830_dvo_drivers[]
 	.fntablename = "CH7xxxVidOutput",
 	.dvo_reg = DVOC,
 	.address = (CH7xxx_ADDR_1<<1),
-	.symbols = CH7xxxSymbols
     },
     {
 	.type = I830_OUTPUT_DVO_LVDS,
@@ -90,7 +61,6 @@ struct _I830DVODriver i830_dvo_drivers[]
 	.fntablename = "ivch_methods",
 	.dvo_reg = DVOA,
 	.address = 0x04, /* Might also be 0x44, 0x84, 0xc4 */
-	.symbols = ivch_symbols
     },
     {
 	.type = I830_OUTPUT_DVO_TMDS,
@@ -98,7 +68,6 @@ struct _I830DVODriver i830_dvo_drivers[]
 	.fntablename = "TFP410VidOutput",
 	.dvo_reg = DVOC,
 	.address = (TFP410_ADDR_1<<1),
-	.symbols = TFP410Symbols
     },
     {
 	.type = I830_OUTPUT_DVO_LVDS,
@@ -106,7 +75,6 @@ struct _I830DVODriver i830_dvo_drivers[]
 	.fntablename = "ch7017_methods",
 	.dvo_reg = DVOC,
 	.address = 0xea,
-	.symbols = ch7017_symbols,
 	.gpio = GPIOE,
     }
 };
@@ -116,8 +84,8 @@ struct _I830DVODriver i830_dvo_drivers[]
 static void
 i830_dvo_dpms(xf86OutputPtr output, int mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct _I830DVODriver   *drv = intel_output->i2c_drv;
     void *		    dev_priv = drv->dev_priv;
@@ -137,17 +105,17 @@ i830_dvo_dpms(xf86OutputPtr output, int
 static void
 i830_dvo_save(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     void *		    dev_priv = intel_output->i2c_drv->dev_priv;
 
     /* Each output should probably just save the registers it touches, but for
      * now, use more overkill.
      */
-    pI830->saveDVOA = INREG(DVOA);
-    pI830->saveDVOB = INREG(DVOB);
-    pI830->saveDVOC = INREG(DVOC);
+    intel->saveDVOA = INREG(DVOA);
+    intel->saveDVOB = INREG(DVOB);
+    intel->saveDVOC = INREG(DVOC);
 
     (*intel_output->i2c_drv->vid_rec->save)(dev_priv);
 }
@@ -155,23 +123,23 @@ i830_dvo_save(xf86OutputPtr output)
 static void
 i830_dvo_restore(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     void *		    dev_priv = intel_output->i2c_drv->dev_priv;
 
     (*intel_output->i2c_drv->vid_rec->restore)(dev_priv);
 
-    OUTREG(DVOA, pI830->saveDVOA);
-    OUTREG(DVOB, pI830->saveDVOB);
-    OUTREG(DVOC, pI830->saveDVOC);
+    OUTREG(DVOA, intel->saveDVOA);
+    OUTREG(DVOB, intel->saveDVOB);
+    OUTREG(DVOC, intel->saveDVOC);
 }
 
 static int
 i830_dvo_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     void		    *dev_priv = intel_output->i2c_drv->dev_priv;
 
@@ -180,10 +148,10 @@ i830_dvo_mode_valid(xf86OutputPtr output
 
     /* XXX: Validate clock range */
 
-    if (pI830->lvds_fixed_mode) {
-	if (pMode->HDisplay > pI830->lvds_fixed_mode->HDisplay)
+    if (intel->lvds_fixed_mode) {
+	if (pMode->HDisplay > intel->lvds_fixed_mode->HDisplay)
 	    return MODE_PANEL;
-	if (pMode->VDisplay > pI830->lvds_fixed_mode->VDisplay)
+	if (pMode->VDisplay > intel->lvds_fixed_mode->VDisplay)
 	    return MODE_PANEL;
     }
 
@@ -194,8 +162,8 @@ static Bool
 i830_dvo_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 		    DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
 
     /* If we have timings from the BIOS for the panel, put them in
@@ -203,16 +171,16 @@ i830_dvo_mode_fixup(xf86OutputPtr output
      * with the panel scaling set up to source from the H/VDisplay
      * of the original mode.
      */
-    if (pI830->lvds_fixed_mode != NULL) {
-	adjusted_mode->HDisplay = pI830->lvds_fixed_mode->HDisplay;
-	adjusted_mode->HSyncStart = pI830->lvds_fixed_mode->HSyncStart;
-	adjusted_mode->HSyncEnd = pI830->lvds_fixed_mode->HSyncEnd;
-	adjusted_mode->HTotal = pI830->lvds_fixed_mode->HTotal;
-	adjusted_mode->VDisplay = pI830->lvds_fixed_mode->VDisplay;
-	adjusted_mode->VSyncStart = pI830->lvds_fixed_mode->VSyncStart;
-	adjusted_mode->VSyncEnd = pI830->lvds_fixed_mode->VSyncEnd;
-	adjusted_mode->VTotal = pI830->lvds_fixed_mode->VTotal;
-	adjusted_mode->Clock = pI830->lvds_fixed_mode->Clock;
+    if (intel->lvds_fixed_mode != NULL) {
+	adjusted_mode->HDisplay = intel->lvds_fixed_mode->HDisplay;
+	adjusted_mode->HSyncStart = intel->lvds_fixed_mode->HSyncStart;
+	adjusted_mode->HSyncEnd = intel->lvds_fixed_mode->HSyncEnd;
+	adjusted_mode->HTotal = intel->lvds_fixed_mode->HTotal;
+	adjusted_mode->VDisplay = intel->lvds_fixed_mode->VDisplay;
+	adjusted_mode->VSyncStart = intel->lvds_fixed_mode->VSyncStart;
+	adjusted_mode->VSyncEnd = intel->lvds_fixed_mode->VSyncEnd;
+	adjusted_mode->VTotal = intel->lvds_fixed_mode->VTotal;
+	adjusted_mode->Clock = intel->lvds_fixed_mode->Clock;
 	xf86SetModeCrtc(adjusted_mode, INTERLACE_HALVE_V);
     }
 
@@ -226,8 +194,8 @@ static void
 i830_dvo_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 		  DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     xf86CrtcPtr	    crtc = output->crtc;
     I830CrtcPrivatePtr	    intel_crtc = crtc->driver_private;
     I830OutputPrivatePtr    intel_output = output->driver_private;
@@ -294,8 +262,8 @@ i830_dvo_detect(xf86OutputPtr output)
 static DisplayModePtr
 i830_dvo_get_modes(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     DisplayModePtr	    modes;
 
@@ -315,8 +283,8 @@ i830_dvo_get_modes(xf86OutputPtr output)
 	    return modes;
     }
 
-    if (pI830->lvds_fixed_mode != NULL)
-	return xf86DuplicateMode(pI830->lvds_fixed_mode);
+    if (intel->lvds_fixed_mode != NULL)
+	return xf86DuplicateMode(intel->lvds_fixed_mode);
 
     return NULL;
 }
@@ -334,7 +302,7 @@ i830_dvo_destroy (xf86OutputPtr output)
 	    xf86DestroyI2CBusRec (intel_output->pI2CBus, TRUE, TRUE);
 	if (intel_output->pDDCBus)
 	    xf86DestroyI2CBusRec (intel_output->pDDCBus, TRUE, TRUE);
-	xfree (intel_output);
+	free (intel_output);
     }
 }
 
@@ -342,13 +310,13 @@ i830_dvo_destroy (xf86OutputPtr output)
 static xf86CrtcPtr
 i830_dvo_get_crtc(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct _I830DVODriver *drv = intel_output->i2c_drv;
     int pipe = !!(INREG(drv->dvo_reg) & SDVO_PIPE_B_SELECT);
    
-    return i830_pipe_to_crtc(pScrn, pipe);
+    return i830_pipe_to_crtc(scrn, pipe);
 }
 #endif
 
@@ -375,12 +343,12 @@ static const xf86OutputFuncsRec i830_dvo
  * Other chips with DVO LVDS will need to extend this to deal with the LVDS
  * chip being on DVOB/C and having multiple pipes.
  */
-DisplayModePtr
+static DisplayModePtr
 i830_dvo_get_current_mode (xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    intel_output = output->driver_private;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     struct _I830DVODriver   *drv = intel_output->i2c_drv;
     unsigned int	    dvo_reg = drv->dvo_reg;
     uint32_t		    dvo = INREG(dvo_reg);
@@ -391,7 +359,7 @@ i830_dvo_get_current_mode (xf86OutputPtr
      */
     if (dvo & DVO_ENABLE) 
     {
-	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 	int		    pipe = (dvo & DVO_PIPE_B_SELECT) ? 1 : 0;
 	int		    c;
 
@@ -402,7 +370,7 @@ i830_dvo_get_current_mode (xf86OutputPtr
 
 	    if (intel_crtc->pipe == pipe)
 	    {
-		mode = i830_crtc_mode_get(pScrn, crtc);
+		mode = i830_crtc_mode_get(scrn, crtc);
 
 		if (mode)
 		{
@@ -421,9 +389,9 @@ i830_dvo_get_current_mode (xf86OutputPtr
 }
 
 void
-i830_dvo_init(ScrnInfoPtr pScrn)
+i830_dvo_init(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr intel_output;
     int ret;
     int i;
@@ -437,9 +405,9 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 	return;
 
     /* Set up the DDC bus */
-    ret = I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOD, "DVODDC_D");
+    ret = I830I2CInit(scrn, &intel_output->pDDCBus, GPIOD, "DVODDC_D");
     if (!ret) {
-	xfree(intel_output);
+	free(intel_output);
 	return;
     }
 
@@ -448,17 +416,15 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 	int gpio;
 
 	drv = &i830_dvo_drivers[i];
-	drv->modhandle = xf86LoadSubModule(pScrn, drv->modulename);
+	drv->modhandle = xf86LoadSubModule(scrn, drv->modulename);
 	if (drv->modhandle == NULL)
 	    continue;
 
-	xf86LoaderReqSymLists(drv->symbols, NULL);
-
 	ret_ptr = NULL;
 	drv->vid_rec = LoaderSymbol(drv->fntablename);
 
 	if (!strcmp(drv->modulename, "ivch") &&
-	    pI830->quirk_flag & QUIRK_IVCH_NEED_DVOB) {
+	    intel->quirk_flag & QUIRK_IVCH_NEED_DVOB) {
 	    drv->dvo_reg = DVOB;
 	}
 
@@ -479,7 +445,7 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 	if (gpio_inited != gpio) {
 	    if (pI2CBus != NULL)
 		xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
-	    if (!I830I2CInit(pScrn, &pI2CBus, gpio,
+	    if (!I830I2CInit(scrn, &pI2CBus, gpio,
 			     gpio == GPIOB ? "DVOI2C_B" : "DVOI2C_E")) {
 		continue;
 	    }
@@ -497,26 +463,26 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 		intel_output->pipe_mask = ((1 << 0) | (1 << 1));
 		intel_output->clone_mask = ((1 << I830_OUTPUT_ANALOG) |
 					    (1 << I830_OUTPUT_DVO_TMDS));
-		output = xf86OutputCreate(pScrn, &i830_dvo_output_funcs,
+		output = xf86OutputCreate(scrn, &i830_dvo_output_funcs,
 					  "TMDS");
 		break;
 	    case I830_OUTPUT_DVO_LVDS:
 		intel_output->pipe_mask = ((1 << 0) | (1 << 1));
 		intel_output->clone_mask = (1 << I830_OUTPUT_DVO_LVDS);
-		output = xf86OutputCreate(pScrn, &i830_dvo_output_funcs,
+		output = xf86OutputCreate(scrn, &i830_dvo_output_funcs,
 					  "LVDS");
 		break;
 	    case I830_OUTPUT_DVO_TVOUT:
 		intel_output->pipe_mask = ((1 << 0) | (1 << 1));
 		intel_output->clone_mask = (1 << I830_OUTPUT_DVO_TVOUT);
-		output = xf86OutputCreate(pScrn, &i830_dvo_output_funcs,
+		output = xf86OutputCreate(scrn, &i830_dvo_output_funcs,
 					  "TV");
 		break;
 	    }
 	    if (output == NULL) {
 		xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
 		xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
-		xfree(intel_output);
+		free(intel_output);
 		xf86UnloadSubModule(drv->modhandle);
 		return;
 	    }
@@ -538,8 +504,8 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 		 * so for now, just get the current mode being output through
 		 * DVO.
 		 */
-		pI830->lvds_fixed_mode = i830_dvo_get_current_mode(output);
-		pI830->lvds_dither = TRUE;
+		intel->lvds_fixed_mode = i830_dvo_get_current_mode(output);
+		intel->lvds_dither = TRUE;
 	    }
 
 	    return;
@@ -551,5 +517,5 @@ i830_dvo_init(ScrnInfoPtr pScrn)
     if (pI2CBus != NULL)
 	xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
     xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
-    xfree(intel_output);
+    free(intel_output);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830.h	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830.h	2011-02-08 11:14:00.000000000 +0100
@@ -26,7 +26,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.12 2004/01/07 03:43:19 dawes Exp $ */
 
 /*
  * Authors:
@@ -53,91 +52,200 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "i810_reg.h"
-#include "xaa.h"
 #include "xf86Cursor.h"
 #include "xf86xv.h"
 #include "vgaHW.h"
 #include "xf86Crtc.h"
 #include "xf86RandR12.h"
 
+#include "xf86int10.h"
+
 #include "xorg-server.h"
-#ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
-#endif
 
-#ifdef XF86DRI
 #include "xf86drm.h"
 #include "sarea.h"
 #define _XF86DRI_SERVER_
 #include "dri.h"
 #include "GL/glxint.h"
-#include "i830_dri.h"
-#endif
 #include "intel_bufmgr.h"
 #include "i915_drm.h"
 
-#ifdef I830_USE_EXA
-#include "exa.h"
-Bool I830EXAInit(ScreenPtr pScreen);
-unsigned long long I830TexOffsetStart(PixmapPtr pPix);
-#endif
-
-#ifdef I830_USE_UXA
 #include "uxa.h"
 Bool i830_uxa_init(ScreenPtr pScreen);
 void i830_uxa_create_screen_resources(ScreenPtr pScreen);
-void i830_uxa_block_handler (ScreenPtr pScreen);
-Bool i830_get_aperture_space(ScrnInfoPtr pScrn, drm_intel_bo **bo_table,
+void i830_uxa_block_handler(ScreenPtr pScreen);
+Bool i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
 			     int num_bos);
+
+/* XXX
+ * The X server gained an *almost* identical implementation in 1.9.
+ *
+ * Remove this duplicate code either in 2.16 (when we can depend upon 1.9)
+ * or the drivers are merged back into the xserver tree, whichever happens
+ * earlier.
+ */
+
+#ifndef _LIST_H_
+/* classic doubly-link circular list */
+struct list {
+	struct list *next, *prev;
+};
+
+static void
+list_init(struct list *list)
+{
+	list->next = list->prev = list;
+}
+
+static inline void
+__list_add(struct list *entry,
+	    struct list *prev,
+	    struct list *next)
+{
+	next->prev = entry;
+	entry->next = next;
+	entry->prev = prev;
+	prev->next = entry;
+}
+
+static inline void
+list_add(struct list *entry, struct list *head)
+{
+	__list_add(entry, head, head->next);
+}
+
+static inline void
+__list_del(struct list *prev, struct list *next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+static inline void
+list_del(struct list *entry)
+{
+	__list_del(entry->prev, entry->next);
+	list_init(entry);
+}
+
+static inline Bool
+list_is_empty(struct list *head)
+{
+	return head->next == head;
+}
+#endif
+
+#ifndef container_of
+#define container_of(ptr, type, member) \
+	(type *)((char *)(ptr) - (char *) &((type *)0)->member)
+#endif
+
+#ifndef list_entry
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
 #endif
 
-#if defined(I830_USE_UXA) || defined(I830_USE_EXA)
-dri_bo *i830_get_pixmap_bo (PixmapPtr pixmap);
-void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo *bo);
+#ifndef list_first_entry
+#define list_first_entry(ptr, type, member) \
+	list_entry((ptr)->next, type, member)
 #endif
 
-#ifdef I830_USE_XAA
-Bool I830XAAInit(ScreenPtr pScreen);
+#ifndef list_foreach
+#define list_foreach(pos, head)			\
+	for (pos = (head)->next; pos != (head);	pos = pos->next)
 #endif
 
+/* XXX list.h from xserver-1.9 uses a GCC-ism to avoid having to pass type */
+#ifndef list_foreach_entry
+#define list_foreach_entry(pos, type, head, member)		\
+	for (pos = list_entry((head)->next, type, member);\
+	     &pos->member != (head);					\
+	     pos = list_entry(pos->member.next, type, member))
+#endif
+
+struct intel_pixmap {
+	dri_bo *bo;
+
+	struct list flush, batch, in_flight;
+
+	uint16_t stride;
+	uint8_t tiling;
+	int8_t busy :2;
+	int8_t batch_write :1;
+};
+
+#if HAS_DEVPRIVATEKEYREC
+extern DevPrivateKeyRec uxa_pixmap_index;
+#else
+extern int uxa_pixmap_index;
+#endif
+
+static inline struct intel_pixmap *i830_get_pixmap_intel(PixmapPtr pixmap)
+{
+#if HAS_DEVPRIVATEKEYREC
+	return dixGetPrivate(&pixmap->devPrivates, &uxa_pixmap_index);
+#else
+	return dixLookupPrivate(&pixmap->devPrivates, &uxa_pixmap_index);
+#endif
+}
+
+static inline Bool intel_pixmap_is_busy(struct intel_pixmap *priv)
+{
+	if (priv->busy == -1)
+		priv->busy = drm_intel_bo_busy(priv->bo);
+	return priv->busy;
+}
+
+static inline void i830_set_pixmap_intel(PixmapPtr pixmap, struct intel_pixmap *intel)
+{
+	dixSetPrivate(&pixmap->devPrivates, &uxa_pixmap_index, intel);
+}
+
+static inline Bool i830_uxa_pixmap_is_dirty(PixmapPtr pixmap)
+{
+	return !list_is_empty(&i830_get_pixmap_intel(pixmap)->flush);
+}
+
+static inline Bool i830_pixmap_tiled(PixmapPtr pixmap)
+{
+	return i830_get_pixmap_intel(pixmap)->tiling != I915_TILING_NONE;
+}
+
+dri_bo *i830_get_pixmap_bo(PixmapPtr pixmap);
+void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo);
+
 typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
 
 #include "common.h"
 #include "i830_sdvo.h"
 #include "i2c_vid.h"
 
-/*
- * The mode handling is based upon the VESA driver written by
- * Paulo César Pereira de Andrade <pcpa@conectiva.com.br>.
- */
-
-#ifdef XF86DRI
-#define I830_MM_MINPAGES 512
-#define I830_MM_MAXSIZE  (32*1024)
-#define I830_KERNEL_MM  (1 << 0) /* Initialize the kernel memory manager*/
-#define I830_KERNEL_TEX (1 << 1) /* Allocate texture memory pool */
-#endif
-
 #ifdef XvMCExtension
 #ifdef ENABLE_XVMC
 #define INTEL_XVMC 1
 #endif
 #endif
 
-typedef struct _I830Rec *I830Ptr;
+#define ALWAYS_SYNC 0
+#define ALWAYS_FLUSH 0
+
+struct intel_screen_private;
 
-typedef void (*I830WriteIndexedByteFunc)(I830Ptr pI830, IOADDRESS addr,
-                                         uint8_t index, uint8_t value);
-typedef uint8_t(*I830ReadIndexedByteFunc)(I830Ptr pI830, IOADDRESS addr,
-					  uint8_t index);
-typedef void (*I830WriteByteFunc)(I830Ptr pI830, IOADDRESS addr,
-				  uint8_t value);
-typedef uint8_t(*I830ReadByteFunc)(I830Ptr pI830, IOADDRESS addr);
+typedef void (*I830WriteIndexedByteFunc) (struct intel_screen_private  *intel,
+					  IOADDRESS addr, uint8_t index,
+					  uint8_t value);
+typedef uint8_t(*I830ReadIndexedByteFunc) (struct intel_screen_private *intel,
+					   IOADDRESS addr, uint8_t index);
+typedef void (*I830WriteByteFunc) (struct intel_screen_private *intel,
+				   IOADDRESS addr, uint8_t value);
+typedef uint8_t(*I830ReadByteFunc) (struct intel_screen_private *intel,
+				    IOADDRESS addr);
 
 enum tile_format {
-    TILE_NONE,
-    TILE_XMAJOR,
-    TILE_YMAJOR
+	TILE_NONE,
+	TILE_XMAJOR,
+	TILE_YMAJOR
 };
 
 #define PITCH_NONE 0
@@ -145,73 +253,64 @@ enum tile_format {
 /** Record of a linear allocation in the aperture. */
 typedef struct _i830_memory i830_memory;
 struct _i830_memory {
-    /** Offset of the allocation in card VM */
-    unsigned long offset;
-    /** End of the allocation in card VM */
-    unsigned long end;
-    /**
-     * Requested size of the allocation: doesn't count padding.
-     *
-     * Any bound memory will cover offset to (offset + size).
-     */
-    unsigned long size;
-    /**
-     * Allocated aperture size, taking into account padding to allow for
-     * tiling.
-     */
-    unsigned long allocated_size;
-    /**
-     * Physical (or more properly, bus) address of the allocation.
-     * Only set if requested during allocation.
-     */
-    uint64_t bus_addr;
-    /** AGP memory handle */
-    int key;
-    /**
-     * Whether or not the AGP memory (if any) is currently bound.
-     */
-    Bool bound;
-    /**
-     * Offset that the AGP-allocated memory (if any) is to be bound to.
-     *
-     * This is either @offset or pI830->stolen_size
-     */
-    unsigned long agp_offset;
-
-    enum tile_format tiling;
-    /**
-     * Index of the fence register representing the tiled surface, when
-     * bound.
-     */
-    int fence_nr;
-    /** Pitch value in bytes for tiled surfaces */
-    unsigned int pitch;
-
-    /** Description of the allocation, for logging */
-    char *name;
-
-    /** @{
-     * Memory allocator linked list pointers
-     */
-    i830_memory *next;
-    i830_memory *prev;
-    /** @} */
-
-    dri_bo *bo;
-    uint32_t alignment;
-    uint32_t gem_name;
-    Bool lifetime_fixed_offset;
+	/** Offset of the allocation in card VM */
+	unsigned long offset;
+	/** End of the allocation in card VM */
+	unsigned long end;
+	/**
+	 * Requested size of the allocation: doesn't count padding.
+	 *
+	 * Any bound memory will cover offset to (offset + size).
+	 */
+	unsigned long size;
+	/**
+	 * Allocated aperture size, taking into account padding to allow for
+	 * tiling.
+	 */
+	unsigned long allocated_size;
+	/**
+	 * Physical (or more properly, bus) address of the allocation.
+	 * Only set if requested during allocation.
+	 */
+	uint64_t bus_addr;
+	/** AGP memory handle */
+	int key;
+	/**
+	 * Whether or not the AGP memory (if any) is currently bound.
+	 */
+	Bool bound;
+	/**
+	 * Offset that the AGP-allocated memory (if any) is to be bound to.
+	 *
+	 * This is either @offset or intel->stolen_size
+	 */
+	unsigned long agp_offset;
+
+	enum tile_format tiling;
+    	/**
+	 * Index of the fence register representing the tiled surface, when
+	 * bound.
+	 */
+	int fence_nr;
+	/** Pitch value in bytes for tiled surfaces */
+	unsigned int pitch;
+
+	/** Description of the allocation, for logging */
+	char *name;
+
+	/** @{
+	 * Memory allocator linked list pointers
+	 */
+	i830_memory *next;
+	i830_memory *prev;
+	/** @} */
+
+	dri_bo *bo;
+	uint32_t alignment;
+	uint32_t gem_name;
+	Bool lifetime_fixed_offset;
 };
 
-typedef struct {
-   int tail_mask;
-   i830_memory *mem;
-   unsigned char *virtual_start;
-   int head;
-   int tail;
-   int space;
-} I830RingBuffer;
-
 /* store information about an Ixxx DVO */
 /* The i830->i865 use multiple DVOs with multiple i2cs */
 /* the i915, i945 have a single sDVO i2c bus - which is different */
@@ -233,43 +332,41 @@ typedef struct {
 #define I830_OUTPUT_HDMI 8
 
 struct _I830DVODriver {
-   int type;
-   char *modulename;
-   char *fntablename;
-   unsigned int dvo_reg;
-   uint32_t gpio;
-   int address;
-   const char **symbols;
-   I830I2CVidOutputRec *vid_rec;
-   void *dev_priv;
-   pointer modhandle;
+	int type;
+	char *modulename;
+	char *fntablename;
+	unsigned int dvo_reg;
+	uint32_t gpio;
+	int address;
+	I830I2CVidOutputRec *vid_rec;
+	void *dev_priv;
+	pointer modhandle;
 };
 
-extern const char *i830_output_type_names[];
-
 typedef struct _I830CrtcPrivateRec {
-    int			    pipe;
-    int			    plane;
+	int pipe;
+	int plane;
 
-    Bool    		    enabled;
-    
-    int			    dpms_mode;
-    
-    int			    x, y;
-
-    /* Lookup table values to be set when the CRTC is enabled */
-    uint8_t lut_r[256], lut_g[256], lut_b[256];
-
-    i830_memory *rotate_mem;
-    /* Card virtual address of the cursor */
-    unsigned long cursor_offset;
-    unsigned long cursor_argb_offset;
-    /* Physical or virtual addresses of the cursor for setting in the cursor
-     * registers.
-     */
-    uint64_t cursor_addr;
-    unsigned long cursor_argb_addr;
-    Bool	cursor_is_argb;
+	Bool enabled;
+
+	int dpms_mode;
+
+	int x, y;
+
+	/* Lookup table values to be set when the CRTC is enabled */
+	uint8_t lut_r[256], lut_g[256], lut_b[256];
+
+	i830_memory *rotate_mem;
+	/* Card virtual address of the cursor */
+	unsigned long cursor_offset;
+	unsigned long cursor_argb_offset;
+	/* Physical or virtual addresses of the cursor for setting in the cursor
+	 * registers.
+	 */
+	uint64_t cursor_addr;
+	unsigned long cursor_argb_addr;
+	Bool	cursor_is_argb;
+	int	bpc;
 } I830CrtcPrivateRec, *I830CrtcPrivatePtr;
 
 #define I830CrtcPrivate(c) ((I830CrtcPrivatePtr) (c)->driver_private)
@@ -292,10 +389,10 @@ typedef struct _I830OutputPrivateRec {
 
 /** enumeration of 3d consumers so some can maintain invariant state. */
 enum last_3d {
-    LAST_3D_OTHER,
-    LAST_3D_VIDEO,
-    LAST_3D_RENDER,
-    LAST_3D_ROTATION
+	LAST_3D_OTHER,
+	LAST_3D_VIDEO,
+	LAST_3D_RENDER,
+	LAST_3D_ROTATION
 };
 
 /*
@@ -340,6 +437,10 @@ enum last_3d {
  *   BCM_KERNEL:  use kernel methods for controlling the backlight
  *     This is only available on some platforms, but where present this can
  *     provide the best user experience.
+ *
+ * And, if you're in EL5, a fifth!
+ *   BCM_IRONLAKE_NULL: just don't do anything and be quiet about it.  This is
+ *     a workaround for an RHGB interaction; you won't hit this at runtime.
  */
 
 enum backlight_control {
@@ -347,407 +448,369 @@ enum backlight_control {
     BCM_LEGACY,
     BCM_COMBO,
     BCM_KERNEL,
+    BCM_IRONLAKE_NULL
 };
 
-typedef enum accel_method {
-    ACCEL_UNINIT = 0,
-    ACCEL_NONE,
-    ACCEL_XAA,
-    ACCEL_EXA,
-    ACCEL_UXA
-} accel_method_t;
-
 enum dri_type {
-    DRI_DISABLED,
-    DRI_NONE,
-    DRI_XF86DRI,
-    DRI_DRI2
+	DRI_DISABLED,
+	DRI_NONE,
+	DRI_DRI2
+};
+struct sdvo_device_mapping {
+   uint8_t dvo_port;
+   uint8_t slave_addr;
+   uint8_t dvo_wiring;
+   uint8_t initialized;
 };
 
-typedef struct _I830Rec {
-   unsigned char *MMIOBase;
-   unsigned char *GTTBase;
-   unsigned char *FbBase;
-   int cpp;
-
-   unsigned int bufferOffset;		/* for I830SelectBuffer */
-   BoxRec FbMemBox;
-   int CacheLines;
-
-   /* These are set in PreInit and never changed. */
-   long FbMapSize;
-   long GTTMapSize;
-
-   /**
-    * Linked list of video memory allocations.  The head and tail are
-    * dummy entries that bound the allocation area.
-    */
-   i830_memory *memory_list;
-   /** Linked list of buffer object memory allocations */
-   i830_memory *bo_list;
-   long stolen_size;		/**< bytes of pre-bound stolen memory */
-   int gtt_acquired;		/**< whether we currently own the AGP */
-
-   i830_memory *front_buffer;
-   i830_memory *compressed_front_buffer;
-   i830_memory *compressed_ll_buffer;
-   /* One big buffer for all cursors for kernels that support this */
-   i830_memory *cursor_mem;
-   /* separate small buffers for kernels that support this */
-   i830_memory *cursor_mem_classic[2];
-   i830_memory *cursor_mem_argb[2];
-   i830_memory *xaa_scratch;
-#ifdef I830_USE_EXA
-   i830_memory *exa_offscreen;
-#endif
-   i830_memory *fake_bufmgr_mem;
-
-   /* Regions allocated either from the above pools, or from agpgart. */
-   I830RingBuffer ring;
-
-   /** Number of bytes being emitted in the current BEGIN_LP_RING */
-   unsigned int ring_emitting;
-   /** Number of bytes that have been emitted in the current BEGIN_LP_RING */
-   unsigned int ring_used;
-   /** Offset in the ring for the next DWORD emit */
-   uint32_t ring_next;
-
-   dri_bufmgr *bufmgr;
-
-   uint8_t *batch_ptr;
-   /** Byte offset in batch_ptr for the next dword to be emitted. */
-   unsigned int batch_used;
-   /** Position in batch_ptr at the start of the current BEGIN_BATCH */
-   unsigned int batch_emit_start;
-   /** Number of bytes to be emitted in the current BEGIN_BATCH. */
-   uint32_t batch_emitting;
-   dri_bo *batch_bo;
-   /** Whether we're in a section of code that can't tolerate flushing */
-   Bool in_batch_atomic;
-   /** Ending batch_used that was verified by i830_start_batch_atomic() */
-   int batch_atomic_limit;
-
-#ifdef I830_XV
-   /* For Xvideo */
-   i830_memory *overlay_regs;
-#endif
+typedef struct intel_screen_private {
+	unsigned char *MMIOBase;
+	unsigned char *GTTBase;
+	unsigned char *FbBase;
+	int cpp;
+
+	unsigned int bufferOffset;	/* for I830SelectBuffer */
+
+	/* These are set in PreInit and never changed. */
+	long FbMapSize;
+	long GTTMapSize;
+
+	/**
+	 * Linked list of video memory allocations.  The head and tail are
+	 * dummy entries that bound the allocation area.
+	 */
+	i830_memory *memory_list;
+	/** Linked list of buffer object memory allocations */
+	i830_memory *bo_list;
+	long stolen_size;		/**< bytes of pre-bound stolen memory */
+	int gtt_acquired;		/**< whether we currently own the AGP */
+
+
+	i830_memory *front_buffer;
+	i830_memory *compressed_front_buffer;
+	i830_memory *compressed_ll_buffer;
+	/* One big buffer for all cursors for kernels that support this */
+	i830_memory *cursor_mem;
+	/* separate small buffers for kernels that support this */
+	i830_memory *cursor_mem_classic[2];
+	/* One big buffer for all cursors for kernels that support this */
+	i830_memory *cursor_mem_argb[2];
+
+	dri_bufmgr *bufmgr;
+
+	uint32_t batch_ptr[4096];
+	/** Byte offset in batch_ptr for the next dword to be emitted. */
+	unsigned int batch_used;
+	/** Position in batch_ptr at the start of the current BEGIN_BATCH */
+	unsigned int batch_emit_start;
+	/** Number of bytes to be emitted in the current BEGIN_BATCH. */
+	uint32_t batch_emitting;
+	dri_bo *batch_bo;
+	dri_bo *last_batch_bo;
+	/** Whether we're in a section of code that can't tolerate flushing */
+	Bool in_batch_atomic;
+	/** Ending batch_used that was verified by i830_start_batch_atomic() */
+	int batch_atomic_limit;
+	struct list batch_pixmaps;
+	struct list flush_pixmaps;
+	struct list in_flight;
+
+	/* For Xvideo */
+	i830_memory *overlay_regs;
+	void *offscreenImages;	/**< remembered memory block for release */
+	Bool use_drmmode_overlay;
 #ifdef INTEL_XVMC
-   /* For XvMC */
-   Bool XvMCEnabled;
+	/* For XvMC */
+	Bool XvMCEnabled;
 #endif
 
-   XF86ModReqInfo shadowReq; /* to test for later libshadow */
-   Rotation rotation;
-   void (*PointerMoved)(int, int, int);
-   CreateScreenResourcesProcPtr    CreateScreenResources;
-
-   i830_memory *power_context;
-
-#ifdef XF86DRI
-   i830_memory *back_buffer;
-   i830_memory *depth_buffer;
-   i830_memory *textures;		/**< Compatibility texture memory */
-   i830_memory *memory_manager;		/**< DRI memory manager aperture */
-   i830_memory *hw_status;		/* for G33 hw status page alloc */
-
-   int TexGranularity;
-   int drmMinor;
-   Bool allocate_classic_textures;
+	XF86ModReqInfo shadowReq; /* to test for later libshadow */
 
-   Bool can_resize;
+	CreateScreenResourcesProcPtr CreateScreenResources;
 
-   Bool want_vblank_interrupts;
-#endif
-
-   Bool need_mi_flush;
-
-   Bool NeedRingBufferLow;
-   Bool tiling;
-   Bool fb_compression;
-
-   int backPitch;
-
-   Bool CursorNeedsPhysical;
- 
-   DGAModePtr DGAModes;
-   int numDGAModes;
-   Bool DGAactive;
-   int DGAViewportStatus;
-
-   int Chipset;
-   unsigned long LinearAddr;
-   unsigned long MMIOAddr;
-   IOADDRESS ioBase;
-   EntityInfoPtr pEnt;
-#if XSERVER_LIBPCIACCESS
-   struct pci_device *PciInfo;
-#else
-   pciVideoPtr PciInfo;
-   PCITAG PciTag;
-#endif
-   uint8_t variant;
+	i830_memory *power_context;
+
+	i830_memory *memory_manager;	/**< DRI memory manager aperture */
+
+	Bool need_mi_flush;
+
+	Bool tiling;
+	Bool fb_compression;
+	Bool swapbuffers_wait;
+
+	Bool CursorNeedsPhysical;
+
+	int Chipset;
+	unsigned long LinearAddr;
+	unsigned long MMIOAddr;
+	unsigned int MMIOSize;
+	IOADDRESS ioBase;
+	EntityInfoPtr pEnt;
+	struct pci_device *PciInfo;
+	uint8_t variant;
+
+	unsigned int BR[20];
+
+	Bool fence_used[FENCE_NEW_NR];
+
+	CloseScreenProcPtr CloseScreen;
+
+	void (*vertex_flush) (struct intel_screen_private *intel);
+	void (*batch_flush_notify) (ScrnInfoPtr scrn);
+
+	uxa_driver_t *uxa_driver;
+	Bool need_flush;
+	int accel_pixmap_pitch_alignment;
+	int accel_pixmap_offset_alignment;
+	int accel_max_x;
+	int accel_max_y;
+	int max_bo_size;
+	int max_gtt_map_size;
+	int max_tiling_size;
+
+	I830WriteIndexedByteFunc writeControl;
+	I830ReadIndexedByteFunc readControl;
+	I830WriteByteFunc writeStandard;
+	I830ReadByteFunc readStandard;
+
+	Bool XvDisabled;	/* Xv disabled in PreInit. */
+	Bool XvEnabled;		/* Xv enabled for this generation. */
+	Bool XvPreferOverlay;
+
+	int colorKey;
+	XF86VideoAdaptorPtr adaptor;
+	ScreenBlockHandlerProcPtr BlockHandler;
+	Bool overlayOn;
+
+	struct {
+		drm_intel_bo *gen4_vs_bo;
+		drm_intel_bo *gen4_sf_bo;
+		drm_intel_bo *gen4_wm_packed_bo;
+		drm_intel_bo *gen4_wm_planar_bo;
+		drm_intel_bo *gen4_cc_bo;
+		drm_intel_bo *gen4_cc_vp_bo;
+		drm_intel_bo *gen4_sampler_bo;
+		drm_intel_bo *gen4_sip_kernel_bo;
+	} video;
+
+	/* Render accel state */
+	float scale_units[2][2];
+	/** Transform pointers for src/mask, or NULL if identity */
+	PictTransform *transform[2];
+
+	PixmapPtr render_source, render_mask, render_dest;
+	PicturePtr render_source_picture, render_mask_picture, render_dest_picture;
+	CARD32 render_source_solid;
+	CARD32 render_mask_solid;
+	PixmapPtr render_current_dest;
+	Bool render_source_is_solid;
+	Bool render_mask_is_solid;
+	Bool needs_render_state_emit;
+	Bool needs_render_vertex_emit;
+	Bool needs_render_ca_pass;
+
+	/* i830 render accel state */
+	uint32_t render_dest_format;
+	uint32_t cblend, ablend, s8_blendctl;
+
+	/* i915 render accel state */
+	PixmapPtr texture[2];
+	uint32_t mapstate[6];
+	uint32_t samplerstate[6];
+
+	struct {
+		int op;
+		uint32_t dst_format;
+	} i915_render_state;
+
+	uint32_t prim_offset;
+	void (*prim_emit)(PixmapPtr dest,
+			  int srcX, int srcY,
+			  int maskX, int maskY,
+			  int dstX, int dstY,
+			  int w, int h);
+	int floats_per_vertex;
+	int last_floats_per_vertex;
+	uint32_t vertex_count;
+	uint32_t vertex_index;
+	uint32_t vertex_used;
+	float vertex_ptr[4*1024];
+	dri_bo *vertex_bo;
+
+	/* 965 render acceleration state */
+	struct gen4_render_state *gen4_render_state;
+
+	enum dri_type directRenderingType;	/* DRI enabled this generation. */
+
+	Bool directRenderingOpen;
+	int drmSubFD;
+#ifdef notyet
+	drmEventContext event_context;
+#endif
+	char *deviceName;
+
+	/* Broken-out options. */
+	OptionInfoPtr Options;
+
+	Bool lvds_24_bit_mode;
+	Bool lvds_use_ssc;
+	int lvds_ssc_freq; /* in MHz */
+	Bool lvds_dither;
+	DisplayModePtr lvds_fixed_mode;
+	DisplayModePtr sdvo_lvds_fixed_mode;
+	Bool skip_panel_detect;
+	Bool integrated_lvds; /* LVDS config from driver feature BDB */
+
+	Bool tv_present; /* TV connector present (from VBIOS) */
+
+	/* Driver phase/state information */
+	Bool preinit;
+	Bool starting;
+	Bool closing;
+	Bool suspended;
+	Bool leaving;
+
+	unsigned int SaveGeneration;
+
+	int ddc2;
+
+	enum backlight_control backlight_control_method;
+
+	uint32_t saveDSPARB;
+	uint32_t saveDSPACNTR;
+	uint32_t saveDSPBCNTR;
+	uint32_t savePIPEACONF;
+	uint32_t savePIPEBCONF;
+	uint32_t savePIPEASRC;
+	uint32_t savePIPEBSRC; uint32_t saveFPA0;
+	uint32_t saveFPA1;
+	uint32_t saveDPLL_A;
+	uint32_t saveDPLL_A_MD;
+	uint32_t saveHTOTAL_A;
+	uint32_t saveHBLANK_A;
+	uint32_t saveHSYNC_A;
+	uint32_t saveVTOTAL_A;
+	uint32_t saveVBLANK_A;
+	uint32_t saveVSYNC_A;
+	uint32_t saveBCLRPAT_A;
+	uint32_t saveDSPASTRIDE;
+	uint32_t saveDSPASIZE;
+	uint32_t saveDSPAPOS;
+	uint32_t saveDSPABASE;
+	uint32_t saveDSPASURF;
+	uint32_t saveDSPATILEOFF;
+	uint32_t saveFPB0;
+	uint32_t saveFPB1;
+	uint32_t saveDPLL_B;
+	uint32_t saveDPLL_B_MD;
+	uint32_t saveHTOTAL_B;
+	uint32_t saveHBLANK_B;
+	uint32_t saveHSYNC_B;
+	uint32_t saveVTOTAL_B;
+	uint32_t saveVBLANK_B;
+	uint32_t saveVSYNC_B;
+	uint32_t saveBCLRPAT_B;
+	uint32_t saveDSPBSTRIDE;
+	uint32_t saveDSPBSIZE;
+	uint32_t saveDSPBPOS;
+	uint32_t saveDSPBBASE;
+	uint32_t saveDSPBSURF;
+	uint32_t saveDSPBTILEOFF;
+	uint32_t saveVCLK_DIVISOR_VGA0;
+	uint32_t saveVCLK_DIVISOR_VGA1;
+	uint32_t saveVCLK_POST_DIV;
+	uint32_t saveVGACNTRL;
+	uint32_t saveCURSOR_A_CONTROL;
+	uint32_t saveCURSOR_A_BASE;
+	uint32_t saveCURSOR_A_POSITION;
+	uint32_t saveCURSOR_B_CONTROL;
+	uint32_t saveCURSOR_B_BASE;
+	uint32_t saveCURSOR_B_POSITION;
+	uint32_t saveADPA;
+	uint32_t saveLVDS;
+	uint32_t saveDVOA;
+	uint32_t saveDVOB;
+	uint32_t saveDVOC;
+	uint32_t savePP_ON;
+	uint32_t savePP_OFF;
+	uint32_t savePP_CONTROL;
+	uint32_t savePP_DIVISOR;
+	uint32_t savePFIT_CONTROL;
+	uint32_t savePaletteA[256];
+	uint32_t savePaletteB[256];
+	uint32_t saveSWF[17];
+	uint32_t saveBLC_PWM_CTL;
+	uint32_t saveBLC_PWM_CTL2;
+	uint32_t saveFBC_CFB_BASE;
+	uint32_t saveFBC_LL_BASE;
+	uint32_t saveFBC_CONTROL2;
+	uint32_t saveFBC_CONTROL;
+	uint32_t saveFBC_FENCE_OFF;
+	uint32_t saveRENCLK_GATE_D1;
+	uint32_t saveRENCLK_GATE_D2;
+	uint32_t saveDSPCLK_GATE_D;
+	uint32_t saveRAMCLK_GATE_D;
+	uint32_t savePWRCTXA;
+
+	enum last_3d last_3d;
+
+	Bool use_drm_mode;
+
+	/** Enables logging of debug output related to mode switching. */
+	Bool debug_modes;
+	unsigned int quirk_flag;
+
+	/**
+	 * User option to print acceleration fallback info to the server log.
+	 */
+	Bool fallback_debug;
+	struct sdvo_device_mapping sdvo_mappings[2];
+	unsigned debug_flush;
+
+	   /* ironlake vt restore hack */
+	   xf86Int10InfoPtr int10;
+	   int int10Mode;
+} intel_screen_private;
 
-   unsigned int BR[20];
-
-   unsigned char **ScanlineColorExpandBuffers;
-   int NumScanlineColorExpandBuffers;
-   int nextColorExpandBuf;
-
-   Bool fence_used[FENCE_NEW_NR];
-
-   accel_method_t accel;
-#ifdef I830_USE_XAA
-   XAAInfoRecPtr AccelInfoRec;
-
-   /* additional XAA accelerated Composite support */
-   CompositeProcPtr saved_composite;
-   Bool (*xaa_check_composite)(int op, PicturePtr pSrc, PicturePtr pMask,
-			       PicturePtr pDst);
-   Bool (*xaa_prepare_composite)(int op, PicturePtr pSrc, PicturePtr pMask,
-				 PicturePtr pDst, PixmapPtr pSrcPixmap,
-				 PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
-   void (*xaa_composite)(PixmapPtr pDst, int xSrc, int ySrc,
-			 int xMask, int yMask, int xDst, int yDst,
-			 int w, int h);
-   void (*xaa_done_composite)(PixmapPtr pDst);
-#endif
-   CloseScreenProcPtr CloseScreen;
-
-   void (*batch_flush_notify)(ScrnInfoPtr pScrn);
-
-#ifdef I830_USE_EXA
-   ExaDriverPtr	EXADriverPtr;
-#endif
-#ifdef I830_USE_UXA
-   uxa_driver_t *uxa_driver;
-   Bool need_flush;
-#endif
-   Bool need_sync;
-#if defined(I830_USE_EXA) || defined(I830_USE_UXA)
-   PixmapPtr pSrcPixmap;
-#endif
-   int accel_pixmap_pitch_alignment;
-   int accel_pixmap_offset_alignment;
-   int accel_max_x;
-   int accel_max_y;
-
-   I830WriteIndexedByteFunc writeControl;
-   I830ReadIndexedByteFunc readControl;
-   I830WriteByteFunc writeStandard;
-   I830ReadByteFunc readStandard;
-
-   Bool XvDisabled;			/* Xv disabled in PreInit. */
-   Bool XvEnabled;			/* Xv enabled for this generation. */
-   Bool XvPreferOverlay;
-
-#ifdef I830_XV
-   int colorKey;
-   XF86VideoAdaptorPtr adaptor;
-   ScreenBlockHandlerProcPtr BlockHandler;
-   Bool overlayOn;
-
-   struct {
-      drm_intel_bo *gen4_vs_bo;
-      drm_intel_bo *gen4_sf_bo;
-      drm_intel_bo *gen4_wm_packed_bo;
-      drm_intel_bo *gen4_wm_planar_bo;
-      drm_intel_bo *gen4_cc_bo;
-      drm_intel_bo *gen4_cc_vp_bo;
-      drm_intel_bo *gen4_sampler_bo;
-      drm_intel_bo *gen4_sip_kernel_bo;
-   } video;
-#endif
-
-   /* EXA render state */
-   float scale_units[2][2];
-  /** Transform pointers for src/mask, or NULL if identity */
-   PictTransform *transform[2];
-   float coord_adjust;
-   /* i915 EXA render state */
-   uint32_t mapstate[6];
-   uint32_t samplerstate[6];
-
-   struct {
-      int op;
-      PicturePtr pSrcPicture, pMaskPicture, pDstPicture;
-      PixmapPtr pSrc, pMask, pDst;
-      uint32_t dst_format;
-      Bool is_nearest;
-      Bool needs_emit;
-   } i915_render_state;
-
-   /* 965 render acceleration state */
-   struct gen4_render_state *gen4_render_state;
-
-   enum dri_type directRenderingType;	/* DRI enabled this generation. */
-
-#ifdef XF86DRI
-   Bool directRenderingOpen;
-   int LockHeld;
-   DRIInfoPtr pDRIInfo;
-   int drmSubFD;
-   int numVisualConfigs;
-   __GLXvisualConfig *pVisualConfigs;
-   I830ConfigPrivPtr pVisualConfigsPriv;
-   drm_handle_t buffer_map;
-   drm_handle_t ring_map;
-   char deviceName[64];
-#endif
-
-   /* Broken-out options. */
-   OptionInfoPtr Options;
+enum {
+	DEBUG_FLUSH_BATCHES = 0x1,
+	DEBUG_FLUSH_CACHES = 0x2,
+	DEBUG_FLUSH_WAIT = 0x4,
+};
 
-   Bool lvds_24_bit_mode;
-   Bool lvds_use_ssc;
-   int lvds_ssc_freq; /* in MHz */
-   Bool lvds_dither;
-   DisplayModePtr lvds_fixed_mode;
-   Bool skip_panel_detect;
-   Bool integrated_lvds; /* LVDS config from driver feature BDB */
-
-   Bool tv_present; /* TV connector present (from VBIOS) */
-
-   /* Driver phase/state information */
-   Bool preinit;
-   Bool starting;
-   Bool closing;
-   Bool suspended;
-   Bool leaving;
-
-   /* fbOffset converted to (x, y). */
-   int xoffset;
-   int yoffset;
-
-   unsigned int SaveGeneration;
-
-   OsTimerPtr devicesTimer;
-
-   int ddc2;
-
-   enum backlight_control backlight_control_method;
-
-   uint32_t saveDSPARB;
-   uint32_t saveDSPACNTR;
-   uint32_t saveDSPBCNTR;
-   uint32_t savePIPEACONF;
-   uint32_t savePIPEBCONF;
-   uint32_t savePIPEASRC;
-   uint32_t savePIPEBSRC;
-   uint32_t saveFPA0;
-   uint32_t saveFPA1;
-   uint32_t saveDPLL_A;
-   uint32_t saveDPLL_A_MD;
-   uint32_t saveHTOTAL_A;
-   uint32_t saveHBLANK_A;
-   uint32_t saveHSYNC_A;
-   uint32_t saveVTOTAL_A;
-   uint32_t saveVBLANK_A;
-   uint32_t saveVSYNC_A;
-   uint32_t saveBCLRPAT_A;
-   uint32_t saveDSPASTRIDE;
-   uint32_t saveDSPASIZE;
-   uint32_t saveDSPAPOS;
-   uint32_t saveDSPABASE;
-   uint32_t saveDSPASURF;
-   uint32_t saveDSPATILEOFF;
-   uint32_t saveFPB0;
-   uint32_t saveFPB1;
-   uint32_t saveDPLL_B;
-   uint32_t saveDPLL_B_MD;
-   uint32_t saveHTOTAL_B;
-   uint32_t saveHBLANK_B;
-   uint32_t saveHSYNC_B;
-   uint32_t saveVTOTAL_B;
-   uint32_t saveVBLANK_B;
-   uint32_t saveVSYNC_B;
-   uint32_t saveBCLRPAT_B;
-   uint32_t saveDSPBSTRIDE;
-   uint32_t saveDSPBSIZE;
-   uint32_t saveDSPBPOS;
-   uint32_t saveDSPBBASE;
-   uint32_t saveDSPBSURF;
-   uint32_t saveDSPBTILEOFF;
-   uint32_t saveVCLK_DIVISOR_VGA0;
-   uint32_t saveVCLK_DIVISOR_VGA1;
-   uint32_t saveVCLK_POST_DIV;
-   uint32_t saveVGACNTRL;
-   uint32_t saveCURSOR_A_CONTROL;
-   uint32_t saveCURSOR_A_BASE;
-   uint32_t saveCURSOR_A_POSITION;
-   uint32_t saveCURSOR_B_CONTROL;
-   uint32_t saveCURSOR_B_BASE;
-   uint32_t saveCURSOR_B_POSITION;
-   uint32_t saveADPA;
-   uint32_t saveLVDS;
-   uint32_t saveDVOA;
-   uint32_t saveDVOB;
-   uint32_t saveDVOC;
-   uint32_t savePP_ON;
-   uint32_t savePP_OFF;
-   uint32_t savePP_CONTROL;
-   uint32_t savePP_DIVISOR;
-   uint32_t savePFIT_CONTROL;
-   uint32_t savePaletteA[256];
-   uint32_t savePaletteB[256];
-   uint32_t saveSWF[17];
-   uint32_t saveBLC_PWM_CTL;
-   uint32_t saveBLC_PWM_CTL2;
-   uint32_t saveFBC_CFB_BASE;
-   uint32_t saveFBC_LL_BASE;
-   uint32_t saveFBC_CONTROL2;
-   uint32_t saveFBC_CONTROL;
-   uint32_t saveFBC_FENCE_OFF;
-   uint32_t saveRENCLK_GATE_D1;
-   uint32_t saveRENCLK_GATE_D2;
-   uint32_t saveDSPCLK_GATE_D;
-   uint32_t saveRAMCLK_GATE_D;
-   uint32_t savePWRCTXA;
-
-   enum last_3d last_3d;
-
-   Bool use_drm_mode;
-   Bool kernel_exec_fencing;
-
-   /** Enables logging of debug output related to mode switching. */
-   Bool debug_modes;
-   unsigned int quirk_flag;
-
-    /** User option to print acceleration fallback info to the server log. */
-   Bool fallback_debug;
-} I830Rec;
 
-#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))
+static inline intel_screen_private *
+intel_get_screen_private(ScrnInfoPtr scrn)
+{
+	return (intel_screen_private *)(scrn->driverPrivate);
+}
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#define ALIGN(i,m)	(((i) + (m) - 1) & ~((m) - 1))
+#define MIN(a,b)	((a) < (b) ? (a) : (b))
 
 #define I830_SELECT_FRONT	0
 #define I830_SELECT_BACK	1
 #define I830_SELECT_DEPTH	2
 #define I830_SELECT_THIRD	3
 
-unsigned long intel_get_pixmap_offset(PixmapPtr pPix);
-unsigned long intel_get_pixmap_pitch(PixmapPtr pPix);
-
-struct i830_exa_pixmap_priv {
-    dri_bo *bo;
-};
+unsigned long intel_get_pixmap_offset(PixmapPtr pixmap);
+unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap);
 
 /* Batchbuffer support macros and functions */
 #include "i830_batchbuffer.h"
 
 /* I830 specific functions */
-extern int I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis);
-extern void I830SetPIOAccess(I830Ptr pI830);
-extern void I830SetMMIOAccess(I830Ptr pI830);
-extern void I830Sync(ScrnInfoPtr pScrn);
-extern void I830InitHWCursor(ScrnInfoPtr pScrn);
+extern void I830SetPIOAccess(intel_screen_private *intel);
+extern void I830SetMMIOAccess(intel_screen_private *intel);
+extern void I830InitHWCursor(ScrnInfoPtr scrn);
 extern void I830SetPipeCursor (xf86CrtcPtr crtc, Bool force);
 extern Bool I830CursorInit(ScreenPtr pScreen);
-extern void IntelEmitInvarientState(ScrnInfoPtr pScrn);
-extern void I830EmitInvarientState(ScrnInfoPtr pScrn);
-extern void I915EmitInvarientState(ScrnInfoPtr pScrn);
-extern Bool I830SelectBuffer(ScrnInfoPtr pScrn, int buffer);
-void i830_update_cursor_offsets(ScrnInfoPtr pScrn);
+extern void IntelEmitInvarientState(ScrnInfoPtr scrn);
+extern void I830EmitInvarientState(ScrnInfoPtr scrn);
+extern void I915EmitInvarientState(ScrnInfoPtr scrn);
+extern Bool I830SelectBuffer(ScrnInfoPtr scrn, int buffer);
+void i830_update_cursor_offsets(ScrnInfoPtr scrn);
 
 /* CRTC-based cursor functions */
 void
@@ -770,18 +833,17 @@ i830_crtc_hide_cursor (xf86CrtcPtr crtc)
 void
 i830_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg);
 
-extern void i830_refresh_ring(ScrnInfoPtr pScrn);
-extern void I830EmitFlush(ScrnInfoPtr pScrn);
+extern void i830_refresh_ring(ScrnInfoPtr scrn);
+extern void I830EmitFlush(ScrnInfoPtr scrn);
 
-#ifdef I830_XV
 extern void I830InitVideo(ScreenPtr pScreen);
 extern void i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on);
-#endif
-
+extern xf86CrtcPtr i830_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
+				      xf86CrtcPtr desired, BoxPtr crtc_box_ret);
 int
 i830_crtc_pipe (xf86CrtcPtr crtc);
 
-extern xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr pScrn, int pipe);
+extern xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr scrn, int pipe);
 
 Bool
 i830_pipe_a_require_activate (ScrnInfoPtr scrn);
@@ -789,159 +851,139 @@ i830_pipe_a_require_activate (ScrnInfoPt
 void
 i830_pipe_a_require_deactivate (ScrnInfoPtr scrn);
 
-#ifdef XF86DRI
-extern Bool I830Allocate3DMemory(ScrnInfoPtr pScrn, const int flags);
-extern void I830SetupMemoryTiling(ScrnInfoPtr pScrn);
-extern Bool I830DRIScreenInit(ScreenPtr pScreen);
-extern Bool I830CheckDRIAvailable(ScrnInfoPtr pScrn);
-extern Bool I830DRIDoMappings(ScreenPtr pScreen);
-extern Bool I830DRIResume(ScreenPtr pScreen);
-extern void I830DRICloseScreen(ScreenPtr pScreen);
-extern Bool I830DRIFinishScreenInit(ScreenPtr pScreen);
-extern void I830DRIUnlock(ScrnInfoPtr pScrn);
-extern Bool I830DRILock(ScrnInfoPtr pScrn);
-extern Bool I830DRISetVBlankInterrupt (ScrnInfoPtr pScrn, Bool on);
-extern Bool i830_update_dri_buffers(ScrnInfoPtr pScrn);
-extern Bool I830DRISetHWS(ScrnInfoPtr pScrn);
-extern Bool I830DRIInstIrqHandler(ScrnInfoPtr pScrn);
-#endif
-
-#ifdef DRI2
 Bool I830DRI2ScreenInit(ScreenPtr pScreen);
 void I830DRI2CloseScreen(ScreenPtr pScreen);
-#endif
+void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
+			       unsigned int tv_usec, void *user_data);
 
-#ifdef XF86DRM_MODE
-extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
-extern Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData,
-				     dri_bo **bo);
-#endif
+extern Bool drmmode_pre_init(ScrnInfoPtr scrn, int fd, int cpp);
+extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr * bufmgr,
+					 xf86CrtcPtr crtc);
+extern void drmmode_closefb(ScrnInfoPtr scrn);
+extern int drmmode_output_dpms_status(xf86OutputPtr output);
+extern int drmmode_crtc_id(xf86CrtcPtr crtc);
+void drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo * cursor);
 
+extern Bool i830_crtc_on(xf86CrtcPtr crtc);
+extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
 extern Bool I830AccelInit(ScreenPtr pScreen);
-extern void I830SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir,
+extern void I830SetupForScreenToScreenCopy(ScrnInfoPtr scrn, int xdir,
 					   int ydir, int rop,
 					   unsigned int planemask,
 					   int trans_color);
-extern void I830SubsequentScreenToScreenCopy(ScrnInfoPtr pScrn, int srcX,
+extern void I830SubsequentScreenToScreenCopy(ScrnInfoPtr scrn, int srcX,
 					     int srcY, int dstX, int dstY,
 					     int w, int h);
-extern void I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,
+extern void I830SetupForSolidFill(ScrnInfoPtr scrn, int color, int rop,
 				  unsigned int planemask);
-extern void I830SubsequentSolidFillRect(ScrnInfoPtr pScrn, int x, int y,
+extern void I830SubsequentSolidFillRect(ScrnInfoPtr scrn, int x, int y,
 					int w, int h);
 
-Bool i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset,
-			 unsigned long size);
-void i830_allocator_fini(ScrnInfoPtr pScrn);
-i830_memory * i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
-				   unsigned long size, unsigned long pitch,
-				   unsigned long alignment, int flags,
-				   enum tile_format tile_format);
-void i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity,
+Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size);
+void i830_allocator_fini(ScrnInfoPtr scrn);
+i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
+				  unsigned long size, unsigned long pitch,
+				  unsigned long alignment, int flags,
+				  enum tile_format tile_format);
+void i830_describe_allocations(ScrnInfoPtr scrn, int verbosity,
 			       const char *prefix);
-void i830_reset_allocations(ScrnInfoPtr pScrn);
-void i830_free_3d_memory(ScrnInfoPtr pScrn);
-void i830_free_memory(ScrnInfoPtr pScrn, i830_memory *mem);
-extern long I830CheckAvailableMemory(ScrnInfoPtr pScrn);
-Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn);
-Bool i830_allocate_texture_memory(ScrnInfoPtr pScrn);
-Bool i830_allocate_pwrctx(ScrnInfoPtr pScrn);
-Bool i830_allocate_3d_memory(ScrnInfoPtr pScrn);
-void i830_init_bufmgr(ScrnInfoPtr pScrn);
+void i830_reset_allocations(ScrnInfoPtr scrn);
+void i830_free_3d_memory(ScrnInfoPtr scrn);
+void i830_free_memory(ScrnInfoPtr scrn, i830_memory *mem);
+extern long I830CheckAvailableMemory(ScrnInfoPtr scrn);
+Bool i830_allocate_2d_memory(ScrnInfoPtr scrn);
+Bool i830_allocate_pwrctx(ScrnInfoPtr scrn);
+Bool i830_allocate_3d_memory(ScrnInfoPtr scrn);
+void i830_init_bufmgr(ScrnInfoPtr scrn);
 #ifdef INTEL_XVMC
-Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
-                               i830_memory **buffer, unsigned long size, int flags);
+Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name,
+			       i830_memory ** buffer, unsigned long size,
+			       int flags);
+void i830_free_xvmc_buffer(ScrnInfoPtr scrn, i830_memory * buffer);
 #endif
-extern void i830_update_front_offset(ScrnInfoPtr pScrn);
-extern uint32_t i830_create_new_fb(ScrnInfoPtr pScrn, int width, int height,
+extern uint32_t i830_create_new_fb(ScrnInfoPtr scrn, int width, int height,
 				   int *pitch);
 
-Bool
-i830_tiled_width(I830Ptr i830, int *width, int cpp);
+Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp);
 
-int
-i830_pad_drawable_width(int width, int cpp);
-
-
-extern Bool I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr, int i2c_reg,
+extern Bool I830I2CInit(ScrnInfoPtr scrn, I2CBusPtr *bus_ptr, int i2c_reg,
 			char *name);
 
-/* return a mask of output indices matching outputs against type_mask */
-int i830_output_clones (ScrnInfoPtr pScrn, int type_mask);
-
 /* i830_display.c */
 Bool
 i830PipeHasType (xf86CrtcPtr crtc, int type);
 
 /* i830_crt.c */
-void i830_crt_init(ScrnInfoPtr pScrn);
+void i830_crt_init(ScrnInfoPtr scrn);
 
 /* i830_dvo.c */
-void i830_dvo_init(ScrnInfoPtr pScrn);
+void i830_dvo_init(ScrnInfoPtr scrn);
 
 /* i830_hdmi.c */
-void i830_hdmi_init(ScrnInfoPtr pScrn, int output_reg);
+void i830_hdmi_init(ScrnInfoPtr scrn, int output_reg);
 
 /* i830_lvds.c */
-void i830_lvds_init(ScrnInfoPtr pScrn);
-
-extern void i830MarkSync(ScrnInfoPtr pScrn);
-extern void i830WaitSync(ScrnInfoPtr pScrn);
+void i830_lvds_init(ScrnInfoPtr scrn);
 
 /* i830_memory.c */
-Bool i830_bind_all_memory(ScrnInfoPtr pScrn);
-Bool i830_unbind_all_memory(ScrnInfoPtr pScrn);
-unsigned long i830_get_fence_size(I830Ptr pI830, unsigned long size);
-unsigned long i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch, int format);
-unsigned long i830_get_fence_alignment(I830Ptr pI830, unsigned long size);
-
-Bool I830BindAGPMemory(ScrnInfoPtr pScrn);
-Bool I830UnbindAGPMemory(ScrnInfoPtr pScrn);
+Bool i830_bind_all_memory(ScrnInfoPtr scrn);
+Bool i830_unbind_all_memory(ScrnInfoPtr scrn);
+unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size);
+unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch,
+				   int format);
+void i830_set_gem_max_sizes(ScrnInfoPtr scrn);
 
-i830_memory *
-i830_allocate_framebuffer(ScrnInfoPtr pScrn);
+i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn);
 
 /* i830_modes.c */
 DisplayModePtr i830_ddc_get_modes(xf86OutputPtr output);
 
 /* i830_tv.c */
-void i830_tv_init(ScrnInfoPtr pScrn);
+void i830_tv_init(ScrnInfoPtr scrn);
 
 /* i830_render.c */
-Bool i830_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
-			  PicturePtr pDst);
-Bool i830_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
-			    PicturePtr pDst, PixmapPtr pSrcPixmap,
-			    PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
-Bool
-i830_transform_is_affine (PictTransformPtr t);
+Bool i830_check_composite(int op,
+			  PicturePtr sourcec, PicturePtr mask, PicturePtr dest,
+			  int width, int height);
+Bool i830_check_composite_target(PixmapPtr pixmap);
+Bool i830_check_composite_texture(ScreenPtr screen, PicturePtr picture);
+Bool i830_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
+			    PicturePtr dest, PixmapPtr sourcecPixmap,
+			    PixmapPtr maskPixmap, PixmapPtr destPixmap);
+Bool i830_transform_is_affine(PictTransformPtr t);
 
-void i830_composite(PixmapPtr pDst, int srcX, int srcY,
+void i830_composite(PixmapPtr dest, int srcX, int srcY,
 		    int maskX, int maskY, int dstX, int dstY, int w, int h);
-void i830_done_composite(PixmapPtr pDst);
+void i830_done_composite(PixmapPtr dest);
 /* i915_render.c */
-Bool i915_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
-			  PicturePtr pDst);
-Bool i915_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
-			    PicturePtr pDst, PixmapPtr pSrcPixmap,
-			    PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
-void i915_composite(PixmapPtr pDst, int srcX, int srcY,
+Bool i915_check_composite(int op,
+			  PicturePtr sourcec, PicturePtr mask, PicturePtr dest,
+			  int width, int height);
+Bool i915_check_composite_target(PixmapPtr pixmap);
+Bool i915_check_composite_texture(ScreenPtr screen, PicturePtr picture);
+Bool i915_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
+			    PicturePtr dest, PixmapPtr sourcecPixmap,
+			    PixmapPtr maskPixmap, PixmapPtr destPixmap);
+void i915_composite(PixmapPtr dest, int srcX, int srcY,
 		    int maskX, int maskY, int dstX, int dstY, int w, int h);
-void i915_batch_flush_notify(ScrnInfoPtr pScrn);
+void i915_vertex_flush(intel_screen_private *intel);
+void i915_batch_flush_notify(ScrnInfoPtr scrn);
+void i830_batch_flush_notify(ScrnInfoPtr scrn);
 /* i965_render.c */
-unsigned int gen4_render_state_size(ScrnInfoPtr pScrn);
-void gen4_render_state_init(ScrnInfoPtr pScrn);
-void gen4_render_state_cleanup(ScrnInfoPtr pScrn);
-Bool i965_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
-			  PicturePtr pDst);
-Bool i965_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
-			    PicturePtr pDst, PixmapPtr pSrcPixmap,
-			    PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
-void i965_composite(PixmapPtr pDst, int srcX, int srcY,
+unsigned int gen4_render_state_size(ScrnInfoPtr scrn);
+void gen4_render_state_init(ScrnInfoPtr scrn);
+void gen4_render_state_cleanup(ScrnInfoPtr scrn);
+Bool i965_check_composite(int op,
+			  PicturePtr sourcec, PicturePtr mask, PicturePtr dest,
+			  int width, int height);
+Bool i965_check_composite_texture(ScreenPtr screen, PicturePtr picture);
+Bool i965_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
+			    PicturePtr dest, PixmapPtr sourcecPixmap,
+			    PixmapPtr maskPixmap, PixmapPtr destPixmap);
+void i965_composite(PixmapPtr dest, int srcX, int srcY,
 		    int maskX, int maskY, int dstX, int dstY, int w, int h);
 
-void
-i965_batch_flush_notify(ScrnInfoPtr pScrn);
+void i965_batch_flush_notify(ScrnInfoPtr scrn);
 
 Bool
 i830_get_transformed_coordinates(int x, int y, PictTransformPtr transform,
@@ -953,61 +995,72 @@ i830_get_transformed_coordinates_3d(int
 
 void i830_enter_render(ScrnInfoPtr);
 
-#ifndef SERVER_1_5
-Bool xf86MonitorIsHDMI(xf86MonPtr mon);
-#endif
-
-static inline void
-i830_wait_ring_idle(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   if (pI830->accel != ACCEL_NONE)
-       I830WaitLpRing(pScrn, pI830->ring.mem->size - 8, 0);
-}
+extern void intel_sync(ScrnInfoPtr scrn);
 
-static inline int i830_fb_compression_supported(I830Ptr pI830)
+static inline int i830_fb_compression_supported(intel_screen_private *intel)
 {
-    if (!IS_MOBILE(pI830))
+    if (!IS_MOBILE(intel))
+	return FALSE;
+    if (IS_I810(intel) || IS_I815(intel) || IS_I830(intel))
+	return FALSE;
+    if (IS_IGD(intel))
 	return FALSE;
-    if (IS_I810(pI830) || IS_I815(pI830) || IS_I830(pI830))
+    if (IS_IGDNG(intel))
 	return FALSE;
-    /* fbc depends on tiled surface. And we don't support tiled
-     * front buffer with XAA now.
+    /* fbc depends on tiled surface.
      */
-    if (!pI830->tiling || (IS_I965G(pI830) && pI830->accel <= ACCEL_XAA))
+    if (!intel->tiling)
 	return FALSE;
     /* We have not gotten FBC to work consistently on 965GM. Our best
      * working theory right now is that FBC simply isn't reliable on
      * that device. See this bug report for more details:
      * https://bugs.freedesktop.org/show_bug.cgi?id=16257
      */
-    if (IS_I965GM(pI830))
+    if (IS_I965GM(intel) || IS_I915GM(intel) || IS_I945GM(intel))
 	return FALSE;
     return TRUE;
 }
 
-#define I830FALLBACK(s, arg...)				\
-do {							\
-    if (I830PTR(pScrn)->fallback_debug) {		\
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,		\
-		   "EXA fallback: " s "\n", ##arg);	\
-    }							\
-    return FALSE;					\
-} while(0)
+static inline void
+intel_debug_fallback(ScrnInfoPtr scrn, char *format, ...)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	va_list ap;
+
+	va_start(ap, format);
+	if (intel->fallback_debug) {
+		xf86DrvMsg(scrn->scrnIndex, X_INFO, "fallback: ");
+		LogVMessageVerb(X_INFO, 1, format, ap);
+	}
+	va_end(ap);
+}
 
 Bool i830_pixmap_tiled(PixmapPtr p);
 
-#define i830_exa_check_pitch_2d(p) do {\
-    uint32_t pitch = intel_get_pixmap_pitch(p);\
-    if (pitch > KB(32)) I830FALLBACK("pitch exceeds 2d limit 32K\n");\
-} while(0)
+static inline Bool
+intel_check_pitch_2d(PixmapPtr pixmap)
+{
+	uint32_t pitch = intel_get_pixmap_pitch(pixmap);
+	if (pitch > KB(32)) {
+		ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+		intel_debug_fallback(scrn, "pitch exceeds 2d limit 32K\n");
+		return FALSE;
+	}
+	return TRUE;
+}
 
 /* For pre-965 chip only, as they have 8KB limit for 3D */
-#define i830_exa_check_pitch_3d(p) do {\
-    uint32_t pitch = intel_get_pixmap_pitch(p);\
-    if (pitch > KB(8)) I830FALLBACK("pitch exceeds 3d limit 8K\n");\
-} while(0)
+static inline Bool
+intel_check_pitch_3d(PixmapPtr pixmap)
+{
+	uint32_t pitch = intel_get_pixmap_pitch(pixmap);
+	if (pitch > KB(8)) {
+		ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+		intel_debug_fallback(scrn, "pitch exceeds 3d limit 8K\n");
+		return FALSE;
+	}
+	return TRUE;
+}
 
 /**
  * Little wrapper around drm_intel_bo_reloc to return the initial value you
@@ -1016,29 +1069,30 @@ Bool i830_pixmap_tiled(PixmapPtr p);
  * If only we'd done this before settling on the library API.
  */
 static inline uint32_t
-intel_emit_reloc(drm_intel_bo *bo, uint32_t offset,
-		 drm_intel_bo *target_bo, uint32_t target_offset,
+intel_emit_reloc(drm_intel_bo * bo, uint32_t offset,
+		 drm_intel_bo * target_bo, uint32_t target_offset,
 		 uint32_t read_domains, uint32_t write_domain)
 {
-    drm_intel_bo_emit_reloc(bo, offset, target_bo, target_offset,
-			    read_domains, write_domain);
+	drm_intel_bo_emit_reloc(bo, offset, target_bo, target_offset,
+				read_domains, write_domain);
 
-    return target_bo->offset + target_offset;
+	return target_bo->offset + target_offset;
 }
 
-static inline drm_intel_bo *
-intel_bo_alloc_for_data(ScrnInfoPtr scrn, void *data, unsigned int size,
-			char *name)
+static inline drm_intel_bo *intel_bo_alloc_for_data(ScrnInfoPtr scrn,
+						    void *data,
+						    unsigned int size,
+						    char *name)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *bo;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *bo;
 
-    bo = drm_intel_bo_alloc(pI830->bufmgr, name, size, 4096);
-    if (!bo)
-	return NULL;
-    drm_intel_bo_subdata(bo, 0, size, data);
+	bo = drm_intel_bo_alloc(intel->bufmgr, name, size, 4096);
+	if (!bo)
+		return NULL;
+	drm_intel_bo_subdata(bo, 0, size, data);
 
-    return bo;
+	return bo;
 }
 
 extern const int I830PatternROP[16];
@@ -1050,6 +1104,7 @@ extern const int I830CopyROP[16];
 #define NEED_NON_STOLEN			0x00000004
 #define NEED_LIFETIME_FIXED		0x00000008
 #define ALLOW_SHARING			0x00000010
+#define DISABLE_REUSE			0x00000020
 
 /* Chipset registers for VIDEO BIOS memory RW access */
 #define _855_DRAM_RW_CONTROL 0x58
@@ -1068,15 +1123,32 @@ extern const int I830CopyROP[16];
 #define QUIRK_BROKEN_ACPI_LID		0x00000100
 extern void i830_fixup_devices(ScrnInfoPtr);
 
-/**
- * Hints to CreatePixmap to tell the driver how the pixmap is going to be
- * used.
- *
- * Compare to CREATE_PIXMAP_USAGE_* in the server.
+void i830_debug_flush(ScrnInfoPtr scrn);
+
+static inline PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
+{
+	ScreenPtr screen = drawable->pScreen;
+
+	if (drawable->type == DRAWABLE_PIXMAP)
+		return (PixmapPtr) drawable;
+	else
+		return screen->GetWindowPixmap((WindowPtr) drawable);
+}
+
+static inline Bool pixmap_is_scanout(PixmapPtr pixmap)
+{
+	ScreenPtr screen = pixmap->drawable.pScreen;
+
+	return pixmap == screen->GetScreenPixmap(screen);
+}
+
+/*
+ * Pad to accelerator requirement
  */
-enum {
-    INTEL_CREATE_PIXMAP_TILING_X = 0x10000000,
-    INTEL_CREATE_PIXMAP_TILING_Y,
-};
+static inline int i830_pad_drawable_width(int width)
+{
+	return (width + 63) & ~63;
+}
+
 
 #endif /* _I830_H_ */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_hdmi.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_hdmi.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_hdmi.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_hdmi.c	2011-02-08 11:14:00.000000000 +0100
@@ -73,10 +73,10 @@ static void
 i830_hdmi_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 		   DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct i830_hdmi_priv *dev_priv = intel_output->dev_priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     xf86CrtcPtr crtc = output->crtc;
     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
     uint32_t sdvox;
@@ -99,10 +99,10 @@ i830_hdmi_mode_set(xf86OutputPtr output,
 static void
 i830_hdmi_dpms(xf86OutputPtr output, int mode)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct i830_hdmi_priv *dev_priv = intel_output->dev_priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t  temp;
 
     if (mode == DPMSModeOff) {
@@ -117,10 +117,10 @@ i830_hdmi_dpms(xf86OutputPtr output, int
 static void
 i830_hdmi_save(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct i830_hdmi_priv *dev_priv = intel_output->dev_priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     dev_priv->save_SDVO = INREG(dev_priv->output_reg);
 }
@@ -128,14 +128,30 @@ i830_hdmi_save(xf86OutputPtr output)
 static void
 i830_hdmi_restore(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct i830_hdmi_priv *dev_priv = intel_output->dev_priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     OUTREG(dev_priv->output_reg, dev_priv->save_SDVO);
 }
 
+static xf86OutputStatus
+igdng_hdmi_detect(xf86OutputPtr output)
+{
+    DisplayModePtr modes;
+    xf86OutputStatus status;
+
+    modes = i830_ddc_get_modes(output);
+
+    if (modes == NULL)
+	status = XF86OutputStatusDisconnected;
+    else
+	status = XF86OutputStatusConnected;
+
+    return status;
+}
+
 /**
  * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect HDMI connection.
  *
@@ -145,35 +161,46 @@ i830_hdmi_restore(xf86OutputPtr output)
 static xf86OutputStatus
 i830_hdmi_detect(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
+    ScrnInfoPtr	scrn = output->scrn;
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct i830_hdmi_priv *dev_priv = intel_output->dev_priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t temp, bit;
     xf86OutputStatus status;
     xf86MonPtr edid_mon;
 
     dev_priv->has_hdmi_sink = FALSE;
 
+    if (IS_IGDNG(intel))
+	return igdng_hdmi_detect(output);
+
     /* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written 0xd.
      * Failure to do so will result in spurious interrupts being
      * generated on the port when a cable is not attached.
      */
-    if (IS_G4X(pI830) && !IS_GM45(pI830)) {
+    if (IS_G4X(intel) && !IS_GM45(intel)) {
 	temp = INREG(PEG_BAND_GAP_DATA);
 	OUTREG(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
     }
 
     temp = INREG(PORT_HOTPLUG_EN);
 
-    OUTREG(PORT_HOTPLUG_EN,
-	   temp |
-	   HDMIB_HOTPLUG_INT_EN |
-	   HDMIC_HOTPLUG_INT_EN |
-	   HDMID_HOTPLUG_INT_EN);
+    switch (dev_priv->output_reg) {
+    case SDVOB:
+	temp |= HDMIB_HOTPLUG_INT_EN;
+	break;
+    case SDVOC:
+	temp |= HDMIC_HOTPLUG_INT_EN;
+	break;
+    default:
+	return XF86OutputStatusUnknown;
+    }
+
+    OUTREG(PORT_HOTPLUG_EN, temp);
 
     POSTING_READ(PORT_HOTPLUG_EN);
 
+    i830WaitForVblank(scrn);
     switch (dev_priv->output_reg) {
     case SDVOB:
 	bit = HDMIB_HOTPLUG_INT_STATUS;
@@ -198,13 +225,13 @@ i830_hdmi_detect(xf86OutputPtr output)
 	    xf86MonitorIsHDMI(edid_mon))
 	dev_priv->has_hdmi_sink = TRUE;
 
-    if (pI830->debug_modes)
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    if (intel->debug_modes)
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 			"%s monitor detected on HDMI-%d\n",
 			dev_priv->has_hdmi_sink ? "HDMI" : "DVI",
 			(dev_priv->output_reg == SDVOB) ? 1 : 2);
 
-    xfree(edid_mon);
+    free(edid_mon);
     return status;
 }
 
@@ -215,24 +242,24 @@ i830_hdmi_destroy (xf86OutputPtr output)
 
     if (intel_output != NULL) {
 	xf86DestroyI2CBusRec(intel_output->pDDCBus, FALSE, FALSE);
-	xfree(intel_output);
+	free(intel_output);
     }
 }
 
 static void
 i830_hdmi_create_resources(xf86OutputPtr output)
 {
-    ScrnInfoPtr                 pScrn = output->scrn;
-    I830Ptr                     pI830 = I830PTR(pScrn);
+    ScrnInfoPtr                 scrn = output->scrn;
+    intel_screen_private        *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr        intel_output = output->driver_private;
     struct i830_hdmi_priv       *dev_priv = intel_output->dev_priv;
     INT32			broadcast_range[2];
     int                         err;
 
     /* only R G B are 8bit color mode */
-    if (pScrn->depth != 24 ||
+    if (scrn->depth != 24 ||
         /* only 965G and G4X platform */
-        !(IS_I965G(pI830) || IS_G4X(pI830)))
+        !(IS_I965G(intel) || IS_G4X(intel)))
         return;
 
     broadcast_atom =
@@ -244,7 +271,7 @@ i830_hdmi_create_resources(xf86OutputPtr
                                     broadcast_atom,
                                     FALSE, TRUE, FALSE, 2, broadcast_range);
     if (err != 0) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+        xf86DrvMsg(scrn->scrnIndex, X_ERROR,
                    "RRConfigureOutputProperty error, %d\n", err);
         return;
     }
@@ -256,7 +283,7 @@ i830_hdmi_create_resources(xf86OutputPtr
                                  1, &dev_priv->broadcast_rgb,
                                  FALSE, TRUE);
     if (err != 0) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+        xf86DrvMsg(scrn->scrnIndex, X_ERROR,
                    "RRChangeOutputProperty error, %d\n", err);
         return;
     }
@@ -266,8 +293,8 @@ static Bool
 i830_hdmi_set_property(xf86OutputPtr output, Atom property,
                        RRPropertyValuePtr value)
 {
-    ScrnInfoPtr             pScrn = output->scrn;
-    I830Ptr                 pI830 = I830PTR(pScrn);
+    ScrnInfoPtr             scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_hdmi_priv   *dev_priv = intel_output->dev_priv;
     uint32_t temp;
@@ -319,14 +346,32 @@ static const xf86OutputFuncsRec i830_hdm
 };
 
 void
-i830_hdmi_init(ScrnInfoPtr pScrn, int output_reg)
+i830_hdmi_init(ScrnInfoPtr scrn, int output_reg)
 {
     xf86OutputPtr output;
     I830OutputPrivatePtr intel_output;
     struct i830_hdmi_priv *dev_priv;
+    const char *name;
+
+    switch (output_reg) {
+    case SDVOB:
+	name = "HDMI-1";
+	break;
+    case SDVOC:
+	name = "HDMI-2";
+	break;
+    case HDMIB:
+	name = "HDMI-3";
+	break;
+    case HDMIC:
+	name = "HDMI-4";
+	break;
+    case HDMID:
+	name = "HDMI-5";
+	break;
+    }
 
-    output = xf86OutputCreate(pScrn, &i830_hdmi_output_funcs,
-			      (output_reg == SDVOB) ? "HDMI-1" : "HDMI-2");
+    output = xf86OutputCreate(scrn, &i830_hdmi_output_funcs, name);
     if (!output)
 	return;
     intel_output = xnfcalloc(sizeof (I830OutputPrivateRec) +
@@ -350,11 +395,16 @@ i830_hdmi_init(ScrnInfoPtr pScrn, int ou
 
     /* Set up the DDC bus. */
     if (output_reg == SDVOB)
-	I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOE, "HDMIDDC_B");
-    else
-	I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOD, "HDMIDDC_C");
+	I830I2CInit(scrn, &intel_output->pDDCBus, GPIOE, "HDMIDDC_B");
+    else if (output_reg == SDVOC)
+	I830I2CInit(scrn, &intel_output->pDDCBus, GPIOD, "HDMIDDC_C");
+    else if (output_reg == HDMIB)
+	I830I2CInit(scrn, &intel_output->pDDCBus, PCH_GPIOE, "HDMIB");
+    else if (output_reg == HDMIC)
+	I830I2CInit(scrn, &intel_output->pDDCBus, PCH_GPIOD, "HDMIC");
+    else if (output_reg == HDMID)
+	I830I2CInit(scrn, &intel_output->pDDCBus, PCH_GPIOF, "HDMID");
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "HDMI output %d detected\n",
-	       (output_reg == SDVOB) ? 1 : 2);
+    xf86DrvMsg(scrn->scrnIndex, X_INFO,
+	       "%s output detected\n", output->name);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.c	2011-02-08 11:14:00.000000000 +0100
@@ -32,128 +32,229 @@
 #include "i830.h"
 #include "i830_hwmc.h"
 
-struct intel_xvmc_driver *xvmc_driver;
-
-/* set global current driver for xvmc */
-Bool intel_xvmc_set_driver(struct intel_xvmc_driver *d)
-{
-    if (xvmc_driver) {
-	ErrorF("XvMC driver already set!\n");
-	return FALSE;
-    } else
-	xvmc_driver = d;
-    return TRUE;
-}
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/XvMC.h>
+#include <fourcc.h>
+
+static int create_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture,
+			     int *num_priv, CARD32 ** priv)
+{
+	return Success;
+}
+
+static void destroy_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture)
+{
+}
+
+static int create_surface(ScrnInfoPtr scrn, XvMCSurfacePtr surface,
+			  int *num_priv, CARD32 ** priv)
+{
+	return Success;
+}
+
+static void destroy_surface(ScrnInfoPtr scrn, XvMCSurfacePtr surface)
+{
+}
+
+static int create_context(ScrnInfoPtr scrn, XvMCContextPtr pContext,
+				    int *num_priv, CARD32 **priv)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct intel_xvmc_hw_context *contextRec;
+
+	*priv = calloc(1, sizeof(struct intel_xvmc_hw_context));
+	contextRec = (struct intel_xvmc_hw_context *) *priv;
+	if (!contextRec) {
+		*num_priv = 0;
+		return BadAlloc;
+	}
+
+	*num_priv = sizeof(struct intel_xvmc_hw_context) >> 2;
+
+	if (IS_I915(intel)) {
+		contextRec->type = XVMC_I915_MPEG2_MC;
+		contextRec->i915.use_phys_addr = 0;
+	} else {
+		if (IS_G4X(intel) || IS_IGDNG(intel))
+			contextRec->type = XVMC_I965_MPEG2_VLD;
+		else
+			contextRec->type = XVMC_I965_MPEG2_MC;
+		contextRec->i965.is_g4x = IS_G4X(intel);
+		contextRec->i965.is_965_q = IS_965_Q(intel);
+		contextRec->i965.is_igdng = IS_IGDNG(intel);
+	}
+
+	return Success;
+}
+
+static void destroy_context(ScrnInfoPtr scrn, XvMCContextPtr context)
+{
+}
+
+/* i915 hwmc support */
+static XF86MCSurfaceInfoRec i915_YV12_mpg2_surface = {
+	FOURCC_YV12,
+	XVMC_CHROMA_FORMAT_420,
+	0,
+	720,
+	576,
+	720,
+	576,
+	XVMC_MPEG_2,
+	/* XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING, */
+	0,
+	/* &yv12_subpicture_list */
+	NULL,
+};
+
+static XF86MCSurfaceInfoRec i915_YV12_mpg1_surface = {
+	FOURCC_YV12,
+	XVMC_CHROMA_FORMAT_420,
+	0,
+	720,
+	576,
+	720,
+	576,
+	XVMC_MPEG_1,
+	/* XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING, */
+	0,
+	NULL,
+};
+
+static XF86MCSurfaceInfoPtr surface_info_i915[2] = {
+	(XF86MCSurfaceInfoPtr) & i915_YV12_mpg2_surface,
+	(XF86MCSurfaceInfoPtr) & i915_YV12_mpg1_surface
+};
+
+/* i965 and later hwmc support */
+#ifndef XVMC_VLD
+#define XVMC_VLD  0x00020000
+#endif
+
+static XF86MCSurfaceInfoRec yv12_mpeg2_vld_surface = {
+	FOURCC_YV12,
+	XVMC_CHROMA_FORMAT_420,
+	0,
+	1936,
+	1096,
+	1920,
+	1080,
+	XVMC_MPEG_2 | XVMC_VLD,
+	XVMC_INTRA_UNSIGNED,
+	NULL
+};
+
+static XF86MCSurfaceInfoRec yv12_mpeg2_i965_surface = {
+	FOURCC_YV12,
+	XVMC_CHROMA_FORMAT_420,
+	0,
+	1936,
+	1096,
+	1920,
+	1080,
+	XVMC_MPEG_2 | XVMC_MOCOMP,
+	/* XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING, */
+	XVMC_INTRA_UNSIGNED,
+	/* &yv12_subpicture_list */
+	NULL
+};
+
+static XF86MCSurfaceInfoRec yv12_mpeg1_i965_surface = {
+	FOURCC_YV12,
+	XVMC_CHROMA_FORMAT_420,
+	0,
+	1920,
+	1080,
+	1920,
+	1080,
+	XVMC_MPEG_1 | XVMC_MOCOMP,
+	/*XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING |
+	   XVMC_INTRA_UNSIGNED, */
+	XVMC_INTRA_UNSIGNED,
+
+	/*&yv12_subpicture_list */
+	NULL
+};
+
+static XF86MCSurfaceInfoPtr surface_info_i965[] = {
+	&yv12_mpeg2_i965_surface,
+	&yv12_mpeg1_i965_surface
+};
+
+static XF86MCSurfaceInfoPtr surface_info_vld[] = {
+	&yv12_mpeg2_vld_surface,
+	&yv12_mpeg2_i965_surface,
+};
 
 /* check chip type and load xvmc driver */
-/* This must be first called! */
-Bool intel_xvmc_probe(ScrnInfoPtr pScrn)
+Bool intel_xvmc_adaptor_init(ScreenPtr pScreen)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    Bool ret = FALSE;
-
-    /* Disable XvMC on DRI2 for now */
-    if (pI830->directRenderingType == DRI_DRI2) {
-	pI830->XvMCEnabled = FALSE;
-	return FALSE;
-    }
-
-    if (!pI830->XvMCEnabled)
-	return FALSE;
-
-    if (IS_I9XX(pI830)) {
-	if (IS_I915(pI830))
-	    ret = intel_xvmc_set_driver(&i915_xvmc_driver);
-	else
-	    ret = intel_xvmc_set_driver(&i965_xvmc_driver);
-    } else {
-	ErrorF("Your chipset doesn't support XvMC.\n");
-	return FALSE;
-    }
-    return TRUE;
-}
-
-void intel_xvmc_finish(ScrnInfoPtr pScrn)
-{
-    if (!xvmc_driver)
-	return;
-    (*xvmc_driver->fini)(pScrn);
-}
-
-Bool intel_xvmc_driver_init(ScreenPtr pScreen, XF86VideoAdaptorPtr xv_adaptor)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-
-    if (!xvmc_driver) {
-	ErrorF("Failed to probe XvMC driver.\n");
-	return FALSE;
-    }
-
-    if (!(*xvmc_driver->init)(pScrn, xv_adaptor)) {
-	ErrorF("XvMC driver initialize failed.\n");
-	return FALSE;
-    }
-    return TRUE;
-}
-
-Bool intel_xvmc_screen_init(ScreenPtr pScreen)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    DRIInfoPtr pDRIInfo = pI830->pDRIInfo;
-
-    if (!xvmc_driver)
-	return FALSE;
-
-    if (xf86XvMCScreenInit(pScreen, 1, &xvmc_driver->adaptor)) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"[XvMC] %s driver initialized.\n",
-		xvmc_driver->name);
-    } else {
-	intel_xvmc_finish(pScrn);
-	pI830->XvMCEnabled = FALSE;
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"[XvMC] Failed to initialize XvMC.\n");
-	return FALSE;
-    }
-
-    xf86XvMCRegisterDRInfo(pScreen, INTEL_XVMC_LIBNAME,
-		    pDRIInfo->busIdString,
-		    INTEL_XVMC_MAJOR, INTEL_XVMC_MINOR, INTEL_XVMC_PATCHLEVEL);
-    return TRUE;
-}
-
-Bool intel_xvmc_init_batch(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    int size = KB(64);
-
-    if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC] batch buffer",
-                                   &(xvmc_driver->batch), size,
-                                   ALIGN_BOTH_ENDS))
-        return FALSE;
-
-    if (drmAddMap(pI830->drmSubFD,
-                  (drm_handle_t)(xvmc_driver->batch->offset+pI830->LinearAddr),
-                  xvmc_driver->batch->size, DRM_AGP, 0,
-                  &xvmc_driver->batch_handle) < 0) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                   "[drm] drmAddMap(batchbuffer_handle) failed!\n");
-        return FALSE;
-    }
-    return TRUE;
-}
-
-void intel_xvmc_fini_batch(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    if (xvmc_driver->batch_handle) {
-        drmRmMap(pI830->drmSubFD, xvmc_driver->batch_handle);
-        xvmc_driver->batch_handle = 0;
-    }
-    if (xvmc_driver->batch) {
-        i830_free_memory(pScrn, xvmc_driver->batch);
-        xvmc_driver->batch = NULL;
-    }
+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	static XF86MCAdaptorRec *pAdapt;
+	char *name;
+	char buf[64];
+
+	if (!intel->XvMCEnabled)
+		return FALSE;
+
+	/* Needs KMS support. */
+	if (IS_I915G(intel) || IS_I915GM(intel))
+		return FALSE;
+
+	if (!IS_I9XX(intel)) {
+		ErrorF("Your chipset doesn't support XvMC.\n");
+		return FALSE;
+	}
+
+	pAdapt = calloc(1, sizeof(XF86MCAdaptorRec));
+	if (!pAdapt) {
+		ErrorF("Allocation error.\n");
+		return FALSE;
+	}
+
+	pAdapt->name = "Intel(R) Textured Video";
+	pAdapt->num_subpictures = 0;
+	pAdapt->subpictures = NULL;
+	pAdapt->CreateContext = create_context;
+	pAdapt->DestroyContext = destroy_context;
+	pAdapt->CreateSurface = create_surface;
+	pAdapt->DestroySurface = destroy_surface;
+	pAdapt->CreateSubpicture =  create_subpicture;
+	pAdapt->DestroySubpicture = destroy_subpicture;
+
+	if (IS_I915(intel)) {
+		name = "i915_xvmc",
+		pAdapt->num_surfaces = ARRAY_SIZE(surface_info_i915);
+		pAdapt->surfaces = surface_info_i915;
+	} else if (IS_G4X(intel) || IS_IGDNG(intel)) {
+		name = "xvmc_vld",
+		pAdapt->num_surfaces = ARRAY_SIZE(surface_info_vld);
+		pAdapt->surfaces = surface_info_vld;
+	} else {
+		name = "i965_xvmc",
+		pAdapt->num_surfaces = ARRAY_SIZE(surface_info_i965);
+		pAdapt->surfaces = surface_info_i965;
+	}
+
+	if (xf86XvMCScreenInit(pScreen, 1, &pAdapt)) {
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "[XvMC] %s driver initialized.\n",
+			   name);
+	} else {
+		intel->XvMCEnabled = FALSE;
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "[XvMC] Failed to initialize XvMC.\n");
+		return FALSE;
+	}
+
+	sprintf(buf, "pci:%04x:%02x:%02x.%d",
+		intel->PciInfo->domain,
+		intel->PciInfo->bus, intel->PciInfo->dev, intel->PciInfo->func);
+
+	xf86XvMCRegisterDRInfo(pScreen, INTEL_XVMC_LIBNAME,
+			       buf,
+			       INTEL_XVMC_MAJOR, INTEL_XVMC_MINOR,
+			       INTEL_XVMC_PATCHLEVEL);
+	return TRUE;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_hwmc.h	2011-02-08 11:14:00.000000000 +0100
@@ -47,68 +47,29 @@
 #define XVMC_I945_MPEG2_VLD	0x04
 #define XVMC_I965_MPEG2_VLD	0x08
 
-/* supported surface types */
-enum {
-    SURFACE_TYPE_MPEG2_MPML = FOURCC_XVMC, /* mpeg2 MP@ML */
-    SURFACE_TYPE_MPEG1_MPML,		   /* mpeg1 MP@ML */
-    SURFACE_TYPE_MAX
-};
-
-/* common header for context private */
-struct hwmc_buffer
-{
-    drm_handle_t handle;
-    unsigned long offset;
-    unsigned long size;
-    unsigned long bus_addr;
-};
-
-struct _intel_xvmc_common {
-    unsigned int type;
-    unsigned int sarea_size;
-    struct hwmc_buffer batchbuffer;
+struct intel_xvmc_hw_context {
+	unsigned int type;
+	union {
+		struct {
+			unsigned int use_phys_addr : 1;
+		} i915;
+		struct {
+			unsigned int is_g4x:1;
+			unsigned int is_965_q:1;
+			unsigned int is_igdng:1;
+		} i965;
+	};
 };
 
 /* Intel private XvMC command to DDX driver */
 struct intel_xvmc_command {
-    unsigned int command;
-    unsigned int ctxNo;
-    unsigned int srfNo;
-    unsigned int subPicNo;
-    unsigned int flags;
-    unsigned int real_id;
-    unsigned int surf_offset;
-    unsigned int pad[5];
+	uint32_t handle;
 };
 
 #ifdef _INTEL_XVMC_SERVER_
 #include <xf86xvmc.h>
 
-struct intel_xvmc_driver {
-    char *name;
-    XF86MCAdaptorPtr adaptor;
-    unsigned int flag;
-    i830_memory *batch;
-    drm_handle_t batch_handle;
-
-    /* more items for xvmv surface manage? */
-    Bool (*init)(ScrnInfoPtr, XF86VideoAdaptorPtr);
-    void (*fini)(ScrnInfoPtr);
-    void* devPrivate;
-};
-
-extern struct intel_xvmc_driver *xvmc_driver;
-extern struct intel_xvmc_driver i915_xvmc_driver;
-extern struct intel_xvmc_driver i965_xvmc_driver;
-
-extern Bool intel_xvmc_set_driver(struct intel_xvmc_driver *);
-extern Bool intel_xvmc_probe(ScrnInfoPtr);
-extern Bool intel_xvmc_driver_init(ScreenPtr, XF86VideoAdaptorPtr);
-extern Bool intel_xvmc_screen_init(ScreenPtr);
-extern void intel_xvmc_finish(ScrnInfoPtr);
-extern int  intel_xvmc_put_image_size(ScrnInfoPtr);
-extern Bool intel_xvmc_init_batch(ScrnInfoPtr);
-extern void intel_xvmc_fini_batch(ScrnInfoPtr);
+extern Bool intel_xvmc_adaptor_init(ScreenPtr);
 #endif
 
 #endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c	2010-11-23 09:53:04.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c	2011-02-08 11:14:00.000000000 +0100
@@ -55,8 +55,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 static void i830_setscl(I2CBusPtr b, int state)
 {
-    ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex];
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = xf86Screens[b->scrnIndex];
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t val;
 
     OUTREG(b->DriverPrivate.uval,
@@ -67,8 +67,8 @@ static void i830_setscl(I2CBusPtr b, int
 
 static void i830_setsda(I2CBusPtr b, int state)
 {
-    ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex];
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = xf86Screens[b->scrnIndex];
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t val;
 
     OUTREG(b->DriverPrivate.uval,
@@ -79,8 +79,8 @@ static void i830_setsda(I2CBusPtr b, int
 
 static void i830_getscl(I2CBusPtr b, int *state)
 {
-    ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex];
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = xf86Screens[b->scrnIndex];
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t val;
 
     OUTREG(b->DriverPrivate.uval, GPIO_CLOCK_DIR_IN | GPIO_CLOCK_DIR_MASK);
@@ -91,8 +91,8 @@ static void i830_getscl(I2CBusPtr b, int
 
 static int i830_getsda(I2CBusPtr b)
  {
-     ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex];
-     I830Ptr pI830 = I830PTR(pScrn);
+     ScrnInfoPtr scrn = xf86Screens[b->scrnIndex];
+     intel_screen_private *intel = intel_get_screen_private(scrn);
      uint32_t val;
 
      OUTREG(b->DriverPrivate.uval, GPIO_DATA_DIR_IN | GPIO_DATA_DIR_MASK);
@@ -268,8 +268,8 @@ static Bool first = TRUE;
 static void
 i830I2CGetBits(I2CBusPtr b, int *clock, int *data)
 {
-    ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex];
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = xf86Screens[b->scrnIndex];
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t val;
 
     val = INREG(b->DriverPrivate.uval);
@@ -300,8 +300,8 @@ i830I2CPutBits(I2CBusPtr b, int clock, i
     int cur_clock, cur_data;
 #endif
 
-    ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex];
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = xf86Screens[b->scrnIndex];
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
 #if I2C_DEBUG
     i830I2CGetBits(b, &cur_clock, &cur_data);
@@ -317,7 +317,7 @@ i830I2CPutBits(I2CBusPtr b, int clock, i
 	   data ? '^' : 'v');
 #endif
 
-    if (!IS_I830(pI830) && !IS_845G(pI830)) {
+    if (!IS_I830(intel) && !IS_845G(intel)) {
 	/* On most chips, these bits must be preserved in software. */
 	reserved = INREG(b->DriverPrivate.uval) &
 	    (GPIO_DATA_PULLUP_DISABLE | GPIO_CLOCK_PULLUP_DISABLE);
@@ -341,10 +341,10 @@ i830I2CPutBits(I2CBusPtr b, int clock, i
 
 /* the i830 has a number of I2C Buses */
 Bool
-I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr, int i2c_reg, char *name)
+I830I2CInit(ScrnInfoPtr scrn, I2CBusPtr *bus_ptr, int i2c_reg, char *name)
 {
     I2CBusPtr pI2CBus;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     pI2CBus = xf86CreateI2CBusRec();
 
@@ -352,7 +352,7 @@ I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr
 	return FALSE;
 
     pI2CBus->BusName = name;
-    pI2CBus->scrnIndex = pScrn->scrnIndex;
+    pI2CBus->scrnIndex = scrn->scrnIndex;
 #if AIRLIED_I2C
     pI2CBus->I2CGetByte = I830I2CGetByte;
     pI2CBus->I2CPutByte = I830I2CPutByte;
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c	2011-02-08 11:14:00.000000000 +0100
@@ -85,6 +85,7 @@ static char *backlight_interfaces[] = {
     "acpi_video0",
     "fujitsu-laptop",
     "sony",
+    "samsung",
     NULL,
 };
 
@@ -110,7 +111,7 @@ enum lid_status {
 static Bool
 i830_kernel_backlight_available(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     struct stat buf;
     char path[BACKLIGHT_PATH_LEN];
     int i;
@@ -119,7 +120,7 @@ i830_kernel_backlight_available(xf86Outp
 	sprintf(path, "%s/%s", BACKLIGHT_CLASS, backlight_interfaces[i]);
 	if (!stat(path, &buf)) {
 	    backlight_index = i;
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "found backlight control "
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO, "found backlight control "
 		       "method %s\n", path);
 	    return 1;
 	}
@@ -132,14 +133,18 @@ i830_kernel_backlight_available(xf86Outp
 static void
 i830_set_lvds_backlight_method(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t blc_pwm_ctl, blc_pwm_ctl2;
     enum backlight_control method = BCM_NATIVE; /* Default to native */
 
     if (i830_kernel_backlight_available(output)) {
 	    method = BCM_KERNEL;
-    } else if (IS_I965GM(pI830) || IS_GM45(pI830)) {
+#if 0
+    } else if (IS_IGDNG(intel)) {
+	method = BCM_IRONLAKE_NULL;
+#endif
+    } else if (IS_I965GM(intel) || IS_GM45(intel)) {
 	blc_pwm_ctl2 = INREG(BLC_PWM_CTL2);
 	if (blc_pwm_ctl2 & BLM_LEGACY_MODE2)
 	    method = BCM_COMBO;
@@ -149,7 +154,7 @@ i830_set_lvds_backlight_method(xf86Outpu
 	    method = BCM_COMBO;
     }
 
-    pI830->backlight_control_method = method;
+    intel->backlight_control_method = method;
 }
 
 /*
@@ -158,20 +163,25 @@ i830_set_lvds_backlight_method(xf86Outpu
 static void
 i830_lvds_set_backlight_native(xf86OutputPtr output, int level)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t blc_pwm_ctl;
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    uint32_t blc_pwm_ctl, reg;
 
-    blc_pwm_ctl = INREG(BLC_PWM_CTL);
+    if (IS_IGDNG(intel))
+      reg = BLC_PWM_CPU_CTL;
+    else
+      reg = BLC_PWM_CTL;
+
+    blc_pwm_ctl = INREG(reg);
     blc_pwm_ctl &= ~BACKLIGHT_DUTY_CYCLE_MASK;
-    OUTREG(BLC_PWM_CTL, blc_pwm_ctl | (level << BACKLIGHT_DUTY_CYCLE_SHIFT));
+    OUTREG(reg, blc_pwm_ctl | (level << BACKLIGHT_DUTY_CYCLE_SHIFT));
 }
 
 static int
 i830_lvds_get_backlight_native(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t blc_pwm_ctl;
 
     blc_pwm_ctl = INREG(BLC_PWM_CTL);
@@ -182,12 +192,19 @@ i830_lvds_get_backlight_native(xf86Outpu
 static int
 i830_lvds_get_backlight_max_native(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t pwm_ctl = INREG(BLC_PWM_CTL);
-    int val;
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    uint32_t pwm_ctl;
+    int val, reg;
+
+    if (IS_IGDNG(intel))
+      reg = BLC_PWM_PCH_CTL2;
+    else
+      reg = BLC_PWM_CTL;
+
+    pwm_ctl = INREG(reg);
 
-    if (IS_I965GM(pI830) || IS_GM45(pI830)) {
+    if (IS_I965GM(intel) || IS_GM45(intel)) {
 	val = ((pwm_ctl & BACKLIGHT_MODULATION_FREQ_MASK2) >>
 	       BACKLIGHT_MODULATION_FREQ_SHIFT2);
     } else {
@@ -204,29 +221,21 @@ i830_lvds_get_backlight_max_native(xf86O
 static void
 i830_lvds_set_backlight_legacy(xf86OutputPtr output, int level)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
-#if XSERVER_LIBPCIACCESS
-    pci_device_cfg_write_u8(pI830->PciInfo, level,
+    pci_device_cfg_write_u8(intel->PciInfo, level,
 			    LEGACY_BACKLIGHT_BRIGHTNESS);
-#else
-    pciWriteByte(pI830->PciTag, LEGACY_BACKLIGHT_BRIGHTNESS, level);
-#endif
 }
 
 static int
 i830_lvds_get_backlight_legacy(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint8_t lbb;
 
-#if XSERVER_LIBPCIACCESS
-    pci_device_cfg_read_u8(pI830->PciInfo, &lbb, LEGACY_BACKLIGHT_BRIGHTNESS);
-#else
-    lbb = pciReadByte(pI830->PciTag, LEGACY_BACKLIGHT_BRIGHTNESS);
-#endif
+    pci_device_cfg_read_u8(intel->PciInfo, &lbb, LEGACY_BACKLIGHT_BRIGHTNESS);
 
     return lbb;
 }
@@ -237,27 +246,19 @@ i830_lvds_get_backlight_legacy(xf86Outpu
 static void
 i830_lvds_set_backlight_combo(xf86OutputPtr output, int level)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t blc_pwm_ctl;
     uint8_t lbb;
 
-#if XSERVER_LIBPCIACCESS
-    pci_device_cfg_read_u8(pI830->PciInfo, &lbb, LEGACY_BACKLIGHT_BRIGHTNESS);
-#else
-    lbb = pciReadByte(pI830->PciTag, LEGACY_BACKLIGHT_BRIGHTNESS);
-#endif
+    pci_device_cfg_read_u8(intel->PciInfo, &lbb, LEGACY_BACKLIGHT_BRIGHTNESS);
     /*
      * If LBB is zero and we're shooting for a non-zero brightness level,
      * we have to increase LBB by at least 1.
      */
     if (!lbb && level) {
-#if XSERVER_LIBPCIACCESS
-	pci_device_cfg_write_u8(pI830->PciInfo, 1,
+	pci_device_cfg_write_u8(intel->PciInfo, 1,
 				LEGACY_BACKLIGHT_BRIGHTNESS);
-#else
-	pciWriteByte(pI830->PciTag, LEGACY_BACKLIGHT_BRIGHTNESS, 1);
-#endif
     }
 
     /*
@@ -274,8 +275,8 @@ i830_lvds_set_backlight_combo(xf86Output
 static int
 i830_lvds_get_backlight_combo(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t blc_pwm_ctl;
 
     blc_pwm_ctl = INREG(BLC_PWM_CTL);
@@ -293,19 +294,31 @@ i830_lvds_get_backlight_max_combo(xf86Ou
     return i830_lvds_get_backlight_max_native(output) >> 1;
 }
 
+/* null methods */
+static int
+i830_lvds_get_backlight_null(xf86OutputPtr output)
+{
+    return 1;
+}
+
+static void
+i830_lvds_set_backlight_null(xf86OutputPtr output, int level)
+{
+}
+
 /*
  * Kernel methods
  */
 static void
 i830_lvds_set_backlight_kernel(xf86OutputPtr output, int level)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN];
     int fd, len, ret;
 
     len = snprintf(val, BACKLIGHT_VALUE_LEN, "%d\n", level);
     if (len > BACKLIGHT_VALUE_LEN) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "backlight value too large: %d\n",
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "backlight value too large: %d\n",
 		   level);
 	return;
     }
@@ -314,14 +327,14 @@ i830_lvds_set_backlight_kernel(xf86Outpu
 	    backlight_interfaces[backlight_index]);
     fd = open(path, O_RDWR);
     if (fd == -1) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
 		   "control: %s\n", path, strerror(errno));
 	return;
     }
 
     ret = write(fd, val, len);
     if (ret == -1) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "write to %s for backlight "
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "write to %s for backlight "
 		   "control failed: %s\n", path, strerror(errno));
     }
 
@@ -331,7 +344,7 @@ i830_lvds_set_backlight_kernel(xf86Outpu
 static int
 i830_lvds_get_backlight_kernel(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN];
     int fd;
 
@@ -339,7 +352,7 @@ i830_lvds_get_backlight_kernel(xf86Outpu
 	    backlight_interfaces[backlight_index]);
     fd = open(path, O_RDONLY);
     if (fd == -1) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
 		   "control: %s\n", path, strerror(errno));
 	return 0;
     }
@@ -359,7 +372,7 @@ out_err:
 static int
 i830_lvds_get_backlight_max_kernel(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN];
     int fd, max = 0;
 
@@ -367,7 +380,7 @@ i830_lvds_get_backlight_max_kernel(xf86O
 	    backlight_interfaces[backlight_index]);
     fd = open(path, O_RDONLY);
     if (fd == -1) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
 		   "control: %s\n", path, strerror(errno));
 	return 0;
     }
@@ -392,8 +405,8 @@ out_err:
 static int
 i830_lvds_acpi_lid_open(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     int fd;
     DIR *button_dir;
     DIR *lid_dir;
@@ -402,7 +415,7 @@ i830_lvds_acpi_lid_open(xf86OutputPtr ou
     char state[64];
     enum lid_status ret = LID_UNKNOWN;
 
-    if (pI830->quirk_flag & QUIRK_BROKEN_ACPI_LID)
+    if (intel->quirk_flag & QUIRK_BROKEN_ACPI_LID)
 	goto out;
 
     button_dir = opendir(ACPI_BUTTON);
@@ -455,8 +468,8 @@ i830_lvds_acpi_lid_open(xf86OutputPtr ou
 	ret = LID_UNKNOWN;
 
 out:
-    if (pI830->debug_modes && (ret != LID_UNKNOWN))
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    if (intel->debug_modes && (ret != LID_UNKNOWN))
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		"LID switch detect %s with ACPI button\n",
 		ret ? "closed" : "open");
 
@@ -469,8 +482,8 @@ out:
 static Bool
 i830_lvds_swf_lid_close(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t swf14 = INREG(SWF14);
     Bool ret;
 
@@ -479,8 +492,8 @@ i830_lvds_swf_lid_close(xf86OutputPtr ou
     else
 	ret = FALSE;
 
-    if (pI830->debug_modes)
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    if (intel->debug_modes)
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		"LID switch detect %s with SWF14 0x%8x\n",
 		ret ? "closed" : "open", swf14);
 
@@ -495,48 +508,51 @@ i830SetLVDSPanelPower(xf86OutputPtr outp
 {
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
-    uint32_t		    pp_status;
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
+    uint32_t		    pp_status, ctl_reg, status_reg, lvds_reg;
+
+    if (IS_IGDNG(intel)) {
+	ctl_reg = PCH_PP_CONTROL;
+	status_reg = PCH_PP_STATUS;
+	lvds_reg = PCH_LVDS;
+    } else {
+	ctl_reg = PP_CONTROL;
+	status_reg = PP_STATUS;
+	lvds_reg = LVDS;
+    }
 
     if (on) {
-	/* if we're going from on->on, be aware to current level. */
-	if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff) 
-	    dev_priv->backlight_duty_cycle = dev_priv->get_backlight(output);
+	OUTREG(lvds_reg, INREG(lvds_reg) | LVDS_PORT_EN);
+	INREG(lvds_reg);
 
-	/*
-	 * If we're going from off->on we may need to turn on the backlight.
-	 * We should use the saved value whenever possible, but on some
-	 * machines 0 is a valid backlight value (due to an external backlight
-	 * controller for example), so on them, when turning LVDS back on,
-	 * they'll always re-maximize the brightness.
-	 */
-	if (!(INREG(PP_CONTROL) & POWER_TARGET_ON) &&
+	if (!(INREG(ctl_reg) & POWER_TARGET_ON) &&
 	    dev_priv->backlight_duty_cycle == 0 &&
-	    pI830->backlight_control_method < BCM_KERNEL)
+	    intel->backlight_control_method < BCM_KERNEL)
 	    dev_priv->backlight_duty_cycle = dev_priv->backlight_max;
 
-	OUTREG(PP_CONTROL, INREG(PP_CONTROL) | POWER_TARGET_ON);
+	OUTREG(ctl_reg, INREG(ctl_reg) | POWER_TARGET_ON);
+	INREG(ctl_reg);
 	do {
-	    pp_status = INREG(PP_STATUS);
+	    pp_status = INREG(status_reg);
 	} while ((pp_status & PP_ON) == 0);
 
+	/* set backlight */
 	dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle);
 	dev_priv->dpmsoff = FALSE;
     } else {
-	/*
-	 * Only save the current backlight value if we're going from
-	 * on to off.
-	 */
-	if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff)
+	if ((INREG(ctl_reg) & POWER_TARGET_ON) && !dev_priv->dpmsoff)
 	    dev_priv->backlight_duty_cycle = dev_priv->get_backlight(output);
 	dev_priv->set_backlight(output, 0);
 
-	OUTREG(PP_CONTROL, INREG(PP_CONTROL) & ~POWER_TARGET_ON);
+	OUTREG(ctl_reg, INREG(ctl_reg) & ~POWER_TARGET_ON);
+	INREG(ctl_reg);
 	do {
-	    pp_status = INREG(PP_STATUS);
+	    pp_status = INREG(status_reg);
 	} while (pp_status & PP_ON);
-
+	
+	OUTREG(lvds_reg, INREG(lvds_reg) & ~LVDS_PORT_EN);
+	INREG(lvds_reg);
 	dev_priv->dpmsoff = TRUE;
     }
 }
@@ -557,16 +573,31 @@ i830_lvds_save (xf86OutputPtr output)
 {
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+   intel_screen_private    *intel = intel_get_screen_private(scrn);
+   uint32_t pp_on_reg, pp_off_reg, pp_ctl_reg, pp_div_reg, pwm_ctl_reg;
+
+    if (IS_IGDNG(intel)) {
+	pp_on_reg = PCH_PP_ON_DELAYS;
+	pp_off_reg = PCH_PP_OFF_DELAYS;
+	pp_ctl_reg = PCH_PP_CONTROL;
+	pp_div_reg = PCH_PP_DIVISOR;
+	pwm_ctl_reg = BLC_PWM_CPU_CTL;
+    } else {
+	pp_on_reg = PP_ON_DELAYS;
+	pp_off_reg = PP_OFF_DELAYS;
+	pp_ctl_reg = PP_CONTROL;
+	pp_div_reg = PP_DIVISOR;
+	pwm_ctl_reg = BLC_PWM_CTL;
+    }
 
-    if (IS_I965GM(pI830) || IS_GM45(pI830))
-	pI830->saveBLC_PWM_CTL2 = INREG(BLC_PWM_CTL2);
-    pI830->savePP_ON = INREG(PP_ON_DELAYS);
-    pI830->savePP_OFF = INREG(PP_OFF_DELAYS);
-    pI830->savePP_CONTROL = INREG(PP_CONTROL);
-    pI830->savePP_DIVISOR = INREG(PP_DIVISOR);
-    pI830->saveBLC_PWM_CTL = INREG(BLC_PWM_CTL);
+    if (IS_I965GM(intel) || IS_GM45(intel))
+	intel->saveBLC_PWM_CTL2 = INREG(BLC_PWM_CTL2);
+    intel->savePP_ON = INREG(pp_on_reg);
+    intel->savePP_OFF = INREG(pp_off_reg);
+    intel->savePP_CONTROL = INREG(pp_ctl_reg);
+    intel->savePP_DIVISOR = INREG(pp_div_reg);
+    intel->saveBLC_PWM_CTL = INREG(pwm_ctl_reg);
     if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff) 
 	dev_priv->backlight_duty_cycle = dev_priv->get_backlight(output);
 }
@@ -574,17 +605,34 @@ i830_lvds_save (xf86OutputPtr output)
 static void
 i830_lvds_restore(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    uint32_t pp_on_reg, pp_off_reg, pp_ctl_reg, pp_div_reg;
+    uint32_t pwm_ctl_reg;
+
+    if (IS_IGDNG(intel)) {
+	pp_on_reg = PCH_PP_ON_DELAYS;
+	pp_off_reg = PCH_PP_OFF_DELAYS;
+	pp_ctl_reg = PCH_PP_CONTROL;
+	pp_div_reg = PCH_PP_DIVISOR;
+	pwm_ctl_reg = BLC_PWM_CPU_CTL;
+    } else {
+	pp_on_reg = PP_ON_DELAYS;
+	pp_off_reg = PP_OFF_DELAYS;
+	pp_ctl_reg = PP_CONTROL;
+	pp_div_reg = PP_DIVISOR;
+	pwm_ctl_reg = BLC_PWM_CTL;
+    }
+
+    if (IS_I965GM(intel) || IS_GM45(intel))
+	OUTREG(BLC_PWM_CTL2, intel->saveBLC_PWM_CTL2);
+    OUTREG(pwm_ctl_reg, intel->saveBLC_PWM_CTL);
+    OUTREG(pp_on_reg, intel->savePP_ON);
+    OUTREG(pp_off_reg, intel->savePP_OFF);
+    OUTREG(pp_div_reg, intel->savePP_DIVISOR);
+    OUTREG(pp_ctl_reg, intel->savePP_CONTROL);
 
-    if (IS_I965GM(pI830) || IS_GM45(pI830))
-	OUTREG(BLC_PWM_CTL2, pI830->saveBLC_PWM_CTL2);
-    OUTREG(BLC_PWM_CTL, pI830->saveBLC_PWM_CTL);
-    OUTREG(PP_ON_DELAYS, pI830->savePP_ON);
-    OUTREG(PP_OFF_DELAYS, pI830->savePP_OFF);
-    OUTREG(PP_DIVISOR, pI830->savePP_DIVISOR);
-    OUTREG(PP_CONTROL, pI830->savePP_CONTROL);
-    if (pI830->savePP_CONTROL & POWER_TARGET_ON)
+    if (intel->savePP_CONTROL & POWER_TARGET_ON)
 	i830SetLVDSPanelPower(output, TRUE);
     else
 	i830SetLVDSPanelPower(output, FALSE);
@@ -593,9 +641,9 @@ i830_lvds_restore(xf86OutputPtr output)
 static int
 i830_lvds_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
-    DisplayModePtr	    pFixedMode = pI830->lvds_fixed_mode;
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    DisplayModePtr	    pFixedMode = intel->lvds_fixed_mode;
 
     if (pFixedMode)
     {
@@ -614,36 +662,39 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
 {
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
-    ScrnInfoPtr		    pScrn = output->scrn;
-    xf86CrtcConfigPtr	    xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    xf86CrtcConfigPtr	    xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     I830CrtcPrivatePtr	    intel_crtc = output->crtc->driver_private;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     uint32_t		    pfit_control = 0, pfit_pgm_ratios = 0;
     float		    panel_ratio, desired_ratio, vert_scale, horiz_scale;
     float		    horiz_ratio, vert_ratio;
     int left_border = 0, right_border = 0, top_border = 0, bottom_border = 0;
     int i;
+    uint32_t		    hsync_width, vsync_width;
+    uint32_t		    hblank_width, vblank_width;
+    uint32_t		    hsync_pos, vsync_pos;
     Bool border = 0;
 
     for (i = 0; i < xf86_config->num_output; i++) {
 	xf86OutputPtr other_output = xf86_config->output[i];
 
 	if (other_output != output && other_output->crtc == output->crtc) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		       "Can't enable LVDS and another output on the same "
 		       "pipe\n");
 	    return FALSE;
 	}
     }
 
-    if (intel_crtc->pipe == 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+    if (!IS_IGDNG(intel) && intel_crtc->pipe == 0) {
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "Can't support LVDS on pipe A\n");
 	return FALSE;
     }
 
     /* If we don't have a panel mode there's not much we can do */
-    if (pI830->lvds_fixed_mode == NULL)
+    if (intel->lvds_fixed_mode == NULL)
 	return TRUE;
 
     /* If we have timings from the BIOS for the panel, put them in
@@ -651,19 +702,19 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
      * with the panel scaling set up to source from the H/VDisplay
      * of the original mode.
      */
-    adjusted_mode->HDisplay = pI830->lvds_fixed_mode->HDisplay;
-    adjusted_mode->HSyncStart = pI830->lvds_fixed_mode->HSyncStart;
-    adjusted_mode->HSyncEnd = pI830->lvds_fixed_mode->HSyncEnd;
-    adjusted_mode->HTotal = pI830->lvds_fixed_mode->HTotal;
-    adjusted_mode->VDisplay = pI830->lvds_fixed_mode->VDisplay;
-    adjusted_mode->VSyncStart = pI830->lvds_fixed_mode->VSyncStart;
-    adjusted_mode->VSyncEnd = pI830->lvds_fixed_mode->VSyncEnd;
-    adjusted_mode->VTotal = pI830->lvds_fixed_mode->VTotal;
-    adjusted_mode->Clock = pI830->lvds_fixed_mode->Clock;
+    adjusted_mode->HDisplay = intel->lvds_fixed_mode->HDisplay;
+    adjusted_mode->HSyncStart = intel->lvds_fixed_mode->HSyncStart;
+    adjusted_mode->HSyncEnd = intel->lvds_fixed_mode->HSyncEnd;
+    adjusted_mode->HTotal = intel->lvds_fixed_mode->HTotal;
+    adjusted_mode->VDisplay = intel->lvds_fixed_mode->VDisplay;
+    adjusted_mode->VSyncStart = intel->lvds_fixed_mode->VSyncStart;
+    adjusted_mode->VSyncEnd = intel->lvds_fixed_mode->VSyncEnd;
+    adjusted_mode->VTotal = intel->lvds_fixed_mode->VTotal;
+    adjusted_mode->Clock = intel->lvds_fixed_mode->Clock;
     xf86SetModeCrtc(adjusted_mode, INTERLACE_HALVE_V);
 
     /* Make sure pre-965s set dither correctly */
-    if (!IS_I965G(pI830) && pI830->lvds_dither)
+    if (!IS_I965G(intel) && intel->lvds_dither)
 	pfit_control |= PANEL_8TO6_DITHER_ENABLE;
 
     /* Native modes don't need fitting */
@@ -674,11 +725,21 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
 	goto out;
     }
 
+    /* only full screen scale for now */
+    if (IS_IGDNG(intel))
+	goto out;
+
     /* 965+ wants fuzzy fitting */
-    if (IS_I965G(pI830))
+    if (IS_I965G(intel))
 	pfit_control |= (intel_crtc->pipe << PFIT_PIPE_SHIFT) |
 	    PFIT_FILTER_FUZZY;
 
+    hsync_width = adjusted_mode->CrtcHSyncEnd - adjusted_mode->CrtcHSyncStart;
+    vsync_width = adjusted_mode->CrtcVSyncEnd - adjusted_mode->CrtcVSyncStart;
+    hblank_width = adjusted_mode->CrtcHBlankEnd -
+					adjusted_mode->CrtcHBlankStart;
+    vblank_width = adjusted_mode->CrtcVBlankEnd -
+					adjusted_mode->CrtcVBlankStart;
     /*
      * Deal with panel fitting options.  Figure out how to stretch the image
      * based on its aspect ratio & the current panel fitting mode.
@@ -694,8 +755,10 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
      * register description and PRM.
      */
     /* Change the value here to see the borders for debugging */
-    OUTREG(BCLRPAT_A, 0);
-    OUTREG(BCLRPAT_B, 0);
+    if (!IS_IGDNG(intel)) {
+	    OUTREG(BCLRPAT_A, 0);
+	    OUTREG(BCLRPAT_B, 0);
+    }
     switch (dev_priv->fitting_mode) {
     case CENTER:
 	/*
@@ -704,35 +767,52 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
 	 * LVDS borders are enabled (see i830_display.c).
 	 */
 	left_border =
-	    (pI830->lvds_fixed_mode->HDisplay - mode->HDisplay) / 2;
+	    (intel->lvds_fixed_mode->HDisplay - mode->HDisplay) / 2;
 	right_border = left_border;
 	if (mode->HDisplay & 1)
 	    right_border++;
 	top_border =
-	    (pI830->lvds_fixed_mode->VDisplay - mode->VDisplay) / 2;
+	    (intel->lvds_fixed_mode->VDisplay - mode->VDisplay) / 2;
 	bottom_border = top_border;
 	if (mode->VDisplay & 1)
 	    bottom_border++;
 
 	/* Set active & border values */
 	adjusted_mode->CrtcHDisplay = mode->HDisplay;
-	adjusted_mode->CrtcHBlankStart = mode->HDisplay + right_border - 1;
-	adjusted_mode->CrtcHBlankEnd = adjusted_mode->CrtcHTotal -
-	    left_border - 1;
-	adjusted_mode->CrtcHSyncStart = adjusted_mode->CrtcHBlankStart;
-	adjusted_mode->CrtcHSyncEnd = adjusted_mode->CrtcHBlankEnd;
+	/* keep the horizontal border be even */
+	if (right_border & 1)
+		right_border++;
+	/* use the border directly instead of border minus one */
+	adjusted_mode->CrtcHBlankStart = mode->HDisplay + right_border;
+	/* keep the blank width constant */
+	adjusted_mode->CrtcHBlankEnd = adjusted_mode->CrtcHBlankStart +
+					hblank_width;
+	/* get the hsync start position relative to hblank start */
+	hsync_pos = (hblank_width - hsync_width) / 2;
+	/* keep the hsync width constant and hsync start be even */
+	if (hsync_pos & 1)
+		hsync_pos++;
+	adjusted_mode->CrtcHSyncStart = adjusted_mode->CrtcHBlankStart +
+						hsync_pos;
+	adjusted_mode->CrtcHSyncEnd = adjusted_mode->CrtcHSyncStart +
+						hsync_width;
 	adjusted_mode->CrtcVDisplay = mode->VDisplay;
-	adjusted_mode->CrtcVBlankStart = mode->VDisplay + bottom_border - 1;
-	adjusted_mode->CrtcVBlankEnd = adjusted_mode->CrtcVTotal -
-	    top_border - 1;
-	adjusted_mode->CrtcVSyncStart = adjusted_mode->CrtcVBlankStart;
-	adjusted_mode->CrtcVSyncEnd = adjusted_mode->CrtcVBlankEnd;
+	/* use the border instead of border minus one */
+	adjusted_mode->CrtcVBlankStart = mode->VDisplay + bottom_border;
+	adjusted_mode->CrtcVBlankEnd = adjusted_mode->CrtcVBlankStart +
+						vblank_width;
+	/* get the vsync start position relative to vblank start */
+	vsync_pos = (vblank_width - vsync_width) / 2;
+	adjusted_mode->CrtcVSyncStart = adjusted_mode->CrtcVBlankStart +
+						vsync_pos;
+	adjusted_mode->CrtcVSyncEnd = adjusted_mode->CrtcVSyncStart +
+						vsync_width;
 	border = 1;
 	break;
     case FULL_ASPECT:
 	/* Scale but preserve aspect ratio */
 	pfit_control |= PFIT_ENABLE;
-	if (IS_I965G(pI830)) {
+	if (IS_I965G(intel)) {
 	    /*
 	     * 965+ is easy, it does everything in hw
 	     */
@@ -768,19 +848,28 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
 		    HORIZ_INTERP_BILINEAR;
 
 		/* Pillar will have left/right borders */
-		left_border =  (pI830->lvds_fixed_mode->HDisplay -
+		left_border =  (intel->lvds_fixed_mode->HDisplay -
 				scaled_width) / 2;
 		right_border = left_border;
 		if (mode->HDisplay & 1) /* odd resolutions */
 		    right_border++;
 
+		/* keep the border be even */
+		if (right_border & 1)
+			right_border++;
 		adjusted_mode->CrtcHDisplay = scaled_width;
-		adjusted_mode->CrtcHBlankStart = scaled_width +
-		    right_border - 1;
-		adjusted_mode->CrtcHBlankEnd = adjusted_mode->CrtcHTotal -
-		    left_border - 1;
-		adjusted_mode->CrtcHSyncStart = adjusted_mode->CrtcHBlankStart;
-		adjusted_mode->CrtcHSyncEnd = adjusted_mode->CrtcHBlankEnd;
+		adjusted_mode->CrtcHBlankStart = scaled_width + right_border;
+		adjusted_mode->CrtcHBlankEnd = adjusted_mode->CrtcHBlankStart +
+							hblank_width;
+		/* get the hsync start position relative to hblank start */
+		hsync_pos = (hblank_width - hsync_width) / 2;
+		/* keep the hsync start be even */
+		if (hsync_pos & 1)
+			hsync_pos++;
+		adjusted_mode->CrtcHSyncStart = adjusted_mode->CrtcHBlankStart +
+							hsync_pos;
+		adjusted_mode->CrtcHSyncEnd = adjusted_mode->CrtcHSyncStart +
+							hsync_width;
 		border = 1;
 	    } else if (panel_ratio < desired_ratio) { /* Letter */
 		unsigned long scaled_height = (float)mode->VDisplay *
@@ -791,19 +880,25 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
 		    HORIZ_INTERP_BILINEAR;
 
 		/* Letterbox will have top/bottom borders */
-		top_border = (pI830->lvds_fixed_mode->VDisplay -
+		top_border = (intel->lvds_fixed_mode->VDisplay -
 			      scaled_height) / 2;
 		bottom_border = top_border;
 		if (mode->VDisplay & 1)
 		    bottom_border++;
 
 		adjusted_mode->CrtcVDisplay = scaled_height;
+		/* use the border instead of border minus one */
 		adjusted_mode->CrtcVBlankStart = scaled_height +
-		    bottom_border - 1;
-		adjusted_mode->CrtcVBlankEnd = adjusted_mode->CrtcVTotal -
-		    top_border - 1;
-		adjusted_mode->CrtcVSyncStart = adjusted_mode->CrtcVBlankStart;
-		adjusted_mode->CrtcVSyncEnd = adjusted_mode->CrtcVBlankEnd;
+		    bottom_border;
+		/* keep the Vblank width constant */
+		adjusted_mode->CrtcVBlankEnd = adjusted_mode->CrtcVBlankStart +
+							vblank_width;
+		/* get the vsync start position relative to vblank start */
+		vsync_pos = (vblank_width - vsync_width) / 2;
+		adjusted_mode->CrtcVSyncStart = adjusted_mode->CrtcVBlankStart +
+							vsync_pos;
+		adjusted_mode->CrtcVSyncEnd = adjusted_mode->CrtcVBlankStart +
+							vsync_width;
 		border = 1;
 	    } else { /* Aspects match, let hw scale both directions */
 		pfit_control |= VERT_AUTO_SCALE | HORIZ_AUTO_SCALE |
@@ -825,7 +920,7 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
 	 * this is all done for us in hw.
 	 */
 	pfit_control |= PFIT_ENABLE;
-	if (IS_I965G(pI830))
+	if (IS_I965G(intel))
 	    pfit_control |= PFIT_SCALING_AUTO;
 	else
 	    pfit_control |= VERT_AUTO_SCALE | HORIZ_AUTO_SCALE |
@@ -833,7 +928,7 @@ i830_lvds_mode_fixup(xf86OutputPtr outpu
 	break;
     default:
 	/* shouldn't happen */
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "error: bad fitting mode\n");
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "error: bad fitting mode\n");
 	break;
     }
   
@@ -865,8 +960,17 @@ i830_lvds_mode_set(xf86OutputPtr output,
 {
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
+
+    /*
+     * The LVDS pin pair will already have been turned on in the
+     * main modesetting function since it has a large impact on the
+     * DPLL settings.
+     */
+
+    if (IS_IGDNG(intel))
+	return;
 
     /*
      * PFIT must be enabled/disabled while LVDS is on but pipes are still off
@@ -881,6 +985,8 @@ i830_lvds_mode_set(xf86OutputPtr output,
 static xf86OutputStatus
 i830_lvds_detect(xf86OutputPtr output)
 {
+    enum lid_status lid;
+
     /* Fallback to origin, mark LVDS always connected.
      * From wider tests, we have seen both broken cases with
      * ACPI lid and SWF bit. So disable them for now until we
@@ -888,8 +994,6 @@ i830_lvds_detect(xf86OutputPtr output)
      */
     return XF86OutputStatusConnected;
 
-    enum lid_status lid;
-
     lid = i830_lvds_acpi_lid_open(output);
     if (lid == LID_OPEN)
 	return XF86OutputStatusConnected;
@@ -935,8 +1039,8 @@ static void fill_detailed_block(struct d
 static DisplayModePtr
 i830_lvds_get_modes(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     xf86MonPtr		    edid_mon;
     DisplayModePtr	    modes;
@@ -980,7 +1084,7 @@ i830_lvds_get_modes(xf86OutputPtr output
 
     if (!output->MonInfo)
     {
-	edid_mon = xcalloc (1, sizeof (xf86Monitor));
+	edid_mon = calloc (1, sizeof (xf86Monitor));
 	if (edid_mon)
 	{
 	    struct detailed_monitor_section *det_mon = edid_mon->det_mon;
@@ -994,11 +1098,11 @@ i830_lvds_get_modes(xf86OutputPtr output
 	    edid_mon->ver.version = 1;
 	    edid_mon->ver.revision = 4;
 
-	    if (pI830->lvds_fixed_mode != NULL) {
+	    if (intel->lvds_fixed_mode != NULL) {
 		/* now we construct new EDID monitor,
 		 *  so filled one detailed timing block
 		 */
-		fill_detailed_block(det_mon, pI830->lvds_fixed_mode);
+		fill_detailed_block(det_mon, intel->lvds_fixed_mode);
 		/* the filed timing block should be set preferred*/
 		edid_mon->features.msc |= 0x2;
 		det_mon = det_mon + 1;
@@ -1016,8 +1120,8 @@ i830_lvds_get_modes(xf86OutputPtr output
 	}
     }
 
-    if (pI830->lvds_fixed_mode != NULL)
-	return xf86DuplicateMode(pI830->lvds_fixed_mode);
+    if (intel->lvds_fixed_mode != NULL)
+	return xf86DuplicateMode(intel->lvds_fixed_mode);
 
     return NULL;
 }
@@ -1025,13 +1129,13 @@ i830_lvds_get_modes(xf86OutputPtr output
 static void
 i830_lvds_destroy (xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr	pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
 
-    xf86DeleteMode (&pI830->lvds_fixed_mode, pI830->lvds_fixed_mode);
+    xf86DeleteMode (&intel->lvds_fixed_mode, intel->lvds_fixed_mode);
     if (intel_output)
-	xfree (intel_output);
+	free (intel_output);
 }
 
 #ifdef RANDR_12_INTERFACE
@@ -1044,12 +1148,13 @@ static Atom backlight_atom;
  * or not at all.
  */
 #define BACKLIGHT_CONTROL_NAME "BACKLIGHT_CONTROL"
-#define NUM_BACKLIGHT_CONTROL_METHODS 4
+#define NUM_BACKLIGHT_CONTROL_METHODS 5
 static char *backlight_control_names[] = {
     "native",
     "legacy",
     "combination",
     "kernel",
+    "null",
 };
 static Atom backlight_control_atom;
 static Atom backlight_control_name_atoms[NUM_BACKLIGHT_CONTROL_METHODS];
@@ -1080,12 +1185,12 @@ i830_backlight_control_lookup(const char
 static Bool
 i830_lvds_set_backlight_control(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
 
-    switch (pI830->backlight_control_method) {
+    switch (intel->backlight_control_method) {
     case BCM_NATIVE:
 	dev_priv->set_backlight = i830_lvds_set_backlight_native;
 	dev_priv->get_backlight = i830_lvds_get_backlight_native;
@@ -1109,12 +1214,17 @@ i830_lvds_set_backlight_control(xf86Outp
 	dev_priv->backlight_max =
 	    i830_lvds_get_backlight_max_kernel(output);
 	break;
+    case BCM_IRONLAKE_NULL:
+	dev_priv->set_backlight = i830_lvds_set_backlight_null;
+	dev_priv->get_backlight = i830_lvds_get_backlight_null;
+	dev_priv->backlight_max = 1;
+	break;
     default:
 	/*
 	 * Should be impossible to get here unless the caller set a bogus
 	 * backlight_control_method
 	 */
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "error: bad backlight control "
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "error: bad backlight control "
 		   "method\n");
 	break;
     }
@@ -1139,8 +1249,8 @@ static void
 i830_lvds_create_resources(xf86OutputPtr output)
 {
 #ifdef RANDR_12_INTERFACE
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
     INT32		    backlight_range[2];
@@ -1160,7 +1270,7 @@ i830_lvds_create_resources(xf86OutputPtr
     err = RRConfigureOutputProperty(output->randr_output, backlight_atom,
 				    FALSE, TRUE, FALSE, 2, backlight_range);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRConfigureOutputProperty error, %d\n", err);
     }
     /* Set the current value of the backlight property */
@@ -1169,7 +1279,7 @@ i830_lvds_create_resources(xf86OutputPtr
 				 XA_INTEGER, 32, PropModeReplace, 1, &data,
 				 FALSE, TRUE);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRChangeOutputProperty error, %d\n", err);
     }
 
@@ -1188,15 +1298,15 @@ i830_lvds_create_resources(xf86OutputPtr
 				    NUM_BACKLIGHT_CONTROL_METHODS,
 				    (INT32 *)backlight_control_name_atoms);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRConfigureOutputProperty error, %d\n", err);
     }
     err = RRChangeOutputProperty(output->randr_output, backlight_control_atom,
 				 XA_ATOM, 32, PropModeReplace, 1,
-				 &backlight_control_name_atoms[pI830->backlight_control_method],
+				 &backlight_control_name_atoms[intel->backlight_control_method],
 				 FALSE, TRUE);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "failed to set backlight control, %d\n", err);
     }
 
@@ -1205,7 +1315,7 @@ i830_lvds_create_resources(xf86OutputPtr
      */
 
     /* Disable panel fitting setting on untested pre-915 chips */
-    if (!IS_I9XX(pI830) && !(pI830->quirk_flag & QUIRK_PFIT_SAFE))
+    if (!IS_I9XX(intel) && !(intel->quirk_flag & QUIRK_PFIT_SAFE))
 	return;
 
     panel_fitting_atom = MakeAtom(PANEL_FITTING_NAME,
@@ -1220,7 +1330,7 @@ i830_lvds_create_resources(xf86OutputPtr
 				    NUM_PANEL_FITTING_TYPES,
 				    (INT32 *)panel_fitting_name_atoms);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRConfigureOutputProperty error, %d\n", err);
     }
     err = RRChangeOutputProperty(output->randr_output, panel_fitting_atom,
@@ -1228,7 +1338,7 @@ i830_lvds_create_resources(xf86OutputPtr
 				 &panel_fitting_name_atoms[dev_priv->fitting_mode],
 				 FALSE, TRUE);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "failed to set panel fitting mode, %d\n", err);
     }   
 #endif /* RANDR_12_INTERFACE */
@@ -1239,8 +1349,8 @@ static Bool
 i830_lvds_set_property(xf86OutputPtr output, Atom property,
 		       RRPropertyValuePtr value)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
     
@@ -1278,7 +1388,7 @@ i830_lvds_set_property(xf86OutputPtr out
 	if (ret < 0)
 	    return FALSE;
 
-	pI830->backlight_control_method = ret;
+	intel->backlight_control_method = ret;
 	i830_lvds_set_backlight_control(output);
 
 	/*
@@ -1289,7 +1399,7 @@ i830_lvds_set_property(xf86OutputPtr out
 	ret = RRConfigureOutputProperty(output->randr_output, backlight_atom,
 					FALSE, TRUE, FALSE, 2, backlight_range);
 	if (ret != 0) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		       "RRConfigureOutputProperty error, %d\n", ret);
 	}
 	/* Set the current value of the backlight property */
@@ -1301,7 +1411,7 @@ i830_lvds_set_property(xf86OutputPtr out
 				     XA_INTEGER, 32, PropModeReplace, 1, &data,
 				     FALSE, TRUE);
 	if (ret != 0) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		       "RRChangeOutputProperty error, %d\n", ret);
 	}
 	return TRUE;
@@ -1331,7 +1441,7 @@ i830_lvds_set_property(xf86OutputPtr out
 		if (!xf86CrtcSetMode(crtc, &crtc->desiredMode,
 				     crtc->desiredRotation,
 				     crtc->desiredX, crtc->desiredY)) {
-		    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			       "Failed to set mode after panel fitting change!\n");
 		    return FALSE;
 		}
@@ -1348,8 +1458,8 @@ i830_lvds_set_property(xf86OutputPtr out
 static Bool
 i830_lvds_get_property(xf86OutputPtr output, Atom property)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
     int ret;
@@ -1380,11 +1490,11 @@ i830_lvds_get_property(xf86OutputPtr out
 static xf86CrtcPtr
 i830_lvds_get_crtc(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     int pipe = !!(INREG(LVDS) & LVDS_PIPEB_SELECT);
    
-    return i830_pipe_to_crtc(pScrn, pipe);
+    return i830_pipe_to_crtc(scrn, pipe);
 }
 #endif
 
@@ -1413,26 +1523,33 @@ static const xf86OutputFuncsRec i830_lvd
 };
 
 void
-i830_lvds_init(ScrnInfoPtr pScrn)
+i830_lvds_init(ScrnInfoPtr scrn)
 {
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     xf86OutputPtr	    output;
     I830OutputPrivatePtr    intel_output;
     DisplayModePtr	    modes, scan;
     DisplayModePtr	    lvds_ddc_mode = NULL;
     struct i830_lvds_priv   *dev_priv;
+    int			    gpio = GPIOC;
 
-    if (!pI830->integrated_lvds) {
-	if (pI830->debug_modes)
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    if (!intel->integrated_lvds) {
+	if (intel->debug_modes)
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "Skipping LVDS from driver feature BDB's LVDS config info.\n");
 	return;
     }
 
-    if (pI830->quirk_flag & QUIRK_IGNORE_LVDS)
+    if (intel->quirk_flag & QUIRK_IGNORE_LVDS)
 	return;
 
-    output = xf86OutputCreate (pScrn, &i830_lvds_output_funcs, "LVDS");
+    if (IS_IGDNG(intel)) {
+      if ((INREG(PCH_LVDS) & LVDS_DETECTED) == 0)
+	return;
+      gpio = PCH_GPIOC;
+    }
+
+    output = xf86OutputCreate (scrn, &i830_lvds_output_funcs, "LVDS");
     if (!output)
 	return;
     intel_output = xnfcalloc (sizeof (I830OutputPrivateRec) + 
@@ -1444,6 +1561,8 @@ i830_lvds_init(ScrnInfoPtr pScrn)
     }
     intel_output->type = I830_OUTPUT_LVDS;
     intel_output->pipe_mask = (1 << 1);
+    if (0 && IS_IGDNG(intel)) /* XXX put me back */
+	intel_output->pipe_mask |= (1 << 0);
     intel_output->clone_mask = (1 << I830_OUTPUT_LVDS);
     
     output->driver_private = intel_output;
@@ -1466,15 +1585,15 @@ i830_lvds_init(ScrnInfoPtr pScrn)
     /* Set up the LVDS DDC channel.  Most panels won't support it, but it can
      * be useful if available.
      */
-    I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOC, "LVDSDDC_C");
+    I830I2CInit(scrn, &intel_output->pDDCBus, gpio, "LVDSDDC_C");
 
-    if (pI830->skip_panel_detect) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    if (intel->skip_panel_detect) {
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "Skipping any attempt to determine panel fixed mode.\n");
 	goto found_mode;
     }
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 	       "Attempting to determine panel fixed mode.\n");
 
     /* Attempt to get the fixed panel mode from DDC.  Assume that the preferred
@@ -1500,7 +1619,7 @@ i830_lvds_init(ScrnInfoPtr pScrn)
 	xf86DeleteMode(&modes, modes);
 
     if (lvds_ddc_mode) {
-	    pI830->lvds_fixed_mode = lvds_ddc_mode;
+	    intel->lvds_fixed_mode = lvds_ddc_mode;
 	    goto found_mode;
     }
 
@@ -1508,29 +1627,29 @@ i830_lvds_init(ScrnInfoPtr pScrn)
      * the BIOS being unavailable or broken, but lack the configuration options
      * for now.
      */
-    if (pI830->lvds_fixed_mode)
+    if (intel->lvds_fixed_mode)
 	    goto found_mode;
 
     /* If we *still* don't have a mode, try checking if the panel is already
      * turned on.  If so, assume that whatever is currently programmed is the
      * correct mode.
      */
-    if (!pI830->lvds_fixed_mode) {
+    if (!intel->lvds_fixed_mode && !IS_IGDNG(intel)) {
 	uint32_t lvds = INREG(LVDS);
 	int pipe = (lvds & LVDS_PIPEB_SELECT) ? 1 : 0;
-	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 	xf86CrtcPtr crtc = xf86_config->crtc[pipe];
 
 	if (lvds & LVDS_PORT_EN) {
-	    pI830->lvds_fixed_mode = i830_crtc_mode_get(pScrn, crtc);
-	    if (pI830->lvds_fixed_mode != NULL) {
-		pI830->lvds_fixed_mode->type |= M_T_PREFERRED;
+	    intel->lvds_fixed_mode = i830_crtc_mode_get(scrn, crtc);
+	    if (intel->lvds_fixed_mode != NULL) {
+		intel->lvds_fixed_mode->type |= M_T_PREFERRED;
 		goto found_mode;
 	    }
 	}
     }
 
-    if (!pI830->lvds_fixed_mode)
+    if (!intel->lvds_fixed_mode)
 	    goto disable_exit;
 
 found_mode:
@@ -1538,7 +1657,7 @@ found_mode:
     /* Blacklist machines with BIOSes that list an LVDS panel without actually
      * having one.
      */
-    if (pI830->quirk_flag & QUIRK_IGNORE_MACMINI_LVDS) {
+    if (intel->quirk_flag & QUIRK_IGNORE_MACMINI_LVDS) {
 	/* It's a Mac Mini or Macbook Pro.
 	 *
 	 * Apple hardware is out to get us.  The macbook pro has a real
@@ -1548,11 +1667,11 @@ found_mode:
 	 * display.
 	 */
 
-	if (pI830->lvds_fixed_mode != NULL &&
-		pI830->lvds_fixed_mode->HDisplay == 800 &&
-		pI830->lvds_fixed_mode->VDisplay == 600)
+	if (intel->lvds_fixed_mode != NULL &&
+		intel->lvds_fixed_mode->HDisplay == 800 &&
+		intel->lvds_fixed_mode->VDisplay == 600)
 	{
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		    "Suspected Mac Mini, ignoring the LVDS\n");
 	    goto disable_exit;
 	}
@@ -1560,7 +1679,7 @@ found_mode:
 
     i830_set_lvds_backlight_method(output);
 
-    switch (pI830->backlight_control_method) {
+    switch (intel->backlight_control_method) {
     case BCM_NATIVE:
 	dev_priv->set_backlight = i830_lvds_set_backlight_native;
 	dev_priv->get_backlight = i830_lvds_get_backlight_native;
@@ -1582,7 +1701,7 @@ found_mode:
 	dev_priv->backlight_max = i830_lvds_get_backlight_max_kernel(output);
 	break;
     default:
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "bad backlight control method\n");
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR, "bad backlight control method\n");
 	break;
     }
 
@@ -1593,6 +1712,19 @@ found_mode:
      */
     dev_priv->fitting_mode = FULL_ASPECT;
 
+    if (IS_IGDNG(intel)) {
+	CARD32 pwm;
+	/* make sure PWM is enabled */
+	pwm = INREG(BLC_PWM_CPU_CTL2);
+	pwm |= (PWM_ENABLE | PWM_PIPE_B);
+	OUTREG(BLC_PWM_CPU_CTL2, pwm);
+
+	pwm = INREG(BLC_PWM_PCH_CTL1);
+	pwm |= PWM_PCH_ENABLE;
+	OUTREG(BLC_PWM_PCH_CTL1, pwm);
+    }
+
+
     return;
 
 disable_exit:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_memory.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_memory.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_memory.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_memory.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v 1.9 2003/09/24 03:16:54 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,19 +28,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 **************************************************************************/
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors:
  *   Keith Whitwell <keith@tungstengraphics.com>
  *   David Dawes <dawes@xfree86.org>
@@ -64,22 +50,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * - Ring buffer
  * - HW cursor block (either one block or four)
  * - Overlay registers
- * - XAA linear allocator (optional)
- * - XAA scratch (screen 1)
- * - XAA scratch (screen 2, only in zaphod mode)
- * - Front buffer (screen 1, more is better for XAA)
- * - Front buffer (screen 2, only in zaphod mode, more is better for XAA)
+ * - Front buffer (screen 1)
+ * - Front buffer (screen 2, only in zaphod mode)
  * - Back/depth buffer (3D only)
  * - Compatibility texture pool (optional, more is always better)
  * - New texture pool (optional, more is always better.  aperture allocation
  *     only)
- * - EXA offscreen pool (more is always better)
- *
- * We also want to be able to resize the front/back/depth buffers, and then
- * resize the EXA and texture memory pools appropriately.
  *
  * The user may request a specific amount of memory to be used
- * (pI830->pEnt->videoRam != 0), in which case allocations have to fit within
+ * (intel->pEnt->videoRam != 0), in which case allocations have to fit within
  * that much aperture.  If not, the individual allocations will be
  * automatically sized, and will be fit within the maximum aperture size.
  * Only the actual memory used (not alignment padding) will get actual AGP
@@ -98,63 +77,57 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include <assert.h>
 #include <inttypes.h>
 #include <string.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <errno.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
 #include "i830.h"
 #include "i810_reg.h"
-#ifdef XF86DRI
 #include "i915_drm.h"
-#endif
-
-#define ALIGN(i,m)    (((i) + (m) - 1) & ~((m) - 1))
 
 /* Our hardware status area is just a single page */
 #define HWSTATUS_PAGE_SIZE GTT_PAGE_SIZE
 #define PWRCTX_SIZE GTT_PAGE_SIZE
 
 static i830_memory *
-i830_allocate_aperture(ScrnInfoPtr pScrn, const char *name,
+i830_allocate_aperture(ScrnInfoPtr scrn, const char *name,
 		       unsigned long size, unsigned long pitch,
 		       unsigned long alignment, int flags,
 		       enum tile_format tile_format);
 
-static int i830_set_tiling(ScrnInfoPtr pScrn, unsigned int offset,
+static int i830_set_tiling(ScrnInfoPtr scrn, unsigned int offset,
 			   unsigned int pitch, unsigned int size,
 			   enum tile_format tile_format);
 
-static void i830_clear_tiling(ScrnInfoPtr pScrn, unsigned int fence_nr);
+static void i830_clear_tiling(ScrnInfoPtr scrn, unsigned int fence_nr);
 
 /**
  * Returns the fence size for a tiled area of the given size.
  */
-unsigned long
-i830_get_fence_size(I830Ptr pI830, unsigned long size)
+unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size)
 {
-    unsigned long i;
-    unsigned long start;
+	unsigned long i;
+	unsigned long start;
 
-    if (IS_I965G(pI830)) {
-	/* The 965 can have fences at any page boundary. */
-	return ALIGN(size, GTT_PAGE_SIZE);
-    } else {
-	/* Align the size to a power of two greater than the smallest fence
-	 * size.
-	 */
-	if (IS_I9XX(pI830))
-	    start = MB(1);
-	else
-	    start = KB(512);
+	if (IS_I965G(intel)) {
+		/* The 965 can have fences at any page boundary. */
+		return ALIGN(size, GTT_PAGE_SIZE);
+	} else {
+		/* Align the size to a power of two greater than the smallest fence
+		 * size.
+		 */
+		if (IS_I9XX(intel))
+			start = MB(1);
+		else
+			start = KB(512);
 
-	for (i = start; i < size; i <<= 1)
-	    ;
+		for (i = start; i < size; i <<= 1) ;
 
-	return i;
-    }
+		return i;
+	}
 }
 
 /**
@@ -162,249 +135,203 @@ i830_get_fence_size(I830Ptr pI830, unsig
  * calculate that here.
  */
 unsigned long
-i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch, int format)
+i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch, int format)
 {
-    unsigned long i;
-    unsigned long tile_width = (format == I915_TILING_Y) ? 128 : 512;
+	unsigned long i;
+	unsigned long tile_width = (format == I915_TILING_Y) ? 128 : 512;
 
-    if (format == TILE_NONE)
-	return pitch;
+	if (format == TILE_NONE)
+		return pitch;
 
-    /* 965 is flexible */
-    if (IS_I965G(pI830))
-	return ROUND_TO(pitch, tile_width);
+	/* 965 is flexible */
+	if (IS_I965G(intel))
+		return ROUND_TO(pitch, tile_width);
 
-    /* Pre-965 needs power of two tile width */
-    for (i = tile_width; i < pitch; i <<= 1)
-	;
+	/* Pre-965 needs power of two tile width */
+	for (i = tile_width; i < pitch; i <<= 1) ;
 
-    return i;
+	return i;
 }
 
 /**
  * On some chips, pitch width has to be a power of two tile width, so
  * calculate that here.
  */
-unsigned long
-i830_get_fence_alignment(I830Ptr pI830, unsigned long size)
+static unsigned long i830_get_fence_alignment(intel_screen_private *intel, unsigned long size)
 {
-    if (IS_I965G(pI830))
-	return 4096;
-    else
-	return i830_get_fence_size(pI830, size);
+	if (IS_I965G(intel))
+		return 4096;
+	else
+		return i830_get_fence_size(intel, size);
 }
 
 static Bool
-i830_check_display_stride(ScrnInfoPtr pScrn, int stride, Bool tiling)
+i830_check_display_stride(ScrnInfoPtr scrn, int stride, Bool tiling)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int limit = KB(32);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int limit = KB(32);
 
-    /* 8xx spec has always 8K limit, but tests show larger limit in
-       non-tiling mode, which makes large monitor work. */
-    if ((IS_845G(pI830) || IS_I85X(pI830)) && tiling)
-	limit = KB(8);
+	/* 8xx spec has always 8K limit, but tests show larger limit in
+	   non-tiling mode, which makes large monitor work. */
+	if ((IS_845G(intel) || IS_I85X(intel)) && tiling)
+		limit = KB(8);
 
-    if (IS_I915(pI830) && tiling)
-	limit = KB(8);
+	if (IS_I915(intel) && tiling)
+		limit = KB(8);
 
-    if (IS_I965G(pI830) && tiling)
-	limit = KB(16);
+	if (IS_I965G(intel) && tiling)
+		limit = KB(16);
 
-    if (stride <= limit)
-	return TRUE;
-    else
-	return FALSE;
+	if (IS_IGDNG(intel) && tiling)
+		limit = KB(32);
+
+	if (stride <= limit)
+		return TRUE;
+	else
+		return FALSE;
 }
 
-static Bool
-i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem)
+static Bool i830_bind_memory(ScrnInfoPtr scrn, i830_memory *mem)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (mem == NULL || mem->bound)
-	return TRUE;
+	if (mem == NULL || mem->bound || intel->use_drm_mode)
+		return TRUE;
 
-#ifdef XF86DRI
-    if (mem->bo != NULL) {
-	if (dri_bo_pin(mem->bo, mem->alignment) != 0) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Failed to pin %s: %s\n",
-		       mem->name, strerror(errno));
-	    return FALSE;
-	}
-
-	mem->bound = TRUE;
-	mem->offset = mem->bo->offset;
-	mem->end = mem->offset + mem->size;
-    }
-#endif
+	if (mem->bo != NULL) {
 
-    if (!mem->bound) {
-	if (!pI830->gtt_acquired)
-	    return TRUE;
+		if (dri_bo_pin(mem->bo, mem->alignment) != 0) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			    "Failed to pin %s: %s\n",
+			    mem->name, strerror(errno));
+			return FALSE;
+		}
 
-	if (mem->key != -1 &&
-	    !xf86BindGARTMemory(pScrn->scrnIndex, mem->key, mem->agp_offset))
-	{
-	    return FALSE;
-	}
+		mem->bound = TRUE;
+		mem->offset = mem->bo->offset;
+		mem->end = mem->offset + mem->size;
+	} else {
+		if (!intel->gtt_acquired)
+			return TRUE;
 
-	mem->bound = TRUE;
-    }
+		if (mem->key != -1 &&
+			!xf86BindGARTMemory(scrn->scrnIndex, mem->key,
+			    mem->agp_offset)) {
+			return FALSE;
+		}
 
-    if (mem->tiling != TILE_NONE && !pI830->use_drm_mode &&
-	!pI830->kernel_exec_fencing) {
-	mem->fence_nr = i830_set_tiling(pScrn, mem->offset, mem->pitch,
-					mem->allocated_size, mem->tiling);
-    }
+		mem->bound = TRUE;
+	}
 
-    return TRUE;
+	return TRUE;
 }
 
-static Bool
-i830_unbind_memory(ScrnInfoPtr pScrn, i830_memory *mem)
+static Bool i830_unbind_memory(ScrnInfoPtr scrn, i830_memory *mem)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (mem == NULL || !mem->bound)
-	return TRUE;
+	if (mem == NULL || !mem->bound)
+		return TRUE;
 
-    if (mem->tiling != TILE_NONE && !pI830->use_drm_mode &&
-	!pI830->kernel_exec_fencing)
-	i830_clear_tiling(pScrn, mem->fence_nr);
-
-#ifdef XF86DRI
-    if (mem->bo != NULL) {
-	if (dri_bo_unpin(mem->bo) == 0) {
-	    mem->bound = FALSE;
-	    /* Give buffer obviously wrong offset/end until it's re-pinned. */
-	    mem->offset = -1;
-	    mem->end = -1;
-	    return TRUE;
-	} else {
-	    return FALSE;
+	if (mem->bo != NULL && !intel->use_drm_mode) {
+		if (dri_bo_unpin(mem->bo) == 0) {
+			mem->bound = FALSE;
+			/* Give buffer obviously wrong offset/end until
+			 * it's re-pinned.
+			 */
+			mem->offset = -1;
+			mem->end = -1;
+			return TRUE;
+		} else {
+			return FALSE;
+		}
 	}
-    }
-#endif
 
-    if (mem->key == -1 || xf86UnbindGARTMemory(pScrn->scrnIndex, mem->key)) {
-	mem->bound = FALSE;
-	return TRUE;
-    } else {
-	return FALSE;
-    }
+	if (mem->key == -1 || xf86UnbindGARTMemory(scrn->scrnIndex, mem->key)) {
+		mem->bound = FALSE;
+		return TRUE;
+	} else {
+		return FALSE;
+	}
 }
 
-void
-i830_free_memory(ScrnInfoPtr pScrn, i830_memory *mem)
+void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem)
 {
-    if (mem == NULL)
-	return;
+	if (mem == NULL)
+		return;
 
-    /* Free any AGP memory. */
-    i830_unbind_memory(pScrn, mem);
+	/* Free any AGP memory. */
+	i830_unbind_memory(scrn, mem);
 
-#ifdef XF86DRI
-    if (mem->bo != NULL) {
-	I830Ptr pI830 = I830PTR(pScrn);
-	dri_bo_unreference (mem->bo);
-	if (pI830->bo_list == mem) {
-	    pI830->bo_list = mem->next;
-	    if (mem->next)
-		mem->next->prev = NULL;
-	} else {
-	    if (mem->prev)
+	if (mem->bo != NULL) {
+		intel_screen_private *intel = intel_get_screen_private(scrn);
+		dri_bo_unreference(mem->bo);
+		if (intel->bo_list == mem) {
+			intel->bo_list = mem->next;
+			if (mem->next)
+				mem->next->prev = NULL;
+		} else {
+			if (mem->prev)
+				mem->prev->next = mem->next;
+			if (mem->next)
+				mem->next->prev = mem->prev;
+		}
+		free(mem->name);
+		free(mem);
+		return;
+	}
+	/* Disconnect from the list of allocations */
+	if (mem->prev != NULL)
 		mem->prev->next = mem->next;
-	    if (mem->next)
+	if (mem->next != NULL)
 		mem->next->prev = mem->prev;
-	}
-	xfree(mem->name);
-	xfree(mem);
-	return;
-    }
-#endif
-	    /* Disconnect from the list of allocations */
-    if (mem->prev != NULL)
-	mem->prev->next = mem->next;
-    if (mem->next != NULL)
-	mem->next->prev = mem->prev;
 
-    if (mem->key != -1) {
-	xf86DeallocateGARTMemory(pScrn->scrnIndex, mem->key);
-	mem->key = -1;
-    }
+	if (mem->key != -1) {
+		xf86DeallocateGARTMemory(scrn->scrnIndex, mem->key);
+		mem->key = -1;
+	}
 
-    xfree(mem->name);
-    xfree(mem);
+	free(mem->name);
+	free(mem);
 }
 
 /* Resets the state of the aperture allocator, freeing all memory that had
  * been allocated.
  */
-void
-i830_reset_allocations(ScrnInfoPtr pScrn)
+void i830_reset_allocations(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int	    p;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int p;
 
-    /* While there is any memory between the start and end markers, free it. */
-    while (pI830->memory_list->next->next != NULL) {
-	i830_memory *mem = pI830->memory_list->next;
-
-#ifdef XF86DRI
-	/* Don't reset BO allocator, which we set up at init. */
-	if (pI830->memory_manager == mem) {
-	    mem = mem->next;
-	    if (mem->next == NULL)
-		break;
-	}
-#endif	
-
-	i830_free_memory(pScrn, mem);
-    }
-
-    /* Free any allocations in buffer objects */
-    if (pI830->memory_manager) {
-	while (pI830->bo_list != NULL)
-	    i830_free_memory(pScrn, pI830->bo_list);
-    }
+	/* While there is any memory between the start and end markers, free it. */
+	while (intel->memory_list->next->next != NULL) {
+		i830_memory *mem = intel->memory_list->next;
+
+		/* Don't reset BO allocator, which we set up at init. */
+		if (intel->memory_manager == mem) {
+			mem = mem->next;
+			if (mem->next == NULL)
+				break;
+		}
 
-    /* Null out the pointers for all the allocations we just freed.  This is
-     * kind of gross, but at least it's just one place now.
-     */
-    pI830->cursor_mem = NULL;
-    for (p = 0; p < 2; p++) {
-	pI830->cursor_mem_classic[p] = NULL;
-	pI830->cursor_mem_argb[p] = NULL;
-    }
-    pI830->front_buffer = NULL;
-    pI830->xaa_scratch = NULL;
-    pI830->exa_offscreen = NULL;
-    pI830->overlay_regs = NULL;
-    pI830->power_context = NULL;
-#ifdef XF86DRI
-    pI830->back_buffer = NULL;
-    pI830->depth_buffer = NULL;
-    pI830->textures = NULL;
-#endif
-    pI830->ring.mem = NULL;
-    pI830->fake_bufmgr_mem = NULL;
-}
+		i830_free_memory(scrn, mem);
+	}
 
-void
-i830_free_3d_memory(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
+	/* Free any allocations in buffer objects */
+	while (intel->bo_list != NULL)
+		i830_free_memory(scrn, intel->bo_list);
 
-#ifdef XF86DRI
-    i830_free_memory(pScrn, pI830->back_buffer);
-    pI830->back_buffer = NULL;
-    i830_free_memory(pScrn, pI830->depth_buffer);
-    pI830->depth_buffer = NULL;
-    i830_free_memory(pScrn, pI830->textures);
-    pI830->textures = NULL;
-#endif
+	/* Null out the pointers for all the allocations we just freed.  This is
+	 * kind of gross, but at least it's just one place now.
+	 */
+	intel->cursor_mem = NULL;
+	for (p = 0; p < 2; p++) {
+		intel->cursor_mem_classic[p] = NULL;
+		intel->cursor_mem_argb[p] = NULL;
+	}
+	intel->front_buffer = NULL;
+	intel->overlay_regs = NULL;
+	intel->power_context = NULL;
 }
 
 /**
@@ -416,179 +343,134 @@ i830_free_3d_memory(ScrnInfoPtr pScrn)
  * static allocations.  Some of these exist because of the need for physical
  * addresses to reference.
  */
-Bool
-i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
+Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    i830_memory *start, *end;
-#ifdef XF86DRI
-    int dri_major, dri_minor, dri_patch;
-    struct drm_i915_getparam gp;
-    struct drm_i915_setparam sp;
-    int has_gem;
-    int has_dri;
-#endif
-
-    start = xcalloc(1, sizeof(*start));
-    if (start == NULL)
-	return FALSE;
-    start->name = xstrdup("start marker");
-    if (start->name == NULL) {
-	xfree(start);
-	return FALSE;
-    }
-    end = xcalloc(1, sizeof(*end));
-    if (end == NULL) {
-	xfree(start->name);
-	xfree(start);
-	return FALSE;
-    }
-    end->name = xstrdup("end marker");
-    if (end->name == NULL) {
-	xfree(start->name);
-	xfree(start);
-	xfree(end);
-	return FALSE;
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	i830_memory *start, *end;
+	struct drm_i915_setparam sp;
 
-    start->key = -1;
-    start->offset = offset;
-    start->end = start->offset;
-    start->size = 0;
-    start->next = end;
-    end->key = -1;
-    end->offset = offset + size;
-    end->end = end->offset;
-    end->size = 0;
-    end->prev = start;
-
-    pI830->memory_list = start;
-
-#ifdef XF86DRI
-    has_gem = FALSE;
-    has_dri = FALSE;
-    
-    if (pI830->directRenderingType == DRI_XF86DRI &&
-	xf86LoaderCheckSymbol ("DRIQueryVersion"))
-    {
-	DRIQueryVersion(&dri_major, &dri_minor, &dri_patch);
-	has_dri = TRUE;
-    }
+	start = calloc(1, sizeof(*start));
+	if (start == NULL)
+		return FALSE;
+	start->name = xstrdup("start marker");
+	if (start->name == NULL) {
+		free(start);
+		return FALSE;
+	}
+	end = calloc(1, sizeof(*end));
+	if (end == NULL) {
+		free(start->name);
+		free(start);
+		return FALSE;
+	}
+	end->name = xstrdup("end marker");
+	if (end->name == NULL) {
+		free(start->name);
+		free(start);
+		free(end);
+		return FALSE;
+	}
 
-    if (pI830->directRenderingType >= DRI_XF86DRI)
-    {
-	has_gem = FALSE;
-	gp.param = I915_PARAM_HAS_GEM;
-	gp.value = &has_gem;
-    
-	(void)drmCommandWriteRead(pI830->drmSubFD, DRM_I915_GETPARAM,
-				  &gp, sizeof(gp));
-    }
+	start->key = -1;
+	start->offset = 0;
+	start->end = start->offset;
+	start->size = 0;
+	start->next = end;
+	end->key = -1;
+	end->offset = size;
+	end->end = end->offset;
+	end->size = 0;
+	end->prev = start;
+
+	intel->memory_list = start;
+
+	/* Now that we have our manager set up, give the kernel a piece of the
+	 * aperture for GEM buffer object mapping. This is only needed for UXA
+	 * and/or DRI2 when the kernel hasn't already managed this itself under
+	 * KMS.  We need libdri interface5.4 or newer so we can rely on the lock
+	 * being held after DRIScreenInit, rather than after DRIFinishScreenInit.
+	 */
 
-    /* Now that we have our manager set up, initialize the kernel MM if
-     * possible, covering almost all of the aperture.  We need libdri interface
-     * 5.4 or newer so we can rely on the lock being held after DRIScreenInit,
-     * rather than after DRIFinishScreenInit.
-     */
-    if ((pI830->directRenderingType == DRI_XF86DRI && has_gem && has_dri &&
-	(dri_major > 5 || (dri_major == 5 && dri_minor >= 4))) ||
-	(pI830->directRenderingType == DRI_DRI2 && has_gem))
-    {
-	int mmsize;
+	if (!intel->use_drm_mode) {
+		int mmsize;
 
-	/* Take over all of the graphics aperture minus enough to for
-	 * physical-address allocations of cursor/overlay registers.
-	 */
-	mmsize = size;
+		/* Take over all of the graphics aperture minus enough to for
+		 * physical-address allocations of cursor/overlay registers.
+		 */
+		mmsize = size;
 
-	/* EXA area is fixed. */
-	if (pI830->accel == ACCEL_EXA) {
-	    mmsize -= ROUND_TO_PAGE(3 * pScrn->displayWidth * pI830->cpp *
-				    pScrn->virtualY);
-	}
-	/* Overlay and cursors, if physical, need to be allocated outside
-	 * of the kernel memory manager.
-	 */
-	if (!OVERLAY_NOPHYSICAL(pI830) && !OVERLAY_NOEXIST(pI830)) {
-	    mmsize -= ROUND_TO(OVERLAY_SIZE, GTT_PAGE_SIZE);
-	}
-	if (pI830->CursorNeedsPhysical) {
-	    mmsize -= 2 * (ROUND_TO(HWCURSOR_SIZE, GTT_PAGE_SIZE) +
-		    ROUND_TO(HWCURSOR_SIZE_ARGB, GTT_PAGE_SIZE));
-	}
-	if (pI830->fb_compression)
-	    mmsize -= MB(6) + ROUND_TO_PAGE(FBC_LL_SIZE + FBC_LL_PAD);
-	/* Can't do GEM on stolen memory */
-	mmsize -= pI830->stolen_size;
-
-	/* Create the aperture allocation */
-	pI830->memory_manager =
-	    i830_allocate_aperture(pScrn, "DRI memory manager",
-				   mmsize, 0, GTT_PAGE_SIZE,
-				   ALIGN_BOTH_ENDS | NEED_NON_STOLEN,
-				   TILE_NONE);
-
-	if (pI830->memory_manager != NULL) {
-	    if (!pI830->use_drm_mode) {
-		struct drm_i915_gem_init init;
-		int ret;
-
-		if (pI830->accel == ACCEL_UXA) {
-		    sp.param = I915_SETPARAM_NUM_USED_FENCES;
-		    sp.value = 0; /* kernel gets them all */
-
-		    ret = drmCommandWrite(pI830->drmSubFD, DRM_I915_SETPARAM,
-					  &sp, sizeof(sp));
-		    if (ret == 0)
-			pI830->kernel_exec_fencing = TRUE;
-		}
-		init.gtt_start = pI830->memory_manager->offset;
-		init.gtt_end = pI830->memory_manager->offset +
-		    pI830->memory_manager->size;
-
-		/* Tell the kernel to manage it */
-		ret = ioctl(pI830->drmSubFD, DRM_IOCTL_I915_GEM_INIT, &init);
-		if (ret != 0) {
-		    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			       "Failed to initialize kernel memory manager\n");
-		    i830_free_memory(pScrn, pI830->memory_manager);
-		    pI830->memory_manager = NULL;
+		/* Overlay and cursors, if physical, need to be allocated
+		 * outside of the kernel memory manager.
+		 */
+		if (!OVERLAY_NOPHYSICAL(intel) && !OVERLAY_NOEXIST(intel)) {
+			mmsize -= ROUND_TO(OVERLAY_SIZE, GTT_PAGE_SIZE);
+		}
+		if (intel->CursorNeedsPhysical) {
+			mmsize -= 2 * (ROUND_TO(HWCURSOR_SIZE, GTT_PAGE_SIZE) +
+			ROUND_TO(HWCURSOR_SIZE_ARGB, GTT_PAGE_SIZE));
+		}
+		if (intel->fb_compression)
+			mmsize -= MB(6) + ROUND_TO_PAGE(FBC_LL_SIZE +
+			    FBC_LL_PAD);
+
+		/* Can't do GEM on stolen memory */
+		mmsize -= intel->stolen_size;
+
+		/* Create the aperture allocation */
+		intel->memory_manager =
+		   i830_allocate_aperture(scrn, "DRI memory manager",
+	           mmsize, 0, GTT_PAGE_SIZE, ALIGN_BOTH_ENDS | NEED_NON_STOLEN,
+	           TILE_NONE);
+
+		if (intel->memory_manager != NULL) {
+			struct drm_i915_gem_init init;
+			int ret;
+
+			sp.param = I915_SETPARAM_NUM_USED_FENCES;
+			sp.value = 0; /* kernel gets them all */
+
+			ret = drmCommandWrite(intel->drmSubFD,
+			    DRM_I915_SETPARAM, &sp, sizeof(sp));
+			if (ret != 0)
+				ErrorF("no kernel exec fencing, wtf?");
+			init.gtt_start = intel->memory_manager->offset;
+			init.gtt_end = intel->memory_manager->offset +
+			    intel->memory_manager->size;
+
+			/* Tell the kernel to manage it */
+			ret = ioctl(intel->drmSubFD, DRM_IOCTL_I915_GEM_INIT,
+			    &init);
+			if (ret != 0) {
+				xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+				    "Failed to initialize kernel memory manager\n");
+				i830_free_memory(scrn, intel->memory_manager);
+				intel->memory_manager = NULL;
+				return FALSE;
+			}
+			i830_init_bufmgr(scrn);
+		} else {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			    "Failed to allocate space for kernel memory manager\n");
 		}
-		i830_init_bufmgr(pScrn);
-	    }
-	} else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Failed to allocate space for kernel memory manager\n");
-	    i830_free_memory(pScrn, pI830->memory_manager);
-	    pI830->memory_manager = NULL;
 	}
-    } else {
-	pI830->allocate_classic_textures = TRUE;
-    }
-#endif /* XF86DRI */
 
-    return TRUE;
+	return TRUE;
 }
 
-void
-i830_allocator_fini(ScrnInfoPtr pScrn)
+void i830_allocator_fini(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    /* Free most of the allocations */
-    i830_reset_allocations(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    /* The memory manager is more special */
-    if (pI830->memory_manager) {
-	 /* XXX drmMMTakedown(pI830->drmSubFD, DRM_BO_MEM_TT);*/
-	 i830_free_memory(pScrn, pI830->memory_manager);
-	 pI830->memory_manager = NULL;
-    }
+	/* The memory manager is more special */
+	if (intel->memory_manager) {
+		i830_free_memory(scrn, intel->memory_manager);
+		intel->memory_manager = NULL;
+	}
 
-    /* Free the start/end markers */
-    free(pI830->memory_list->next);
-    free(pI830->memory_list);
-    pI830->memory_list = NULL;
+	/* Free the start/end markers */
+	free(intel->memory_list->next);
+	free(intel->memory_list);
+	intel->memory_list = NULL;
 }
 
 /**
@@ -598,38 +480,35 @@ i830_allocator_fini(ScrnInfoPtr pScrn)
  * \return physical address if successful.
  * \return (uint64_t)-1 if unsuccessful.
  */
-static uint64_t
-i830_get_gtt_physical(ScrnInfoPtr pScrn, unsigned long offset)
+static uint64_t i830_get_gtt_physical(ScrnInfoPtr scrn, unsigned long offset)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t gttentry;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint32_t gttentry;
 
-    /* We don't have GTTBase set up on i830 yet. */
-    if (pI830->GTTBase == NULL)
-	return -1;
+	/* We don't have GTTBase set up on i830 yet. */
+	if (intel->GTTBase == NULL)
+		return -1;
 
-    gttentry = INGTT(offset / 1024);
+	gttentry = INGTT(offset / 1024);
 
-    /* Mask out these reserved bits on this hardware. */
-    if (!IS_I9XX(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) ||
-	IS_I945G(pI830) || IS_I945GM(pI830))
-    {
-	gttentry &= ~PTE_ADDRESS_MASK_HIGH;
-    }
+	/* Mask out these reserved bits on this hardware. */
+	if (!IS_I9XX(intel) || IS_I915G(intel) || IS_I915GM(intel) ||
+	    IS_I945G(intel) || IS_I945GM(intel)) {
+		gttentry &= ~PTE_ADDRESS_MASK_HIGH;
+	}
 
-    /* If it's not a mapping type we know, then bail. */
-    if ((gttentry & PTE_MAPPING_TYPE_MASK) != PTE_MAPPING_TYPE_UNCACHED &&
-	(gttentry & PTE_MAPPING_TYPE_MASK) != PTE_MAPPING_TYPE_CACHED)
-    {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "Unusable physical mapping type 0x%08x\n",
-		   (unsigned int)(gttentry & PTE_MAPPING_TYPE_MASK));
-	return -1;
-    }
-    assert((gttentry & PTE_VALID) != 0);
+	/* If it's not a mapping type we know, then bail. */
+	if ((gttentry & PTE_MAPPING_TYPE_MASK) != PTE_MAPPING_TYPE_UNCACHED &&
+	    (gttentry & PTE_MAPPING_TYPE_MASK) != PTE_MAPPING_TYPE_CACHED) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+		    "Unusable physical mapping type 0x%08x\n",
+		    (unsigned int)(gttentry & PTE_MAPPING_TYPE_MASK));
+		return -1;
+	}
+	assert((gttentry & PTE_VALID) != 0);
 
-    return (gttentry & PTE_ADDRESS_MASK) |
-	((uint64_t)(gttentry & PTE_ADDRESS_MASK_HIGH) << (32 - 4));
+	return (gttentry & PTE_ADDRESS_MASK) |
+	    ((uint64_t)(gttentry & PTE_ADDRESS_MASK_HIGH) << (32 - 4));
 }
 
 /**
@@ -639,36 +518,35 @@ i830_get_gtt_physical(ScrnInfoPtr pScrn,
  * \return physical address if successful.
  * \return (uint64_t)-1 if unsuccessful.
  */
-static uint64_t
-i830_get_stolen_physical(ScrnInfoPtr pScrn, unsigned long offset,
-			 unsigned long size)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint64_t physical;
-    unsigned long scan;
-
-    /* Check that the requested region is within stolen memory. */
-    if (offset + size >= pI830->stolen_size)
-	return -1;
-
-    physical = i830_get_gtt_physical(pScrn, offset);
-    if (physical == -1)
-	return -1;
+static uint64_t i830_get_stolen_physical(ScrnInfoPtr scrn,
+    unsigned long offset, unsigned long size)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint64_t physical;
+	unsigned long scan;
+
+	/* Check that the requested region is within stolen memory. */
+	if (offset + size >= intel->stolen_size)
+		return -1;
+
+	physical = i830_get_gtt_physical(scrn, offset);
+	if (physical == -1)
+		return -1;
 
-    /* Check that the following pages in our allocation follow the first page
-     * contiguously.
-     */
-    for (scan = offset + 4096; scan < offset + size; scan += 4096) {
-	uint64_t scan_physical = i830_get_gtt_physical(pScrn, scan);
+	/* Check that the following pages in our allocation follow the first
+	 * page contiguously.
+	 */
+	for (scan = offset + 4096; scan < offset + size; scan += 4096) {
+		uint64_t scan_physical = i830_get_gtt_physical(scrn, scan);
 
-	if ((scan - offset) != (scan_physical - physical)) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Non-contiguous GTT entries: (%ld,0x16%" PRIx64 ") vs "
-		       "(%ld,0x%" PRIx64 ")\n",
-		       scan, scan_physical, offset, physical);
-	    return -1;
+		if ((scan - offset) != (scan_physical - physical)) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			    "Non-contiguous GTT entries: (%ld,0x16%"
+			    PRIx64 ") vs  (%ld,0x%" PRIx64 ")\n",
+			    scan, scan_physical, offset, physical);
+			return -1;
+		}
 	}
-    }
 
     return physical;
 }
@@ -679,81 +557,84 @@ i830_get_stolen_physical(ScrnInfoPtr pSc
  * Allocations are a minimum of a page, and will be at least page-aligned.
  */
 static i830_memory *
-i830_allocate_aperture(ScrnInfoPtr pScrn, const char *name,
-		       unsigned long size, unsigned long pitch,
-		       unsigned long alignment, int flags,
-		       enum tile_format tile_format)
+i830_allocate_aperture(ScrnInfoPtr scrn, const char *name, unsigned long size,
+    unsigned long pitch, unsigned long alignment, int flags,
+    enum tile_format tile_format)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    i830_memory *mem, *scan;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	i830_memory *mem, *scan;
 
-    mem = xcalloc(1, sizeof(*mem));
-    if (mem == NULL)
-	return NULL;
-
-    /* No memory allocated to back the region */
-    mem->key = -1;
-
-    mem->name = xstrdup(name);
-    if (mem->name == NULL) {
-	xfree(mem);
-	return NULL;
-    }
-    /* Only allocate page-sized increments. */
-    size = ALIGN(size, GTT_PAGE_SIZE);
-    mem->size = size;
-    mem->allocated_size = size;
-    mem->alignment = alignment;
-    mem->tiling = tile_format;
-    mem->pitch = pitch;
-    mem->fence_nr = -1;
-
-    if (alignment < GTT_PAGE_SIZE)
-	alignment = GTT_PAGE_SIZE;
-
-    for (scan = pI830->memory_list; scan->next != NULL; scan = scan->next) {
-	mem->offset = ROUND_TO(scan->end, alignment);
-	if ((flags & NEED_PHYSICAL_ADDR) && mem->offset < pI830->stolen_size) {
-	    /* If the allocation is entirely within stolen memory, and we're
-	     * able to get the physical addresses out of the GTT and check that
-	     * it's contiguous (it ought to be), then we can do our physical
-	     * allocations there and not bother the kernel about it.  This
-	     * helps avoid aperture fragmentation from our physical
-	     * allocations.
-	     */
-	    mem->bus_addr = i830_get_stolen_physical(pScrn, mem->offset,
-						     mem->size);
+	mem = calloc(1, sizeof(*mem));
+	if (mem == NULL)
+		return NULL;
 
-	    if (mem->bus_addr == ((uint64_t)-1)) {
-		/* Move the start of the allocation to just past the end of
-		 * stolen memory.
-		 */
-		mem->offset = ROUND_TO(pI830->stolen_size, alignment);
-	    }
-	}
-	if ((flags & NEED_NON_STOLEN) && mem->offset < pI830->stolen_size) {
-	    mem->offset = ROUND_TO(pI830->stolen_size, alignment);
+	/* No memory allocated to back the region */
+	mem->key = -1;
+
+	mem->name = xstrdup(name);
+	if (mem->name == NULL) {
+		free(mem);
+		return NULL;
 	}
+	/* Only allocate page-sized increments. */
+	size = ALIGN(size, GTT_PAGE_SIZE);
+	mem->size = size;
+	mem->allocated_size = size;
+	mem->alignment = alignment;
+	mem->tiling = tile_format;
+	mem->pitch = pitch;
+	mem->fence_nr = -1;
+
+	if (alignment < GTT_PAGE_SIZE)
+		alignment = GTT_PAGE_SIZE;
+
+	for (scan = intel->memory_list; scan->next != NULL; scan = scan->next) {
+		mem->offset = ROUND_TO(scan->end, alignment);
+		if ((flags & NEED_PHYSICAL_ADDR) &&
+		    mem->offset < intel->stolen_size) {
+			/* If the allocation is entirely within stolen memory,
+			 * and we're able to get the physical addresses out of
+			 * the GTT and check that it's contiguous (it ought to
+			 * be), then we can do our physical allocations there
+			 * and not bother the kernel about it.  This helps
+			 * avoid aperture fragmentation from our
+			 * physical allocations.
+			 */
+			mem->bus_addr = i830_get_stolen_physical(scrn,
+			    mem->offset, mem->size);
+
+			if (mem->bus_addr == ((uint64_t)-1)) {
+				/* Move the start of the allocation to just
+				 * past the end of stolen memory.
+				 */
+				mem->offset = ROUND_TO(intel->stolen_size,
+				    alignment);
+			}
+		}
+		if ((flags & NEED_NON_STOLEN) &&
+		    mem->offset < intel->stolen_size) {
+			mem->offset = ROUND_TO(intel->stolen_size, alignment);
+		}
 
-	mem->end = mem->offset + size;
-	if (flags & ALIGN_BOTH_ENDS)
-	    mem->end = ROUND_TO(mem->end, alignment);
-	if (mem->end <= scan->next->offset)
-	    break;
-    }
-    if (scan->next == NULL) {
-	/* Reached the end of the list, and didn't find space */
-	xfree(mem->name);
-	xfree(mem);
-	return NULL;
-    }
-    /* Insert new allocation into the list */
-    mem->prev = scan;
-    mem->next = scan->next;
-    scan->next = mem;
-    mem->next->prev = mem;
+		mem->end = mem->offset + size;
+		if (flags & ALIGN_BOTH_ENDS)
+		    mem->end = ROUND_TO(mem->end, alignment);
+		if (mem->end <= scan->next->offset)
+		    break;
+	    }
+	if (scan->next == NULL) {
+		/* Reached the end of the list, and didn't find space */
+		free(mem->name);
+		free(mem);
+		return NULL;
+	}
+	/* Insert new allocation into the list */
+	mem->prev = scan;
+	mem->next = scan->next;
+	scan->next = mem;
+	mem->next->prev = mem;
 
-    return mem;
+	return mem;
 }
 
 /**
@@ -763,130 +644,136 @@ i830_allocate_aperture(ScrnInfoPtr pScrn
  * The memory is automatically bound if we have the VT.
  */
 static Bool
-i830_allocate_agp_memory(ScrnInfoPtr pScrn, i830_memory *mem, int flags)
+i830_allocate_agp_memory(ScrnInfoPtr scrn, i830_memory *mem, int flags)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    unsigned long size;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	unsigned long size;
 
-    if (mem->key != -1)
-	return TRUE;
+	if (mem->key != -1)
+		return TRUE;
 
-    if (mem->offset + mem->size <= pI830->stolen_size)
-	return TRUE;
+	if (mem->offset + mem->size <= intel->stolen_size)
+		return TRUE;
 
-    if (mem->offset < pI830->stolen_size)
-	mem->agp_offset = pI830->stolen_size;
-    else
-	mem->agp_offset = mem->offset;
+	if (mem->offset < intel->stolen_size)
+		mem->agp_offset = intel->stolen_size;
+	else
+		mem->agp_offset = mem->offset;
 
-    size = mem->size - (mem->agp_offset - mem->offset);
+	size = mem->size - (mem->agp_offset - mem->offset);
 
-    if (flags & NEED_PHYSICAL_ADDR) {
-	unsigned long agp_bus_addr;
+	if (flags & NEED_PHYSICAL_ADDR) {
+		unsigned long agp_bus_addr;
 
-	mem->key = xf86AllocateGARTMemory(pScrn->scrnIndex, size, 2,
-					  &agp_bus_addr);
-	mem->bus_addr = agp_bus_addr;
-    } else {
-	mem->key = xf86AllocateGARTMemory(pScrn->scrnIndex, size, 0, NULL);
-    }
-    if (mem->key == -1 || ((flags & NEED_PHYSICAL_ADDR) && mem->bus_addr == 0))
-    {
-	return FALSE;
-    }
+		mem->key = xf86AllocateGARTMemory(scrn->scrnIndex, size, 2,
+		    &agp_bus_addr);
+		mem->bus_addr = agp_bus_addr;
+	} else {
+		mem->key = xf86AllocateGARTMemory(scrn->scrnIndex,
+		    size, 0, NULL);
+	}
+	if (mem->key == -1 || ((flags & NEED_PHYSICAL_ADDR) &&
+	    mem->bus_addr == 0)) {
+		return FALSE;
+	}
 
-    return TRUE;
+	return TRUE;
 }
 
-#ifdef XF86DRI
-static i830_memory *
-i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
-			unsigned long size, unsigned long pitch,
-			unsigned long align, int flags,
-			enum tile_format tile_format)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    i830_memory *mem;
-    uint32_t bo_tiling_mode = I915_TILING_NONE;
-    int	    ret;
-
-    assert((flags & NEED_PHYSICAL_ADDR) == 0);
-
-    /* Only allocate page-sized increments. */
-    size = ALIGN(size, GTT_PAGE_SIZE);
-    align = i830_get_fence_alignment(pI830, size);
-
-    mem = xcalloc(1, sizeof(*mem));
-    if (mem == NULL)
-	return NULL;
-
-    mem->name = xstrdup(name);
-    if (mem->name == NULL) {
-	xfree(mem);
-	return NULL;
-    }
+static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr scrn, const char *name,
+					    unsigned long size,
+					    unsigned long pitch,
+					    unsigned long align, int flags,
+					    enum tile_format tile_format)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	i830_memory *mem;
+	uint32_t bo_tiling_mode = I915_TILING_NONE;
+	int ret;
 
-    mem->bo = dri_bo_alloc (pI830->bufmgr, name, size, align);
+	assert((flags & NEED_PHYSICAL_ADDR) == 0);
 
-    if (!mem->bo) {
-	xfree(mem->name);
-	xfree(mem);
-	return NULL;
-    }
+	/* Only allocate page-sized increments. */
+	size = ALIGN(size, GTT_PAGE_SIZE);
+	align = i830_get_fence_alignment(intel, size);
 
-    /* Give buffer obviously wrong offset/end until it's pinned. */
-    mem->offset = -1;
-    mem->end = -1;
-    mem->size = size;
-    mem->allocated_size = size;
-    mem->alignment = align;
-    mem->tiling = tile_format;
-    mem->pitch = pitch;
-    mem->fence_nr = -1;
-    if (flags & NEED_LIFETIME_FIXED)
-	mem->lifetime_fixed_offset = TRUE;
-
-    switch (tile_format) {
-    case TILE_XMAJOR:
-	bo_tiling_mode = I915_TILING_X;
-	break;
-    case TILE_YMAJOR:
-	bo_tiling_mode = I915_TILING_Y;
-	break;
-    case TILE_NONE:
-    default:
-	bo_tiling_mode = I915_TILING_NONE;
-	break;
-    }
+	mem = calloc(1, sizeof(*mem));
+	if (mem == NULL)
+		return NULL;
 
-    ret = drm_intel_bo_set_tiling(mem->bo, &bo_tiling_mode, pitch);
-    if (ret != 0 || (bo_tiling_mode == I915_TILING_NONE && tile_format != TILE_NONE)) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "Failed to set tiling on %s: %s\n",
-		   mem->name,
-		   ret == 0 ? "rejected by kernel" : strerror(errno));
-	mem->tiling = TILE_NONE;
-    }
-    /* Bind it if we currently control the VT */
-    if (pScrn->vtSema || pI830->use_drm_mode) {
-	if (!i830_bind_memory(pScrn, mem)) {
-	    dri_bo_unreference (mem->bo);
-	    xfree(mem->name);
-	    xfree(mem);
-	    return NULL;
+	mem->name = xstrdup(name);
+	if (mem->name == NULL) {
+		free(mem);
+		return NULL;
+	}
+
+	mem->bo = dri_bo_alloc(intel->bufmgr, name, size, align);
+
+	if (!mem->bo) {
+		free(mem->name);
+		free(mem);
+		return NULL;
 	}
-    }
 
-    /* Insert new allocation into the list */
-    mem->prev = NULL;
-    mem->next = pI830->bo_list;
-    if (pI830->bo_list != NULL)
-	pI830->bo_list->prev = mem;
-    pI830->bo_list = mem;
+	/* Give buffer obviously wrong offset/end until it's pinned. */
+	mem->offset = -1;
+	mem->end = -1;
+	mem->size = size;
+	mem->allocated_size = size;
+	mem->alignment = align;
+	mem->tiling = tile_format;
+	mem->pitch = pitch;
+	mem->fence_nr = -1;
+
+	/* Give buffer obviously wrong offset/end until it's pinned. */
+	if (flags & NEED_LIFETIME_FIXED)
+		mem->lifetime_fixed_offset = TRUE;
 
-    return mem;
+	switch (tile_format) {
+	case TILE_XMAJOR:
+		bo_tiling_mode = I915_TILING_X;
+		break;
+	case TILE_YMAJOR:
+		bo_tiling_mode = I915_TILING_Y;
+		break;
+	case TILE_NONE:
+	default:
+		bo_tiling_mode = I915_TILING_NONE;
+		break;
+	}
+
+	ret = drm_intel_bo_set_tiling(mem->bo, &bo_tiling_mode, pitch);
+	if (ret != 0
+	    || (bo_tiling_mode == I915_TILING_NONE
+		&& tile_format != TILE_NONE)) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Failed to set tiling on %s: %s\n", mem->name,
+			   ret == 0 ? "rejected by kernel" : strerror(-ret));
+	}
+
+	/* Bind it if we currently control the VT */
+	if (scrn->vtSema || intel->use_drm_mode) {
+		if (!i830_bind_memory(scrn, mem)) {
+			dri_bo_unreference (mem->bo);
+			free(mem->name);
+			free(mem);
+			return NULL;
+		}
+	}
+
+
+	if (flags & DISABLE_REUSE)
+		drm_intel_bo_disable_reuse(mem->bo);
+
+	/* Insert new allocation into the list */
+	mem->prev = NULL;
+	mem->next = intel->bo_list;
+	if (intel->bo_list != NULL)
+		intel->bo_list->prev = mem;
+	intel->bo_list = mem;
+
+	return mem;
 }
-#endif /* XF86DRI */
 
 /* Allocates video memory at the given size, pitch, alignment and tile format.
  *
@@ -906,455 +793,358 @@ i830_allocate_memory_bo(ScrnInfoPtr pScr
  *   the entire Screen lifetime.  This means not using buffer objects, which
  *   get their offsets chosen at each EnterVT time.
  */
-i830_memory *
-i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
-		     unsigned long size, unsigned long pitch,
-		     unsigned long alignment, int flags,
-		     enum tile_format tile_format)
-{
-    i830_memory *mem;
-#ifdef XF86DRI
-    I830Ptr pI830 = I830PTR(pScrn);
-#endif
+i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
+				  unsigned long size, unsigned long pitch,
+				  unsigned long alignment, int flags,
+				  enum tile_format tile_format)
+{
+	i830_memory *mem;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    /* Manage tile alignment and size constraints */
-    if (tile_format != TILE_NONE) {
-	/* Only allocate page-sized increments. */
-	size = ALIGN(size, GTT_PAGE_SIZE);
+	/* Manage tile alignment and size constraints */
+	if (tile_format != TILE_NONE) {
+		/* Only allocate page-sized increments. */
+		size = ALIGN(size, GTT_PAGE_SIZE);
+
+		/* Check for maximum tiled region size */
+		if (IS_I9XX(intel)) {
+			if (size > MB(128))
+				return NULL;
+		} else {
+			if (size > MB(64))
+				return NULL;
+		}
 
-	/* Check for maximum tiled region size */
-	if (IS_I9XX(pI830)) {
-	    if (size > MB(128))
-		return NULL;
-	} else {
-	    if (size > MB(64))
-		return NULL;
+		/* round to size necessary for the fence register to work */
+		size = i830_get_fence_size(intel, size);
+		alignment = i830_get_fence_alignment(intel, size);
 	}
 
-	/* round to size necessary for the fence register to work */
-	size = i830_get_fence_size(pI830, size);
-	alignment = i830_get_fence_alignment(pI830, size);
-    }
-#ifdef XF86DRI
-    if (pI830->use_drm_mode || (pI830->memory_manager &&
-				!(flags & NEED_PHYSICAL_ADDR) &&
-				!(flags & NEED_LIFETIME_FIXED)))
-    {
-	return i830_allocate_memory_bo(pScrn, name, size, pitch, alignment, flags, tile_format);
-    } else
-#endif /* XF86DRI */
-    {
-	mem = i830_allocate_aperture(pScrn, name, size, pitch, alignment, flags, tile_format);
-	if (mem == NULL)
-	    return NULL;
-
-	if (!i830_allocate_agp_memory(pScrn, mem, flags)) {
-	    i830_free_memory(pScrn, mem);
-	    return NULL;
-	}
+	/*
+	 * Create a kernel buffer object when suitable.
+	 * Under KMS, all graphics memory must be managed by the
+	 * kernel. Under UMS, we separately reserve space for
+	 *  a few objects (overlays, power context, cursors, etc).
+	 */
+	if ((intel->use_drm_mode ||
+	    !(flags & (NEED_PHYSICAL_ADDR|NEED_LIFETIME_FIXED)))) {
+		return i830_allocate_memory_bo(scrn, name, size, pitch,
+		    alignment, flags, tile_format);
+	} else {
+		mem = i830_allocate_aperture(scrn, name, size, pitch,
+		    alignment, flags, tile_format);
+		if (mem == NULL)
+			return NULL;
+
+		if (!i830_allocate_agp_memory(scrn, mem, flags)) {
+			i830_free_memory(scrn, mem);
+			return NULL;
+		}
 
-	if (!i830_bind_memory(pScrn, mem)) {
-	    i830_free_memory(pScrn, mem);
-	    return NULL;
+		if (!i830_bind_memory(scrn, mem)) {
+			i830_free_memory(scrn, mem);
+			return NULL;
+		}
 	}
-    }
 
-    return mem;
+	return mem;
 }
 
 void
-i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
+i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    i830_memory *mem;
-
-    if (pI830->memory_list == NULL) {
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		       "%sMemory allocator not initialized\n", prefix);
-	return;
-    }
-
-    if (pI830->memory_list->next->next == NULL) {
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		       "%sNo memory allocations\n", prefix);
-	return;
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	i830_memory *mem;
 
-    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		   "%sFixed memory allocation layout:\n", prefix);
+	if (intel->memory_list == NULL) {
+		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+			       "%sMemory allocator not initialized\n", prefix);
+		return;
+	}
+
+	if (intel->memory_list->next->next == NULL) {
+		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+			       "%sNo memory allocations\n", prefix);
+		return;
+	}
+
+	xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+		       "%sFixed memory allocation layout:\n", prefix);
+
+	for (mem = intel->memory_list->next; mem->next != NULL; mem = mem->next) {
+		char phys_suffix[32] = "";
+		char *tile_suffix = "";
+
+		if (mem->offset >= intel->stolen_size &&
+		    mem->prev->offset < intel->stolen_size) {
+			xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+			    "%s0x%08lx:            end of stolen memory\n",
+			    prefix, intel->stolen_size);
+		}
 
-    for (mem = pI830->memory_list->next; mem->next != NULL; mem = mem->next) {
-	char phys_suffix[32] = "";
-	char *tile_suffix = "";
+		if (mem->bus_addr != 0)
+			snprintf(phys_suffix, sizeof(phys_suffix),
+			    ", 0x%016" PRIx64 " physical\n", mem->bus_addr);
+		if (mem->tiling == TILE_XMAJOR)
+			tile_suffix = " X tiled";
+		else if (mem->tiling == TILE_YMAJOR)
+			tile_suffix = " Y tiled";
 
-	if (mem->offset >= pI830->stolen_size &&
-	    mem->prev->offset < pI830->stolen_size)
-	{
-	    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-			   "%s0x%08lx:            end of stolen memory\n",
-			   prefix, pI830->stolen_size);
-	}
-
-	if (mem->bus_addr != 0)
-	    snprintf(phys_suffix, sizeof(phys_suffix),
-		    ", 0x%016" PRIx64 " physical\n", mem->bus_addr);
-	if (mem->tiling == TILE_XMAJOR)
-	    tile_suffix = " X tiled";
-	else if (mem->tiling == TILE_YMAJOR)
-	    tile_suffix = " Y tiled";
-
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		       "%s0x%08lx-0x%08lx: %s (%ld kB%s)%s\n", prefix,
-		       mem->offset, mem->end - 1, mem->name,
-		       mem->size / 1024, phys_suffix, tile_suffix);
-    }
-    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		   "%s0x%08lx:            end of aperture\n",
-		   prefix, pI830->FbMapSize);
-
-    if (pI830->memory_manager) {
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		       "%sBO memory allocation layout:\n", prefix);
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		       "%s0x%08lx:            start of memory manager\n",
-		       prefix, pI830->memory_manager->offset);
-	for (mem = pI830->bo_list; mem != NULL; mem = mem->next) {
-	    char *tile_suffix = "";
-
-	    if (mem->tiling == TILE_XMAJOR)
-		tile_suffix = " X tiled";
-	    else if (mem->tiling == TILE_YMAJOR)
-		tile_suffix = " Y tiled";
-
-	    if (mem->bound) {
-		xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-			       "%s0x%08lx-0x%08lx: %s (%ld kB)%s\n", prefix,
+		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+			       "%s0x%08lx-0x%08lx: %s (%ld kB%s)%s\n", prefix,
 			       mem->offset, mem->end - 1, mem->name,
-			       mem->size / 1024, tile_suffix);
-	    } else {
-		xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-			       "%sunpinned          : %s (%ld kB)%s\n", prefix,
-			       mem->name, mem->size / 1024, tile_suffix);
-	    }
+			       mem->size / 1024, phys_suffix, tile_suffix);
 	}
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
-		       "%s0x%08lx:            end of memory manager\n",
-		       prefix, pI830->memory_manager->end);
-    }
-}
-
-static Bool
-i830_allocate_ringbuffer(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
+	xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+	    "%s0x%08lx:            end of aperture\n", prefix, intel->FbMapSize);
 
-    if (pI830->accel == ACCEL_NONE || pI830->memory_manager || pI830->ring.mem != NULL)
-	return TRUE;
-
-    /* We don't have any mechanism in the DRM yet to alert it that we've moved
-     * the ringbuffer since init time, so allocate it fixed for its lifetime.
-     */
-    pI830->ring.mem = i830_allocate_memory(pScrn, "ring buffer",
-					   PRIMARY_RINGBUFFER_SIZE, PITCH_NONE,
-					   GTT_PAGE_SIZE,
-					   NEED_LIFETIME_FIXED, TILE_NONE);
-    if (pI830->ring.mem == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "Failed to allocate Ring Buffer space\n");
-	return FALSE;
-    }
-
-    pI830->ring.tail_mask = pI830->ring.mem->size - 1;
-    return TRUE;
+	xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+	    "%sBO memory allocation layout:\n", prefix);
+	if (intel->memory_manager) {
+		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+		    "%s0x%08lx:            start of memory manager\n",
+		    prefix, intel->memory_manager->offset);
+	}
+	for (mem = intel->bo_list; mem != NULL; mem = mem->next) {
+		char *tile_suffix = "";
+
+		if (mem->tiling == TILE_XMAJOR)
+			tile_suffix = " X tiled";
+		else if (mem->tiling == TILE_YMAJOR)
+			tile_suffix = " Y tiled";
+
+		if (mem->bound) {
+			xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+			   "%s0x%08lx-0x%08lx: %s (%ld kB)%s\n", prefix,
+			   mem->offset, mem->end - 1, mem->name,
+			   mem->size / 1024, tile_suffix);
+		} else {
+			xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+			    "%sunpinned          : %s (%ld kB)%s\n", prefix,
+			    mem->name, mem->size / 1024, tile_suffix);
+		}
+	}
+	if (intel->memory_manager) {
+		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
+		    "%s0x%08lx:            end of memory manager\n",
+		    prefix, intel->memory_manager->end);
+	}
 }
 
-#ifdef I830_XV
 /**
- * Allocate space for overlay registers and XAA linear allocator (if
- * requested)
+ * Allocate space for overlay registers.
  */
-static Bool
-i830_allocate_overlay(ScrnInfoPtr pScrn)
+static Bool i830_allocate_overlay(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int flags = 0;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int flags = 0;
 
-    /* Only allocate if overlay is going to be enabled. */
-    if (!pI830->XvEnabled)
-	return TRUE;
+	/* Only allocate if overlay is going to be enabled. */
+	if (!intel->XvEnabled)
+		return TRUE;
 
-    if (OVERLAY_NOEXIST(pI830))
-	return TRUE;
+	if (OVERLAY_NOEXIST(intel))
+		return TRUE;
 
-    if (!OVERLAY_NOPHYSICAL(pI830)) {
-	if (pI830->use_drm_mode)
-            return TRUE;
-	flags |= NEED_PHYSICAL_ADDR;
-    }
+	if (!OVERLAY_NOPHYSICAL(intel)) {
+		if (intel->use_drm_mode)
+			return TRUE;
+		flags |= NEED_PHYSICAL_ADDR;
+	}
 
-    pI830->overlay_regs = i830_allocate_memory(pScrn, "overlay registers",
-					       OVERLAY_SIZE, PITCH_NONE, GTT_PAGE_SIZE,
-					       flags, TILE_NONE);
-    if (pI830->overlay_regs == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "Failed to allocate Overlay register space.\n");
-	/* This failure isn't fatal. */
-    }
+	intel->overlay_regs = i830_allocate_memory(scrn, "overlay registers",
+	    OVERLAY_SIZE, PITCH_NONE, GTT_PAGE_SIZE, flags, TILE_NONE);
+	if (intel->overlay_regs == NULL) {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+		    "Failed to allocate Overlay register space.\n");
+		/* This failure isn't fatal. */
+	}
 
-    if (flags & NEED_PHYSICAL_ADDR)
-	if (pI830->use_drm_mode)
-	    ; /* need physical addr */
+	if (flags & NEED_PHYSICAL_ADDR)
+		if (intel->use_drm_mode)
+			; /* need physical addr */
 
-    return TRUE;
+	return TRUE;
 }
-#endif
 
-static Bool
-IsTileable(ScrnInfoPtr pScrn, int pitch)
+static Bool IsTileable(ScrnInfoPtr scrn, int pitch)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (IS_I965G(pI830)) {
-	if (pitch / 512 * 512 == pitch && pitch <= KB(128))
-	    return TRUE;
-	else
-	    return FALSE;
-    }
+	if (IS_I965G(intel)) {
+		if (pitch / 512 * 512 == pitch && pitch <= KB(128))
+			return TRUE;
+		else
+			return FALSE;
+	}
 
-    /*
-     * Allow tiling for pitches that are a power of 2 multiple of 128 bytes,
-     * up to 64 * 128 (= 8192) bytes.
-     */
-    switch (pitch) {
-    case 128:
-    case 256:
-	if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_G33CLASS(pI830))
-	    return TRUE;
-	else
-	    return FALSE;
-    case 512:
-    case KB(1):
-    case KB(2):
-    case KB(4):
-    case KB(8):
-	return TRUE;
-    default:
-	return FALSE;
-    }
+	/*
+	 * Allow tiling for pitches that are a power of 2 multiple of 128 bytes,
+	 * up to 64 * 128 (= 8192) bytes.
+	 */
+	switch (pitch) {
+	case 128:
+	case 256:
+		if (IS_I945G(intel) || IS_I945GM(intel) || IS_G33CLASS(intel))
+			return TRUE;
+		else
+			return FALSE;
+	case 512:
+	case KB(1):
+	case KB(2):
+	case KB(4):
+	case KB(8):
+		return TRUE;
+	default:
+		return FALSE;
+	}
 }
 
-/* This is the 2D rendering vertical coordinate limit.  We can ignore
- * the 3D rendering limits in our 2d pixmap cache allocation, because XAA
- * doesn't do any 3D rendering to/from the cache lines when using an offset
- * at the start of framebuffer.
- */
-#define MAX_2D_HEIGHT		65536
-
 /**
  * Allocates a framebuffer for a screen.
  *
  * Used once for each X screen, so once with RandR 1.2 and twice with classic
  * dualhead.
  */
-i830_memory *
-i830_allocate_framebuffer(ScrnInfoPtr pScrn)
+i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    unsigned int pitch = pScrn->displayWidth * pI830->cpp;
-    unsigned long minspace, avail;
-    int cacheLines, maxCacheLines;
-    int align;
-    long size, fb_height;
-    int flags;
-    i830_memory *front_buffer = NULL;
-    enum tile_format tile_format = TILE_NONE;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	unsigned int pitch = scrn->displayWidth * intel->cpp;
+	unsigned long minspace;
+	int align;
+	long size, fb_height;
+	int flags;
+	i830_memory *front_buffer = NULL;
+	enum tile_format tile_format = TILE_NONE;
 
-    flags = ALLOW_SHARING;
+	flags = ALLOW_SHARING | DISABLE_REUSE;
 
-    /* We'll allocate the fb such that the root window will fit regardless of
-     * rotation.
-     */
-    fb_height = pScrn->virtualY;
-    if (!pI830->can_resize)
-    {
-	if (!pI830->use_drm_mode && pScrn->virtualX > pScrn->virtualY)
-	    fb_height = pScrn->virtualX;
-	else
-	    fb_height = pScrn->virtualY;
-    }
+	/* We'll allocate the fb such that the root window will fit regardless of
+	 * rotation.
+	 */
+	fb_height = scrn->virtualY;
 
-    pI830->FbMemBox.x1 = 0;
-    pI830->FbMemBox.x2 = pScrn->displayWidth;
-    pI830->FbMemBox.y1 = 0;
-    pI830->FbMemBox.y2 = fb_height;
-
-    /* Calculate how much framebuffer memory to allocate.  For the
-     * initial allocation, calculate a reasonable minimum.  This is
-     * enough for the virtual screen size, plus some pixmap cache
-     * space if we're using XAA.
-     */
-    minspace = pitch * pScrn->virtualY;
-    avail = pScrn->videoRam * 1024;
+	/* Calculate how much framebuffer memory to allocate.  For the
+	 * initial allocation, calculate a reasonable minimum.  This is
+	 * enough for the virtual screen size.
+	 */
+	minspace = pitch * scrn->virtualY;
 
-    if (pI830->accel == ACCEL_XAA) {
-	maxCacheLines = (avail - minspace) / pitch;
-	/* This shouldn't happen. */
-	if (maxCacheLines < 0) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Internal Error: "
-		       "maxCacheLines < 0 in i830_allocate_2d_memory()\n");
-	    maxCacheLines = 0;
-	}
-	if (maxCacheLines > (MAX_2D_HEIGHT - pScrn->virtualY))
-	    maxCacheLines = MAX_2D_HEIGHT - pScrn->virtualY;
+	size = ROUND_TO_PAGE(pitch * fb_height);
 
-	if (pI830->CacheLines >= 0) {
-	    cacheLines = pI830->CacheLines;
-	} else {
-	    int size;
+	if (intel->tiling)
+		tile_format = TILE_XMAJOR;
 
-	    size = 3 * pitch * pScrn->virtualY;
-	    size = ROUND_TO_PAGE(size);
+	if (!IsTileable(scrn, pitch))
+		tile_format = TILE_NONE;
 
-	    cacheLines = (size + pitch - 1) / pitch;
+	if (!i830_check_display_stride(scrn, pitch, tile_format != TILE_NONE)) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Front buffer stride %d kB "
+			   "exceed display limit\n", pitch / 1024);
+		return NULL;
 	}
-	if (cacheLines > maxCacheLines)
-	    cacheLines = maxCacheLines;
 
-	pI830->FbMemBox.y2 += cacheLines;
+	/* Attempt to allocate it tiled first if we have page flipping on. */
+	if (tile_format != TILE_NONE) {
+		/* XXX: probably not the case on 965 */
+		if (IS_I9XX(intel))
+			align = MB(1);
+		else
+			align = KB(512);
+	} else
+		align = KB(64);
+	front_buffer = i830_allocate_memory(scrn, "front buffer", size,
+					    pitch, align, flags, tile_format);
+
+	if (front_buffer == NULL) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Failed to allocate framebuffer.\n");
+		return NULL;
+	}
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "Allocating %d scanlines for pixmap cache\n",
-		   cacheLines);
-    } else {
-	/* For non-XAA, we have a separate allocation for the linear allocator
-	 * which also does the pixmap cache.
-	 */
-	cacheLines = 0;
-    }
+	if (intel->FbBase && front_buffer->bound)
+		memset (intel->FbBase + front_buffer->offset, 0, size);
+	i830_set_gem_max_sizes(scrn);
 
-    size = pitch * (fb_height + cacheLines);
-    size = ROUND_TO_PAGE(size);
+	return front_buffer;
+}
 
-    /* Front buffer tiling has to be disabled with G965 XAA because some of the
-     * acceleration operations (non-XY COLOR_BLT) can't be done to tiled
-     * buffers.
-     */
-    if (pI830->tiling)
-	tile_format = TILE_XMAJOR;
-    if (pI830->accel == ACCEL_XAA && IS_I965G(pI830))
-	tile_format = TILE_NONE;
-
-    if (!IsTileable(pScrn, pitch))
-	tile_format = TILE_NONE;
-
-    if (!i830_check_display_stride(pScrn, pitch, tile_format != TILE_NONE)) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Front buffer stride %d kB "
-		"exceed display limit\n", pitch/1024);
-	return NULL;
-    }
+static Bool i830_allocate_cursor_buffers(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+	int flags, i;
+	long size;
 
-    /* Attempt to allocate it tiled first if we have page flipping on. */
-    if (tile_format != TILE_NONE) {
-	/* XXX: probably not the case on 965 */
-	if (IS_I9XX(pI830))
-	    align = MB(1);
-	else
-	    align = KB(512);
-    } else
-	align = KB(64);
-    front_buffer = i830_allocate_memory(pScrn, "front buffer", size,
-					pitch, align, flags,
-					tile_format);
-
-    if (front_buffer == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "Failed to allocate framebuffer.\n");
-	return NULL;
-    }
+	if (intel->use_drm_mode)
+		intel->CursorNeedsPhysical = FALSE;
 
-    if (!pI830->use_drm_mode && pI830->FbBase)
-	memset (pI830->FbBase + front_buffer->offset, 0, size);
+	flags = intel->CursorNeedsPhysical ? NEED_PHYSICAL_ADDR : 0;
 
-    return front_buffer;
-}
+	flags |= DISABLE_REUSE;
 
-static Bool
-i830_allocate_cursor_buffers(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    int flags;
-    int i;
-    long size;
-
-    if (pI830->use_drm_mode)
-	pI830->CursorNeedsPhysical = FALSE;
-
-    flags = pI830->CursorNeedsPhysical ? NEED_PHYSICAL_ADDR : 0;
-
-    /* Try to allocate one big blob for our cursor memory.  This works
-     * around a limitation in the FreeBSD AGP driver that allows only one
-     * physical allocation larger than a page, and could allow us
-     * to pack the cursors smaller.
-     */
-    size = xf86_config->num_crtc * (HWCURSOR_SIZE + HWCURSOR_SIZE_ARGB);
 
-    pI830->cursor_mem = i830_allocate_memory(pScrn, "HW cursors",
-					     size, PITCH_NONE, GTT_PAGE_SIZE,
-					     flags, TILE_NONE);
-    if (pI830->cursor_mem != NULL)
-	return TRUE;
+	if (!intel->use_drm_mode) {
+		/* Try to allocate one big blob for our cursor memory.
+		 * This works around a limitation in the FreeBSD AGP driver
+		 * that allows only one physical allocation larger than a page,
+		 * and could allow us to pack the cursors smaller.
+		 */
+		size = xf86_config->num_crtc * (HWCURSOR_SIZE +
+		    HWCURSOR_SIZE_ARGB);
 
-    /*
-     * Allocate four separate buffers when the kernel doesn't support
-     * large allocations as on Linux. If any of these fail, just
-     * bail back to software cursors everywhere
-     */
-    for (i = 0; i < xf86_config->num_crtc; i++)
-    {
-	pI830->cursor_mem_classic[i] = i830_allocate_memory (pScrn, 
-							     "Core cursor",
-							     HWCURSOR_SIZE,
-							     PITCH_NONE,
-							     GTT_PAGE_SIZE,
-							     flags,
-							     TILE_NONE);
-	if (!pI830->cursor_mem_classic[i])
-	    return FALSE;
-	pI830->cursor_mem_argb[i] = i830_allocate_memory (pScrn, "ARGB cursor",
-							  HWCURSOR_SIZE_ARGB,
-							  PITCH_NONE,
-							  GTT_PAGE_SIZE,
-							  flags,
-							  TILE_NONE);
-	if (!pI830->cursor_mem_argb[i])
-	    return FALSE;
+		intel->cursor_mem = i830_allocate_memory(scrn, "HW cursors",
+		    size, PITCH_NONE, GTT_PAGE_SIZE, flags, TILE_NONE);
+		if (intel->cursor_mem != NULL)
+			return TRUE;
+	}
 
-    }
-    return TRUE;
+	/*
+	 * Allocate four separate buffers when the kernel doesn't support
+	 * large allocations as on Linux. If any of these fail, just
+	 * bail back to software cursors everywhere
+	 */
+	for (i = 0; i < xf86_config->num_crtc; i++) {
+		if (!intel->use_drm_mode) {
+			intel->cursor_mem_classic[i] =
+			    i830_allocate_memory(scrn, "Core cursor",
+			        HWCURSOR_SIZE, PITCH_NONE, GTT_PAGE_SIZE,
+			        flags, TILE_NONE);
+		if (!intel->cursor_mem_classic[i])
+			return FALSE;
+		}
+		intel->cursor_mem_argb[i] =
+		    i830_allocate_memory(scrn, "ARGB cursor",
+					 HWCURSOR_SIZE_ARGB, PITCH_NONE,
+					 GTT_PAGE_SIZE, flags, TILE_NONE);
+		if (!intel->cursor_mem_argb[i])
+			return FALSE;
+
+	}
+	return TRUE;
 }
 
-static void i830_setup_fb_compression(ScrnInfoPtr pScrn)
+static void i830_setup_fb_compression(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     unsigned long compressed_size;
     unsigned long fb_height;
 
-    if (pScrn->virtualX > pScrn->virtualY)
-	fb_height = pScrn->virtualX;
+    if (scrn->virtualX > scrn->virtualY)
+	fb_height = scrn->virtualX;
     else
-	fb_height = pScrn->virtualY;
+	fb_height = scrn->virtualY;
 
     /* Only mobile chips since 845 support this feature */
-    if (!IS_MOBILE(pI830)) {
-	pI830->fb_compression = FALSE;
+    if (!IS_MOBILE(intel)) {
+	intel->fb_compression = FALSE;
 	goto out;
     }
 
-    if (IS_GM45(pI830)) {
+    if (IS_GM45(intel)) {
 	/* Update i830_display.c too if compression ratio changes */
-	compressed_size = fb_height * (pScrn->displayWidth / 4);
+	compressed_size = fb_height * (scrn->displayWidth / 4);
     } else {
 	compressed_size = MB(6);
     }
@@ -1370,34 +1160,34 @@ static void i830_setup_fb_compression(Sc
      *   - SR display watermarks must be equal between 16bpp and 32bpp?
      *   - both compressed and line buffers must be in stolen memory
      */
-    pI830->compressed_front_buffer =
-	i830_allocate_memory(pScrn, "compressed frame buffer",
+    intel->compressed_front_buffer =
+	i830_allocate_memory(scrn, "compressed frame buffer",
 			     compressed_size, PITCH_NONE,
 			     KB(4), NEED_PHYSICAL_ADDR,
 			     TILE_NONE);
 
-    if (!pI830->compressed_front_buffer) {
-	pI830->fb_compression = FALSE;
+    if (!intel->compressed_front_buffer) {
+	intel->fb_compression = FALSE;
 	goto out;
     }
 
-    if (!IS_GM45(pI830)) {
-	pI830->compressed_ll_buffer =
-	    i830_allocate_memory(pScrn, "compressed ll buffer",
+    if (!IS_GM45(intel)) {
+	intel->compressed_ll_buffer =
+	    i830_allocate_memory(scrn, "compressed ll buffer",
 				 FBC_LL_SIZE + FBC_LL_PAD,
 				 PITCH_NONE, KB(4),
 				 NEED_PHYSICAL_ADDR,
 				 TILE_NONE);
-	if (!pI830->compressed_ll_buffer) {
-	    i830_free_memory(pScrn, pI830->compressed_front_buffer);
-	    pI830->fb_compression = FALSE;
+	if (!intel->compressed_ll_buffer) {
+	    i830_free_memory(scrn, intel->compressed_front_buffer);
+	    intel->fb_compression = FALSE;
 	    goto out;
 	}
     }
 
 out:
-    if (!pI830->fb_compression)
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Allocation error, framebuffer"
+    if (!intel->fb_compression)
+	xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Allocation error, framebuffer"
 		   " compression disabled\n");
 	
     return;
@@ -1406,323 +1196,63 @@ out:
  * Allocate memory for 2D operation.  This includes the (front) framebuffer,
  * ring buffer, scratch memory, HW cursor.
  */
-Bool
-i830_allocate_2d_memory(ScrnInfoPtr pScrn)
+Bool i830_allocate_2d_memory(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    unsigned int pitch = pScrn->displayWidth * pI830->cpp;
-    long size;
-
-    if (!pI830->use_drm_mode) {
-	if (!xf86AgpGARTSupported() || !xf86AcquireGART(pScrn->scrnIndex)) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "AGP GART support is either not available or cannot "
-		       "be used.\n"
-		       "\tMake sure your kernel has agpgart support or has\n"
-		       "\tthe agpgart module loaded.\n");
-	    return FALSE;
-	}
-
-	/* Allocate the ring buffer first, so it ends up in stolen mem. */
-	i830_allocate_ringbuffer(pScrn);
-    }
-
-    if (pI830->fb_compression)
-	i830_setup_fb_compression(pScrn);
-
-    /* Next, allocate other fixed-size allocations we have. */
-    if (!i830_allocate_cursor_buffers(pScrn)) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "Failed to allocate HW cursor space.\n");
-	return FALSE;
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (pI830->memory_manager == NULL) {
-	pI830->fake_bufmgr_mem = i830_allocate_memory(pScrn, "fake bufmgr",
-						      MB(8), PITCH_NONE, GTT_PAGE_SIZE, 0,
-						      TILE_NONE);
-	if (pI830->fake_bufmgr_mem == NULL) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		       "Failed to allocate fake bufmgr space.\n");
-	    return FALSE;
+	if (!intel->use_drm_mode) {
+		if (!xf86AgpGARTSupported() ||
+		    !xf86AcquireGART(scrn->scrnIndex)) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			    "AGP GART support is either not available or "
+			    "cannot be used.\n"
+			    "\tMake sure your kernel has agpgart support or has\n"
+			    "\tthe agpgart module loaded.\n");
+			return FALSE;
+		}
 	}
-    }
-
-#ifdef I830_XV
-    /* Allocate overlay register space and optional XAA linear allocator
-     * space.  The second head in zaphod mode will share the space.
-     */
-    if (!pI830->use_drm_mode)
-	i830_allocate_overlay(pScrn);
-#endif
 
-    pI830->front_buffer = i830_allocate_framebuffer(pScrn);
-    if (pI830->front_buffer == NULL)
-	return FALSE;
-
-#ifdef I830_USE_EXA
-    if (pI830->accel == ACCEL_EXA && !pI830->use_drm_mode) {
-	if (pI830->exa_offscreen == NULL) {
-	    /* Default EXA to having 3 screens worth of offscreen memory space
-	     * (for pixmaps).
-	     *
-	     * XXX: It would be nice to auto-size it larger if the user
-	     * specified a larger size, or to fit along with texture and FB
-	     * memory if a low videoRam is specified.
-	     */
-	    size = 3 * pitch * pScrn->virtualY;
-	    size = ROUND_TO_PAGE(size);
-
-	    /* EXA has no way to tell it that the offscreen memory manager has
-	     * moved its base and all the contents with it, so we have to have
-	     * it locked in place for the whole driver instance.
-	     */
-	    pI830->exa_offscreen =
-		i830_allocate_memory(pScrn, "exa offscreen",
-				     size, PITCH_NONE, 1, NEED_LIFETIME_FIXED,
-				     TILE_NONE);
-	    if (pI830->exa_offscreen == NULL) {
-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			   "Failed to allocate EXA offscreen memory.\n");
-		return FALSE;
-	    }
-	}
-    }
-#endif /* I830_USE_EXA */
+	if (intel->fb_compression)
+		i830_setup_fb_compression(scrn);
 
-    if (pI830->accel == ACCEL_XAA) {
-	/* The lifetime fixed offset of xaa scratch is probably not required,
-	 * but we do some setup using it at XAAInit() time.  And XAA may not
-	 * end up being supported with GEM anyway.
-	 */
-	pI830->xaa_scratch =
-	    i830_allocate_memory(pScrn, "xaa scratch", MAX_SCRATCH_BUFFER_SIZE,
-				 PITCH_NONE, GTT_PAGE_SIZE, NEED_LIFETIME_FIXED,
-				 TILE_NONE);
-	if (pI830->xaa_scratch == NULL) {
-	    pI830->xaa_scratch =
-		i830_allocate_memory(pScrn, "xaa scratch",
-				     MIN_SCRATCH_BUFFER_SIZE, PITCH_NONE,
-				     GTT_PAGE_SIZE, NEED_LIFETIME_FIXED,
-				     TILE_NONE);
-	    if (pI830->xaa_scratch == NULL) {
-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			   "Failed to allocate scratch buffer space\n");
+	/* Next, allocate other fixed-size allocations we have. */
+	if (!i830_allocate_cursor_buffers(scrn)) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Failed to allocate HW cursor space.\n");
 		return FALSE;
-	    }
-	}
-    }
-
-    return TRUE;
-}
-
-#ifdef XF86DRI
-static unsigned int
-myLog2(unsigned int n)
-{
-    unsigned int log2 = 1;
-
-    while (n > 1) {
-	n >>= 1;
-	log2++;
-    }
-    return log2;
-}
-
-static Bool
-i830_allocate_backbuffer(ScrnInfoPtr pScrn, i830_memory **buffer,
-			 const char *name)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    unsigned int pitch = pScrn->displayWidth * pI830->cpp;
-    unsigned long size;
-    int height;
-    enum tile_format tile_format = TILE_NONE;;
-
-    if (pI830->rotation & (RR_Rotate_0 | RR_Rotate_180))
-	height = pScrn->virtualY;
-    else
-	height = pScrn->virtualX;
-
-    /* Try to allocate on the best tile-friendly boundaries. */
-    if (pI830->tiling && IsTileable(pScrn, pitch))
-    {
-	size = ROUND_TO_PAGE(pitch * ALIGN(height, 16));
-	tile_format = TILE_XMAJOR;
-    }
-    else
-    {
-	size = ROUND_TO_PAGE(pitch * height);
-	tile_format = TILE_NONE;
-    }
-    *buffer = i830_allocate_memory(pScrn, name, size, pitch,
-				   GTT_PAGE_SIZE,
-				   ALIGN_BOTH_ENDS |
-				   ALLOW_SHARING,
-				   tile_format);
-
-    if (*buffer == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "Failed to allocate %s space.\n", name);
-	return FALSE;
-    }
-
-    return TRUE;
-}
-
-static Bool
-i830_allocate_depthbuffer(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    unsigned long size;
-    unsigned int pitch = pScrn->displayWidth * pI830->cpp;
-    int height;
-    int flags;
-    enum tile_format tile_format = TILE_NONE;
-
-    height = pScrn->virtualY;
-
-    /* First try allocating it tiled */
-    flags = ALLOW_SHARING;
-    if (pI830->tiling && IsTileable(pScrn, pitch))
-    {
-	/* The 965 requires that the depth buffer be in Y Major format, while
-	 * the rest appear to fail when handed that format.
-	 */
-	tile_format = IS_I965G(pI830) ? TILE_YMAJOR: TILE_XMAJOR;
-	height = ALIGN(height, 16);
-	flags |= ALIGN_BOTH_ENDS;
-    }
-    size = ROUND_TO_PAGE(pitch * height);
-
-    pI830->depth_buffer =
-	    i830_allocate_memory(pScrn, "depth buffer", size, pitch,
-				 GTT_PAGE_SIZE, flags, tile_format);
-
-    if (pI830->depth_buffer == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "Failed to allocate depth buffer space.\n");
-	return FALSE;
-    }
-
-    return TRUE;
-}
-
-Bool
-i830_allocate_texture_memory(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    unsigned long size;
-    int i;
-
-    if (pI830->allocate_classic_textures) {
-	/* XXX: auto-sizing */
-	size = MB(32);
-	i = myLog2(size / I830_NR_TEX_REGIONS);
-	if (i < I830_LOG_MIN_TEX_REGION_SIZE)
-	    i = I830_LOG_MIN_TEX_REGION_SIZE;
-	pI830->TexGranularity = i;
-	/* Truncate size */
-	size >>= i;
-	size <<= i;
-	if (size < KB(512)) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Less than 512 kBytes for texture space (real %ld"
-		       "kBytes).\n",
-		       size / 1024);
-	    return FALSE;
-	}
-	/* Now that the DRM uses the sarea to get the offsets of the buffers,
-	 * and we update the classic DRM mappings and the sarea contents on
-	 * changes, the NEED_LIFETIME_FIXED is no longer true and should be
-	 * made conditional on DRM version.
-	 */
-	pI830->textures = i830_allocate_memory(pScrn, "classic textures", size,
-					       PITCH_NONE,
-					       GTT_PAGE_SIZE,
-					       ALLOW_SHARING |
-					       NEED_LIFETIME_FIXED,
-					       TILE_NONE);
-	if (pI830->textures == NULL) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		       "Failed to allocate texture space.\n");
-	    return FALSE;
 	}
-    }
 
-    return TRUE;
-}
+	if (!intel->use_drm_mode)
+		i830_allocate_overlay(scrn);
 
-static Bool
-i830_allocate_hwstatus(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-    int flags;
+	intel->front_buffer = i830_allocate_framebuffer(scrn);
+	if (intel->front_buffer == NULL)
+		return FALSE;
 
-    /* The current DRM will leak the HWS mapping if we update the address
-     * after init (at best), so allocate it fixed for its lifetime
-     * (i.e. not through buffer objects).
-     */
-    flags = NEED_LIFETIME_FIXED;
-    if (HWS_NEED_NONSTOLEN(pI830))
-	    flags |= NEED_NON_STOLEN;
-    pI830->hw_status = i830_allocate_memory(pScrn, "HW status",
-	    HWSTATUS_PAGE_SIZE, PITCH_NONE, GTT_PAGE_SIZE, flags,
-					    TILE_NONE);
-    if (pI830->hw_status == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Failed to allocate hw status page.\n");
-	return FALSE;
-    }
-    return TRUE;
+	return TRUE;
 }
 
 Bool
-i830_allocate_pwrctx(ScrnInfoPtr pScrn)
+i830_allocate_pwrctx(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (pI830->use_drm_mode)
+    if (intel->use_drm_mode)
 	return TRUE;
 
-    pI830->power_context = i830_allocate_memory(pScrn, "power context",
+    intel->power_context = i830_allocate_memory(scrn, "power context",
 						PWRCTX_SIZE, PITCH_NONE,
 						GTT_PAGE_SIZE,
 						NEED_LIFETIME_FIXED,
 						TILE_NONE);
-    if (!pI830->power_context) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+    if (!intel->power_context) {
+	xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		"Failed to allocate power context.\n");
 	return FALSE;
     }
     return TRUE;
 }
 
-Bool
-i830_allocate_3d_memory(ScrnInfoPtr pScrn)
-{
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    DPRINTF(PFX, "i830_allocate_3d_memory\n");
-
-    if (!pI830->memory_manager && HWS_NEED_GFX(pI830)) {
-	if (!i830_allocate_hwstatus(pScrn))
-	    return FALSE;
-    }
-
-    if (!i830_allocate_backbuffer(pScrn, &pI830->back_buffer, "back buffer"))
-	return FALSE;
-
-    if (!i830_allocate_depthbuffer(pScrn))
-	return FALSE;
-
-    if (!i830_allocate_texture_memory(pScrn))
-	return FALSE;
-
-    return TRUE;
-}
-#endif
-
 /**
  * Sets up tiled surface registers ("fences") for the hardware.
  *
@@ -1731,11 +1261,11 @@ i830_allocate_3d_memory(ScrnInfoPtr pScr
  * manually supplying tiling enables per surface.
  */
 static int
-i830_set_tiling(ScrnInfoPtr pScrn, unsigned int offset,
+i830_set_tiling(ScrnInfoPtr scrn, unsigned int offset,
 		unsigned int pitch, unsigned int size,
 		enum tile_format tile_format)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t val;
     uint32_t fence_mask = 0;
     unsigned int fence_pitch;
@@ -1747,26 +1277,23 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsig
 
     assert(tile_format != TILE_NONE);
 
-    if (pI830->need_sync) {
-	I830Sync(pScrn);
-	pI830->need_sync = FALSE;
-    }
+    intel_sync(scrn);
 
-    if (IS_I965G(pI830))
+    if (IS_I965G(intel))
 	max_fence = FENCE_NEW_NR;
     else
 	max_fence = FENCE_NR;
 
     for (fence_nr = 0; fence_nr < max_fence; fence_nr++) {
-	if (!pI830->fence_used[fence_nr])
+	if (!intel->fence_used[fence_nr])
 	    break;
     }
     if (fence_nr == max_fence)
 	FatalError("Ran out of fence registers at %d\n", fence_nr);
 
-    pI830->fence_used[fence_nr] = TRUE;
+    intel->fence_used[fence_nr] = TRUE;
 
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel)) {
 	uint32_t fence_start, fence_end;
 
 	switch (tile_format) {
@@ -1791,7 +1318,7 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsig
 	OUTREG(FENCE_NEW + fence_nr * 8, fence_start);
 	OUTREG(FENCE_NEW + fence_nr * 8 + 4, fence_end);
     } else {
-	if (IS_I9XX(pI830))
+	if (IS_I9XX(intel))
 	    fence_mask = ~I915G_FENCE_START_MASK;
 	else
 	    fence_mask = ~I830_FENCE_START_MASK;
@@ -1799,7 +1326,7 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsig
 	if (offset & fence_mask) {
 	    FatalError("i830_set_tiling(): %d: offset (0x%08x) is not %s "
 		       "aligned\n",
-		       fence_nr, offset, (IS_I9XX(pI830)) ? "1MB" : "512k");
+		       fence_nr, offset, (IS_I9XX(intel)) ? "1MB" : "512k");
 	}
 
 	if (offset % size) {
@@ -1827,7 +1354,7 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsig
 	    break;
 	}
 
-	if (IS_I9XX(pI830)) {
+	if (IS_I9XX(intel)) {
 	    switch (size) {
 	    case MB(1):
 		val |= I915G_FENCE_SIZE_1M;
@@ -1886,10 +1413,10 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsig
 	    }
 	}
 
-	if ((IS_I945G(pI830) || IS_I945GM(pI830) || IS_G33CLASS(pI830)) &&
+	if ((IS_I945G(intel) || IS_I945GM(intel) || IS_G33CLASS(intel)) &&
 	    tile_format == TILE_YMAJOR)
 	    fence_pitch = pitch / 128;
-	else if (IS_I9XX(pI830))
+	else if (IS_I9XX(intel))
 	    fence_pitch = pitch / 512;
 	else
 	    fence_pitch = pitch / 128;
@@ -1928,92 +1455,103 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsig
 }
 
 static void
-i830_clear_tiling(ScrnInfoPtr pScrn, unsigned int fence_nr)
+i830_clear_tiling(ScrnInfoPtr scrn, unsigned int fence_nr)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel)) {
 	OUTREG(FENCE_NEW + fence_nr * 8, 0);
 	OUTREG(FENCE_NEW + fence_nr * 8 + 4, 0);
     } else {
 	OUTREG(FENCE + fence_nr * 4, 0);
     }
-    pI830->fence_used[fence_nr] = FALSE;
+    intel->fence_used[fence_nr] = FALSE;
 }
 
 /**
  * Called at EnterVT to grab the AGP GART and bind our allocations.
  *
  * In zaphod mode, this will walk the list trying to bind twice, since each
- * pI830 points to the same allocation list, but the bind_memory will just
+ * intel points to the same allocation list, but the bind_memory will just
  * no-op then.
  */
-Bool
-i830_bind_all_memory(ScrnInfoPtr pScrn)
+Bool i830_bind_all_memory(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (pI830->memory_list == NULL)
-	return TRUE;
+	if (intel->memory_list == NULL)
+		return TRUE;
 
-    if (pI830->use_drm_mode || (xf86AgpGARTSupported() &&
-				!pI830->gtt_acquired)) {
-	i830_memory *mem;
+	if (intel->use_drm_mode || (xf86AgpGARTSupported() &&
+	    !intel->gtt_acquired)) {
+		i830_memory *mem;
 
-	if (!pI830->use_drm_mode) {
-	    if (!xf86AcquireGART(pScrn->scrnIndex))
-		return FALSE;
-	    pI830->gtt_acquired = TRUE;
-	}
+		if (!intel->use_drm_mode) {
+			if (!xf86AcquireGART(scrn->scrnIndex))
+				return FALSE;
+			intel->gtt_acquired = TRUE;
+		}
 
-	for (mem = pI830->memory_list->next; mem->next != NULL;
-	     mem = mem->next)
-	{
-	    if (!mem->bound && !i830_bind_memory(pScrn, mem)) {
-		/* This shouldn't happen */
-		FatalError("Couldn't bind memory for %s\n", mem->name);
-	    }
-	}
-	for (mem = pI830->bo_list; mem != NULL; mem = mem->next) {
-	    if (mem->bound)
-		continue;
-	    if (!mem->lifetime_fixed_offset && !i830_bind_memory(pScrn, mem))
-		FatalError("Couldn't bind memory for BO %s\n", mem->name);
+		for (mem = intel->memory_list->next; mem->next != NULL;
+		    mem = mem->next) {
+			if (!mem->bound && !i830_bind_memory(scrn, mem)) {
+				/* This shouldn't happen */
+				FatalError("Couldn't bind memory for %s\n",
+				    mem->name);
+			}
+		}
+		for (mem = intel->bo_list; mem != NULL; mem = mem->next) {
+			if (mem->bound)
+				continue;
+			if (!mem->lifetime_fixed_offset &&
+			    !i830_bind_memory(scrn, mem))
+			FatalError("Couldn't bind memory for BO %s\n",
+			    mem->name);
+		}
 	}
-    }
-    if (!pI830->use_drm_mode)
-	i830_update_cursor_offsets(pScrn);
+	if (intel->use_drm_mode) {
+		int	i;
+		xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+		for (i = 0; i < xf86_config->num_crtc; i++)
+			drmmode_crtc_set_cursor_bo(xf86_config->crtc[i],
+			    intel->cursor_mem_argb[i]->bo);
+	} else
+		i830_update_cursor_offsets(scrn);
+	i830_set_gem_max_sizes(scrn);
 
-    return TRUE;
+	if (intel->front_buffer)
+		scrn->fbOffset = intel->front_buffer->offset;
+
+	return TRUE;
 }
 
 /** Called at LeaveVT, to unbind all of our AGP allocations. */
 Bool
-i830_unbind_all_memory(ScrnInfoPtr pScrn)
+i830_unbind_all_memory(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    if (pI830->use_drm_mode || (xf86AgpGARTSupported() &&
-				pI830->gtt_acquired)) {
+    if (intel->use_drm_mode || (xf86AgpGARTSupported() &&
+				intel->gtt_acquired)) {
 	i830_memory *mem;
 
-	for (mem = pI830->memory_list->next; mem->next != NULL;
+	for (mem = intel->memory_list->next; mem->next != NULL;
 	     mem = mem->next)
 	{
-	    i830_unbind_memory(pScrn, mem);
+	    i830_unbind_memory(scrn, mem);
 	}
-	for (mem = pI830->bo_list; mem != NULL; mem = mem->next) {
+	for (mem = intel->bo_list; mem != NULL; mem = mem->next) {
 	    /* Don't unpin objects which require that their offsets never
 	     * change.
 	     */
 	    if (!mem->lifetime_fixed_offset)
-		i830_unbind_memory(pScrn, mem);
+		i830_unbind_memory(scrn, mem);
 	}
 
-	if (!pI830->use_drm_mode) {
-	    pI830->gtt_acquired = FALSE;
+	if (!intel->use_drm_mode) {
+	    intel->gtt_acquired = FALSE;
 
-	    if (!xf86ReleaseGART(pScrn->scrnIndex))
+	    if (!xf86ReleaseGART(scrn->scrnIndex))
 		return FALSE;
 	}
     }
@@ -2026,19 +1564,19 @@ i830_unbind_all_memory(ScrnInfoPtr pScrn
  * from AGP, in kB.
  */
 long
-I830CheckAvailableMemory(ScrnInfoPtr pScrn)
+I830CheckAvailableMemory(ScrnInfoPtr scrn)
 {
     AgpInfoPtr agpinf;
     int maxPages;
 
     if (!xf86AgpGARTSupported() ||
-	!xf86AcquireGART(pScrn->scrnIndex) ||
-	(agpinf = xf86GetAGPInfo(pScrn->scrnIndex)) == NULL ||
-	!xf86ReleaseGART(pScrn->scrnIndex))
+	!xf86AcquireGART(scrn->scrnIndex) ||
+	(agpinf = xf86GetAGPInfo(scrn->scrnIndex)) == NULL ||
+	!xf86ReleaseGART(scrn->scrnIndex))
 	return -1;
 
     maxPages = agpinf->totalPages - agpinf->usedPages;
-    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "%s: %d kB available\n",
+    xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, 2, "%s: %d kB available\n",
 		   "I830CheckAvailableMemory", maxPages * 4);
 
     return maxPages * 4;
@@ -2048,22 +1586,96 @@ I830CheckAvailableMemory(ScrnInfoPtr pSc
 /*
  * Allocate memory for MC compensation
  */
-Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
-                               i830_memory **buffer, unsigned long size,
-                               int flags)
-{
-    *buffer = i830_allocate_memory(pScrn, name, size, PITCH_NONE,
-                                   GTT_PAGE_SIZE, flags, TILE_NONE);
-
-    if (!*buffer) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                   "Failed to allocate memory for %s.\n", name);
-        return FALSE;
-    }
+Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name,
+			       i830_memory ** buffer, unsigned long size,
+			       int flags)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	*buffer = i830_allocate_memory(scrn, name, size, PITCH_NONE,
+				       GTT_PAGE_SIZE, flags, TILE_NONE);
+
+	if (!*buffer) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "Failed to allocate memory for %s.\n", name);
+		return FALSE;
+	}
 
-    if (!i830_bind_memory(pScrn, *buffer))
-	return FALSE;
+	if (intel->use_drm_mode && (*buffer)->bo) {
+		if (drm_intel_bo_pin((*buffer)->bo, GTT_PAGE_SIZE)) {
+			i830_free_memory(scrn, *buffer);
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+				   "Failed to bind XvMC buffer bo!\n");
+			return FALSE;
+		}
 
-    return TRUE;
+		(*buffer)->offset = (*buffer)->bo->offset;
+	}
+
+	return TRUE;
+}
+
+void i830_free_xvmc_buffer(ScrnInfoPtr scrn, i830_memory * buffer)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (intel->use_drm_mode && buffer->bo)
+		drm_intel_bo_unpin(buffer->bo);
+
+	i830_free_memory(scrn, buffer);
 }
+
 #endif
+
+static void i830_set_max_bo_size(intel_screen_private *intel,
+				 const struct drm_i915_gem_get_aperture *aperture)
+{
+	if (aperture->aper_available_size)
+		/* Large BOs will tend to hit SW fallbacks frequently, and also will
+		 * tend to fail to successfully map when doing SW fallbacks because we
+		 * overcommit address space for BO access, or worse cause aperture
+		 * thrashing.
+		 */
+		intel->max_bo_size = aperture->aper_available_size / 2;
+	else
+		intel->max_bo_size = 64 * 1024 * 1024;
+}
+
+static void i830_set_max_gtt_map_size(intel_screen_private *intel,
+				      const struct drm_i915_gem_get_aperture *aperture)
+{
+	if (aperture->aper_available_size)
+		/* Let objects up get bound up to the size where only 2 would fit in
+		 * the aperture, but then leave slop to account for alignment like
+		 * libdrm does.
+		 */
+		intel->max_gtt_map_size =
+			aperture->aper_available_size * 3 / 4 / 2;
+	else
+		intel->max_gtt_map_size = 16 * 1024 * 1024;
+}
+
+static void i830_set_max_tiling_size(intel_screen_private *intel,
+				     const struct drm_i915_gem_get_aperture *aperture)
+{
+	if (aperture->aper_available_size)
+		/* Let objects be tiled up to the size where only 4 would fit in
+		 * the aperture, presuming worst case alignment.
+		 */
+		intel->max_tiling_size = aperture->aper_available_size / 4;
+	else
+		intel->max_tiling_size = 4 * 1024 * 1024;
+}
+
+void i830_set_gem_max_sizes(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct drm_i915_gem_get_aperture aperture;
+
+	aperture.aper_available_size = 0;
+	ioctl(intel->drmSubFD, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
+
+	i830_set_max_bo_size(intel, &aperture);
+	i830_set_max_gtt_map_size(intel, &aperture);
+	i830_set_max_tiling_size(intel, &aperture);
+}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c	2011-02-08 11:14:00.000000000 +0100
@@ -39,7 +39,7 @@ typedef struct {
     int chipType;
     int subsysVendor;
     int subsysCard;
-    void (*hook)(I830Ptr);
+    void (*hook)(intel_screen_private *);
 } i830_quirk, *i830_quirk_ptr;
 
 enum i830_dmi_data_t {
@@ -70,12 +70,13 @@ static char *i830_dmi_data[dmi_data_max]
 static void i830_dmi_store_##field(void) \
 {\
     FILE *f = NULL;\
+    int ret;\
     f = fopen(DMIID_FILE(field), "r");\
     if (f == NULL) {\
-	xfree(i830_dmi_data[field]); i830_dmi_data[field] = NULL;\
+	free(i830_dmi_data[field]); i830_dmi_data[field] = NULL;\
 	return;\
     }\
-    fread(i830_dmi_data[field], 64, 1, f);\
+    ret = fread(i830_dmi_data[field], 64, 1, f);	\
     fclose(f);\
 }
 
@@ -103,11 +104,11 @@ static void i830_dmi_scan(void)
     int i;
 
     for (i = 0; i < dmi_data_max; i++) {
-	i830_dmi_data[i] = xcalloc(64, sizeof(char));
+	i830_dmi_data[i] = calloc(64, sizeof(char));
 	if (!i830_dmi_data[i]) {
 	    int j;
 	    for (j = 0; j < i; j++) {
-		xfree(i830_dmi_data[j]);
+		free(i830_dmi_data[j]);
 		i830_dmi_data[i] = NULL;
 	    }
 	    return;
@@ -165,46 +166,46 @@ static void i830_dmi_dump(void)
  * Old chips have undocumented panel fitting registers.  Some of them actually
  * work; this quirk indicates that.
  */
-static void quirk_pfit_safe (I830Ptr pI830)
+static void quirk_pfit_safe (intel_screen_private *intel)
 {
-    pI830->quirk_flag |= QUIRK_PFIT_SAFE;
+    intel->quirk_flag |= QUIRK_PFIT_SAFE;
 }
 
 /*
  * Some machines hose the display regs regardless of the ACPI DOS
  * setting, so we need to reset modes at ACPI event time.
  */
-static void quirk_reset_modes (I830Ptr pI830)
+static void quirk_reset_modes (intel_screen_private *intel)
 {
-    pI830->quirk_flag |= QUIRK_RESET_MODES;
+    intel->quirk_flag |= QUIRK_RESET_MODES;
 }
 
-static void quirk_pipea_force (I830Ptr pI830)
+static void quirk_pipea_force (intel_screen_private *intel)
 {
-    pI830->quirk_flag |= QUIRK_PIPEA_FORCE;
+    intel->quirk_flag |= QUIRK_PIPEA_FORCE;
 }
 
-static void quirk_ignore_tv (I830Ptr pI830)
+static void quirk_ignore_tv (intel_screen_private *intel)
 {
-    pI830->quirk_flag |= QUIRK_IGNORE_TV;
+    intel->quirk_flag |= QUIRK_IGNORE_TV;
 }
 
-static void quirk_ignore_lvds (I830Ptr pI830)
+static void quirk_ignore_lvds (intel_screen_private *intel)
 {
-    pI830->quirk_flag |= QUIRK_IGNORE_LVDS;
+    intel->quirk_flag |= QUIRK_IGNORE_LVDS;
 }
 
-static void quirk_ignore_crt (I830Ptr pI830)
+static void quirk_ignore_crt (intel_screen_private *intel)
 {
-    pI830->quirk_flag |= QUIRK_IGNORE_CRT;
+    intel->quirk_flag |= QUIRK_IGNORE_CRT;
 }
 
-static void quirk_mac_mini (I830Ptr pI830)
+static void quirk_mac_mini (intel_screen_private *intel)
 {
-    pI830->quirk_flag |= QUIRK_IGNORE_MACMINI_LVDS;
+    intel->quirk_flag |= QUIRK_IGNORE_MACMINI_LVDS;
 }
 
-static void quirk_lenovo_tv_dmi (I830Ptr pI830)
+static void quirk_lenovo_tv_dmi (intel_screen_private *intel)
 {
     /* X60, X60s has no TV output.
      * Z61 has S-video TV output.
@@ -219,10 +220,10 @@ static void quirk_lenovo_tv_dmi (I830Ptr
     }
     if (!strncmp(i830_dmi_data[bios_version], "7B", 2) || /* X60, X60s */
 	    !strncmp(i830_dmi_data[bios_version], "7E", 2)) /* R60e */
-	pI830->quirk_flag |= QUIRK_IGNORE_TV;
+	intel->quirk_flag |= QUIRK_IGNORE_TV;
 }
 
-static void quirk_msi_lvds_dmi (I830Ptr pI830)
+static void quirk_msi_lvds_dmi (intel_screen_private *intel)
 {
    /* MSI IM-945GSE-A has no TV output, nor a LVDS connection.
     */
@@ -231,32 +232,32 @@ static void quirk_msi_lvds_dmi (I830Ptr
        return;
    }
    if (!strncmp(i830_dmi_data[board_name],"A9830IMS",8)) {
-       pI830->quirk_flag |= QUIRK_IGNORE_LVDS;
-       pI830->quirk_flag |= QUIRK_IGNORE_TV;
+       intel->quirk_flag |= QUIRK_IGNORE_LVDS;
+       intel->quirk_flag |= QUIRK_IGNORE_TV;
    }
 }
 
-static void quirk_ibase_lvds (I830Ptr pI830)
+static void quirk_ibase_lvds (intel_screen_private *intel)
 {
    if (!i830_dmi_data[board_name]) {
        ErrorF("Failed to load DMI info, iBase LVDS quirk not applied.\n");
        return;
    }
    if (!strncmp(i830_dmi_data[board_name], "i855-W83627HF", 13)) {
-       pI830->quirk_flag |= QUIRK_IGNORE_LVDS;
+       intel->quirk_flag |= QUIRK_IGNORE_LVDS;
    }
 }
 
-static void quirk_ivch_dvob (I830Ptr pI830)
+static void quirk_ivch_dvob (intel_screen_private *intel)
 {
-	pI830->quirk_flag |= QUIRK_IVCH_NEED_DVOB;
+	intel->quirk_flag |= QUIRK_IVCH_NEED_DVOB;
 }
 
 /* For broken hw/bios for incorrect acpi _LID state that
    can't be fixed with customed DSDT or other way */
-static void quirk_broken_acpi_lid (I830Ptr pI830)
+static void quirk_broken_acpi_lid (intel_screen_private *intel)
 {
-	pI830->quirk_flag |= QUIRK_BROKEN_ACPI_LID;
+	intel->quirk_flag |= QUIRK_BROKEN_ACPI_LID;
 }
 
 /* keep this list sorted by OEM, then by chip ID */
@@ -329,6 +330,10 @@ static i830_quirk i830_quirk_list[] = {
     { PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv },
     /* HP Compaq 2730p needs pipe A force quirk (LP: #291555) */
     { PCI_CHIP_GM45_GM, 0x103c, 0x30eb, quirk_pipea_force },
+    /* HP Mini needs pipe A force quirk (LP: #322104) */
+    { PCI_CHIP_I945_GME,0x103c, 0x361a, quirk_pipea_force },
+    /* HP Mini 5101 needs pipe A force quirk */
+    { PCI_CHIP_I945_GME,0x103c, 0x3632, quirk_pipea_force },
 
     /* Thinkpad R31 needs pipe A force quirk */
     { PCI_CHIP_I830_M, 0x1014, 0x0505, quirk_pipea_force },
@@ -355,6 +360,8 @@ static i830_quirk i830_quirk_list[] = {
 
     { PCI_CHIP_I855_GM, 0x161f, 0x2030, quirk_pfit_safe },
 
+    /* ThinkPad X30 needs pipe A force quirk (LP: #304614) */
+    { PCI_CHIP_I830_M,  0x1014, 0x0513, quirk_pipea_force },
     /* ThinkPad X40 needs pipe A force quirk */
     { PCI_CHIP_I855_GM, 0x1014, 0x0557, quirk_pipea_force },
 
@@ -398,7 +405,7 @@ static i830_quirk i830_quirk_list[] = {
 
 void i830_fixup_devices(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     i830_quirk_ptr p = i830_quirk_list;
     int i;
 
@@ -408,16 +415,16 @@ void i830_fixup_devices(ScrnInfoPtr scrn
 	i830_dmi_dump();
 
     while (p && p->chipType != 0) {
-	if (DEVICE_ID(pI830->PciInfo) == p->chipType &&
-	    (SUBVENDOR_ID(pI830->PciInfo) == p->subsysVendor ||
+	if (DEVICE_ID(intel->PciInfo) == p->chipType &&
+	    (SUBVENDOR_ID(intel->PciInfo) == p->subsysVendor ||
 	     p->subsysVendor == SUBSYS_ANY) &&
-	    (SUBSYS_ID(pI830->PciInfo) == p->subsysCard ||
+	    (SUBSYS_ID(intel->PciInfo) == p->subsysCard ||
 	     p->subsysCard == SUBSYS_ANY))
-	    p->hook(pI830);
+	    p->hook(intel);
 	++p;
     }
 
     for (i = 0; i < dmi_data_max; i++)
 	if (i830_dmi_data[i])
-	    xfree(i830_dmi_data[i]);
+	    free(i830_dmi_data[i]);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_reg.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_reg.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_reg.h	2008-08-02 07:12:40.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_reg.h	2011-02-08 11:14:00.000000000 +0100
@@ -25,7 +25,6 @@
  * 
  **************************************************************************/
 
-
 #ifndef _I830_REG_H_
 #define _I830_REG_H_
 
@@ -74,7 +73,6 @@
 /* Dword 2 */
 #define BUF_3D_ADDR(x)		((x) & ~0x3)
 
-
 #define _3DSTATE_COLOR_FACTOR_CMD	(CMD_3D | (0x1d<<24) | (0x1<<16))
 
 #define _3DSTATE_COLOR_FACTOR_N_CMD(stage)	(CMD_3D | (0x1d<<24) | \
@@ -88,7 +86,6 @@
 
 #define _3DSTATE_DFLT_Z_CMD		(CMD_3D | (0x1d<<24) | (0x98<<16))
 
-
 #define _3DSTATE_DST_BUF_VARS_CMD	(CMD_3D | (0x1d<<24) | (0x85<<16))
 /* Dword 1 */
 #define DSTORG_HORT_BIAS(x)		((x)<<20)
@@ -115,7 +112,6 @@
 #define VERT_LINE_STRIDE_OFS_1		1
 #define VERT_LINE_STRIDE_OFS_0		0
 
-
 #define _3DSTATE_DRAW_RECT_CMD		(CMD_3D|(0x1d<<24)|(0x80<<16)|3)
 /* Dword 1 */
 #define DRAW_RECT_DIS_DEPTH_OFS 	(1<<30)
@@ -131,7 +127,6 @@
 #define DRAW_YORG(x)			((x)<<16)
 #define DRAW_XORG(x)			(x)
 
-
 #define _3DSTATE_ENABLES_1_CMD		(CMD_3D|(0x3<<24))
 #define ENABLE_LOGIC_OP_MASK		((1<<23)|(1<<22))
 #define ENABLE_LOGIC_OP 		((1<<23)|(1<<22))
@@ -307,7 +302,6 @@
 #define DISABLE_VIEWPORT_TRANSFORM	(1<<31)
 #define DISABLE_PERSPECTIVE_DIVIDE	(1<<29)
 
-
 /* _3DSTATE_MAP_COORD_SET_BINDINGS, p162 */
 #define _3DSTATE_MAP_COORD_SETBIND_CMD	(CMD_3D|(0x1d<<24)|(0x02<<16))
 #define TEXBIND_MASK3			((1<<15)|(1<<14)|(1<<13)|(1<<12))
@@ -388,7 +382,6 @@
 #define SRC_BLND_FACT(x)		((x)<<6)
 #define DST_BLND_FACT(x)		(x)
 
-
 /* _3DSTATE_MODES_2, p192 */
 #define _3DSTATE_MODES_2_CMD		(CMD_3D|(0x0f<<24))
 #define ENABLE_GLOBAL_DEPTH_BIAS	(1<<22)
@@ -523,7 +516,7 @@
 #define VFT0_XYZW_MASK          (7<<1)
 
 /* _3DSTATE_VERTEX_FORMAT_2, p206 */
-#define _3DSTATE_VFT1_CMD	(CMD_3D|(0x0a<<24))
+#define _3DSTATE_VERTEX_FORMAT_2_CMD	(CMD_3D|(0x0a<<24))
 #define VFT1_TEX7_FMT(x)	((x)<<14)
 #define VFT1_TEX6_FMT(x)	((x)<<12)
 #define VFT1_TEX5_FMT(x)	((x)<<10)
@@ -543,7 +536,6 @@
 
 #define MLC_LOD_BIAS_MASK ((1<<7)-1)
 
-
 /* _3DSTATE_VERTEX_TRANSFORM, p207 */
 #define _3DSTATE_VERTEX_TRANS_CMD	(CMD_3D|(0x1d<<24)|(0x8b<<16)|0)
 #define _3DSTATE_VERTEX_TRANS_MTX_CMD	(CMD_3D|(0x1d<<24)|(0x8b<<16)|6)
@@ -563,7 +555,6 @@
 /* Dword 2 */
 #define WFAR_VALUE(x)			(x)
 
-
 /* Stipple command, carried over from the i810, apparently:
  */
 #define _3DSTATE_STIPPLE           (CMD_3D|(0x1d<<24)|(0x83<<16))
@@ -637,8 +628,8 @@
 #define    MAPSURF_4BIT_INDEXED		   (7<<6)
 #define TM0S1_MT_FORMAT_MASK         (0x7 << 3)
 #define TM0S1_MT_FORMAT_SHIFT        3
-#define    MT_4BIT_IDX_ARGB8888	           (7<<3) /* SURFACE_4BIT_INDEXED */
-#define    MT_8BIT_IDX_RGB565	           (0<<3) /* SURFACE_8BIT_INDEXED */
+#define    MT_4BIT_IDX_ARGB8888	           (7<<3)	/* SURFACE_4BIT_INDEXED */
+#define    MT_8BIT_IDX_RGB565	           (0<<3)	/* SURFACE_8BIT_INDEXED */
 #define    MT_8BIT_IDX_ARGB1555	           (1<<3)
 #define    MT_8BIT_IDX_ARGB4444	           (2<<3)
 #define    MT_8BIT_IDX_AY88		   (3<<3)
@@ -646,10 +637,10 @@
 #define    MT_8BIT_IDX_BUMP_88DVDU 	   (5<<3)
 #define    MT_8BIT_IDX_BUMP_655LDVDU	   (6<<3)
 #define    MT_8BIT_IDX_ARGB8888	           (7<<3)
-#define    MT_8BIT_I8		           (0<<3) /* SURFACE_8BIT */
+#define    MT_8BIT_I8		           (0<<3)	/* SURFACE_8BIT */
 #define    MT_8BIT_L8		           (1<<3)
 #define    MT_8BIT_A8		           (4<<3)
-#define    MT_16BIT_RGB565 		   (0<<3) /* SURFACE_16BIT */
+#define    MT_16BIT_RGB565 		   (0<<3)	/* SURFACE_16BIT */
 #define    MT_16BIT_ARGB1555		   (1<<3)
 #define    MT_16BIT_ARGB4444		   (2<<3)
 #define    MT_16BIT_AY88		   (3<<3)
@@ -657,18 +648,18 @@
 #define    MT_16BIT_BUMP_88DVDU	           (5<<3)
 #define    MT_16BIT_BUMP_655LDVDU	   (6<<3)
 #define    MT_16BIT_DIB_RGB565_8888	   (7<<3)
-#define    MT_32BIT_ARGB8888		   (0<<3) /* SURFACE_32BIT */
+#define    MT_32BIT_ARGB8888		   (0<<3)	/* SURFACE_32BIT */
 #define    MT_32BIT_ABGR8888		   (1<<3)
 #define    MT_32BIT_XRGB8888		   (2<<3)
 #define    MT_32BIT_XBGR8888		   (3<<3)
 #define    MT_32BIT_BUMP_XLDVDU_8888	   (6<<3)
 #define    MT_32BIT_DIB_8888		   (7<<3)
-#define    MT_411_YUV411		   (0<<3) /* SURFACE_411 */
-#define    MT_422_YCRCB_SWAPY	           (0<<3) /* SURFACE_422 */
+#define    MT_411_YUV411		   (0<<3)	/* SURFACE_411 */
+#define    MT_422_YCRCB_SWAPY	           (0<<3)	/* SURFACE_422 */
 #define    MT_422_YCRCB_NORMAL	           (1<<3)
 #define    MT_422_YCRCB_SWAPUV	           (2<<3)
 #define    MT_422_YCRCB_SWAPUVY	           (3<<3)
-#define    MT_COMPRESS_DXT1		   (0<<3) /* SURFACE_COMPRESSED */
+#define    MT_COMPRESS_DXT1		   (0<<3)	/* SURFACE_COMPRESSED */
 #define    MT_COMPRESS_DXT2_3	           (1<<3)
 #define    MT_COMPRESS_DXT4_5	           (2<<3)
 #define    MT_COMPRESS_FXT1		   (3<<3)
@@ -710,7 +701,6 @@
 #define TM0S3_KEYED_FILTER		(1<<1)
 #define TM0S3_CHROMA_KEY		(1<<0)
 
-
 /* _3DSTATE_MAP_TEXEL_STREAM, p188 */
 #define _3DSTATE_MAP_TEX_STREAM_CMD	(CMD_3D|(0x1c<<24)|(0x05<<19))
 #define DISABLE_TEX_STREAM_BUMP 	(1<<12)
@@ -722,13 +712,12 @@
 #define ENABLE_TEX_STREAM_MAP_IDX	(1<<3)
 #define TEX_STREAM_MAP_IDX(x)		(x)
 
-
 #define FLUSH_MAP_CACHE    (1<<0)
 
 #define _3DSTATE_MAP_FILTER_CMD    (CMD_3D|(0x1c<<24)|(0x02<<19))
 #define FILTER_TEXMAP_INDEX(x) ((x) << 16)
-#define MAG_MODE_FILTER_ENABLE (1 << 5) 
-#define MIN_MODE_FILTER_ENABLE (1 << 2) 
+#define MAG_MODE_FILTER_ENABLE (1 << 5)
+#define MIN_MODE_FILTER_ENABLE (1 << 2)
 #define MAG_MAPFILTER_NEAREST (0 << 3)
 #define MAG_MAPFILTER_LINEAR  (1 << 3)
 #define MAG_MAPFILTER_ANISOTROPIC (2 << 3)
@@ -736,7 +725,7 @@
 #define MIN_MAPFILTER_LINEAR  (1)
 #define MIN_MAPFILTER_ANISOTROPIC (2)
 #define ENABLE_KEYS	(1<<15)
-#define DISABLE_COLOR_KEY	0 
+#define DISABLE_COLOR_KEY	0
 #define DISABLE_CHROMA_KEY	0
 #define DISABLE_KILL_PIXEL	0
 #define ENABLE_MIP_MODE_FILTER	(1 << 9)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c	2011-02-08 11:14:00.000000000 +0100
@@ -35,15 +35,15 @@
 #include "i830_reg.h"
 
 struct blendinfo {
-    Bool dst_alpha;
-    Bool src_alpha;
-    uint32_t src_blend;
-    uint32_t dst_blend;
+	Bool dst_alpha;
+	Bool src_alpha;
+	uint32_t src_blend;
+	uint32_t dst_blend;
 };
 
 struct formatinfo {
-    int fmt;
-    uint32_t card_fmt;
+	int fmt;
+	uint32_t card_fmt;
 };
 
 #define TB0C_LAST_STAGE	(1 << 31)
@@ -98,464 +98,535 @@ struct formatinfo {
 #define TB0A_ARG1_SEL_TEXEL3		(9 << 6)
 
 static struct blendinfo i830_blend_op[] = {
-    /* Clear */
-    {0, 0, BLENDFACTOR_ZERO, 		BLENDFACTOR_ZERO},
-    /* Src */
-    {0, 0, BLENDFACTOR_ONE, 		BLENDFACTOR_ZERO},
-    /* Dst */
-    {0, 0, BLENDFACTOR_ZERO,		BLENDFACTOR_ONE},
-    /* Over */
-    {0, 1, BLENDFACTOR_ONE,		BLENDFACTOR_INV_SRC_ALPHA},
-    /* OverReverse */
-    {1, 0, BLENDFACTOR_INV_DST_ALPHA,	BLENDFACTOR_ONE},
-    /* In */
-    {1, 0, BLENDFACTOR_DST_ALPHA,	BLENDFACTOR_ZERO},
-    /* InReverse */
-    {0, 1, BLENDFACTOR_ZERO,		BLENDFACTOR_SRC_ALPHA},
-    /* Out */
-    {1, 0, BLENDFACTOR_INV_DST_ALPHA,	BLENDFACTOR_ZERO},
-    /* OutReverse */
-    {0, 1, BLENDFACTOR_ZERO,		BLENDFACTOR_INV_SRC_ALPHA},
-    /* Atop */
-    {1, 1, BLENDFACTOR_DST_ALPHA,	BLENDFACTOR_INV_SRC_ALPHA},
-    /* AtopReverse */
-    {1, 1, BLENDFACTOR_INV_DST_ALPHA,	BLENDFACTOR_SRC_ALPHA},
-    /* Xor */
-    {1, 1, BLENDFACTOR_INV_DST_ALPHA,	BLENDFACTOR_INV_SRC_ALPHA},
-    /* Add */
-    {0, 0, BLENDFACTOR_ONE, 		BLENDFACTOR_ONE},
+	/* Clear */
+	{0, 0, BLENDFACTOR_ZERO, BLENDFACTOR_ZERO},
+	/* Src */
+	{0, 0, BLENDFACTOR_ONE, BLENDFACTOR_ZERO},
+	/* Dst */
+	{0, 0, BLENDFACTOR_ZERO, BLENDFACTOR_ONE},
+	/* Over */
+	{0, 1, BLENDFACTOR_ONE, BLENDFACTOR_INV_SRC_ALPHA},
+	/* OverReverse */
+	{1, 0, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_ONE},
+	/* In */
+	{1, 0, BLENDFACTOR_DST_ALPHA, BLENDFACTOR_ZERO},
+	/* InReverse */
+	{0, 1, BLENDFACTOR_ZERO, BLENDFACTOR_SRC_ALPHA},
+	/* Out */
+	{1, 0, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_ZERO},
+	/* OutReverse */
+	{0, 1, BLENDFACTOR_ZERO, BLENDFACTOR_INV_SRC_ALPHA},
+	/* Atop */
+	{1, 1, BLENDFACTOR_DST_ALPHA, BLENDFACTOR_INV_SRC_ALPHA},
+	/* AtopReverse */
+	{1, 1, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_SRC_ALPHA},
+	/* Xor */
+	{1, 1, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_INV_SRC_ALPHA},
+	/* Add */
+	{0, 0, BLENDFACTOR_ONE, BLENDFACTOR_ONE},
 };
 
-/* The x8* formats could use MT_32BIT_X* on 855+, but since we implement
- * workarounds for 830/845 anyway, we just rely on those whether the hardware
- * could handle it for us or not.
- */
 static struct formatinfo i830_tex_formats[] = {
-    {PICT_a8r8g8b8, MT_32BIT_ARGB8888 },
-    {PICT_x8r8g8b8, MT_32BIT_ARGB8888 },
-    {PICT_a8b8g8r8, MT_32BIT_ABGR8888 },
-    {PICT_x8b8g8r8, MT_32BIT_ABGR8888 },
-    {PICT_r5g6b5,   MT_16BIT_RGB565   },
-    {PICT_a1r5g5b5, MT_16BIT_ARGB1555 },
-    {PICT_x1r5g5b5, MT_16BIT_ARGB1555 },
-    {PICT_a8,       MT_8BIT_A8        },
+	{PICT_a8, MAPSURF_8BIT | MT_8BIT_A8},
+	{PICT_a8r8g8b8, MAPSURF_32BIT | MT_32BIT_ARGB8888},
+	{PICT_a8b8g8r8, MAPSURF_32BIT | MT_32BIT_ABGR8888},
+	{PICT_r5g6b5, MAPSURF_16BIT | MT_16BIT_RGB565},
+	{PICT_a1r5g5b5, MAPSURF_16BIT | MT_16BIT_ARGB1555},
+	{PICT_a4r4g4b4, MAPSURF_16BIT | MT_16BIT_ARGB4444},
+};
+
+static struct formatinfo i855_tex_formats[] = {
+	{PICT_x8r8g8b8, MAPSURF_32BIT | MT_32BIT_XRGB8888},
+	{PICT_x8b8g8r8, MAPSURF_32BIT | MT_32BIT_XBGR8888},
 };
 
-static Bool i830_get_dest_format(PicturePtr pDstPicture, uint32_t *dst_format)
+static Bool i830_get_dest_format(PicturePtr dest_picture, uint32_t * dst_format)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+	ScrnInfoPtr scrn;
 
-    switch (pDstPicture->format) {
-    case PICT_a8r8g8b8:
-    case PICT_x8r8g8b8:
-        *dst_format = COLR_BUF_ARGB8888;
-        break;
-    case PICT_r5g6b5:
-        *dst_format = COLR_BUF_RGB565;
-        break;
-    case PICT_a1r5g5b5:
-    case PICT_x1r5g5b5:
-        *dst_format = COLR_BUF_ARGB1555;
-        break;
-	/*
-    case PICT_a8:
-        *dst_format = COLR_BUF_8BIT;
-        break;
-	*/
-    case PICT_a4r4g4b4:
-    case PICT_x4r4g4b4:
-	*dst_format = COLR_BUF_ARGB4444;
-	break;
-    default:
-        I830FALLBACK("Unsupported dest format 0x%x\n",
-		     (int)pDstPicture->format);
-    }
-
-    return TRUE;
+	switch (dest_picture->format) {
+	case PICT_a8r8g8b8:
+	case PICT_x8r8g8b8:
+		*dst_format = COLR_BUF_ARGB8888;
+		break;
+	case PICT_r5g6b5:
+		*dst_format = COLR_BUF_RGB565;
+		break;
+	case PICT_a1r5g5b5:
+	case PICT_x1r5g5b5:
+		*dst_format = COLR_BUF_ARGB1555;
+		break;
+	case PICT_a8:
+		*dst_format = COLR_BUF_8BIT;
+		break;
+	case PICT_a4r4g4b4:
+	case PICT_x4r4g4b4:
+		*dst_format = COLR_BUF_ARGB4444;
+		break;
+	default:
+		scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+		intel_debug_fallback(scrn, "Unsupported dest format 0x%x\n",
+				     (int)dest_picture->format);
+		return FALSE;
+	}
+	*dst_format |= DSTORG_HORT_BIAS(0x8) | DSTORG_VERT_BIAS(0x8);
+	return TRUE;
 }
 
+static Bool i830_get_blend_cntl(ScrnInfoPtr scrn, int op, PicturePtr mask,
+				uint32_t dst_format, uint32_t * blendctl)
+{
+	uint32_t sblend, dblend;
+
+	sblend = i830_blend_op[op].src_blend;
+	dblend = i830_blend_op[op].dst_blend;
+
+	/* If there's no dst alpha channel, adjust the blend op so that we'll treat
+	 * it as always 1.
+	 */
+	if (PICT_FORMAT_A(dst_format) == 0 && i830_blend_op[op].dst_alpha) {
+		if (sblend == BLENDFACTOR_DST_ALPHA)
+			sblend = BLENDFACTOR_ONE;
+		else if (sblend == BLENDFACTOR_INV_DST_ALPHA)
+			sblend = BLENDFACTOR_ZERO;
+	}
+
+	/* For blending purposes, COLR_BUF_8BIT values show up in the green
+	 * channel.  So we can't use the alpha channel.
+	 */
+	if (dst_format == PICT_a8 && ((sblend == BLENDFACTOR_DST_ALPHA ||
+				       sblend == BLENDFACTOR_INV_DST_ALPHA))) {
+		intel_debug_fallback(scrn, "Can't do dst alpha blending with "
+				     "PICT_a8 dest.\n");
+		return FALSE;
+	}
 
-static uint32_t i830_get_blend_cntl(int op, PicturePtr pMask,
-				    uint32_t dst_format)
-{
-    uint32_t sblend, dblend;
-
-    sblend = i830_blend_op[op].src_blend;
-    dblend = i830_blend_op[op].dst_blend;
-
-    /* If there's no dst alpha channel, adjust the blend op so that we'll treat
-     * it as always 1.
-     */
-    if (PICT_FORMAT_A(dst_format) == 0 && i830_blend_op[op].dst_alpha) {
-        if (sblend == BLENDFACTOR_DST_ALPHA)
-            sblend = BLENDFACTOR_ONE;
-        else if (sblend == BLENDFACTOR_INV_DST_ALPHA)
-            sblend = BLENDFACTOR_ZERO;
-    }
-
-    /* If the source alpha is being used, then we should only be in a case
-     * where the source blend factor is 0, and the source blend value is the
-     * mask channels multiplied by the source picture's alpha.
-     */
-    if (pMask && pMask->componentAlpha && PICT_FORMAT_RGB(pMask->format) 
+	/* If the source alpha is being used, then we should only be in a case
+	 * where the source blend factor is 0, and the source blend value is the
+	 * mask channels multiplied by the source picture's alpha.
+	 */
+	if (mask && mask->componentAlpha && PICT_FORMAT_RGB(mask->format)
 	    && i830_blend_op[op].src_alpha) {
-        if (dblend == BLENDFACTOR_SRC_ALPHA) {
-            dblend = BLENDFACTOR_SRC_COLR;
-        } else if (dblend == BLENDFACTOR_INV_SRC_ALPHA) {
-            dblend = BLENDFACTOR_INV_SRC_COLR;
-        }
-    }
-
-    return (sblend << S8_SRC_BLEND_FACTOR_SHIFT) |
-	(dblend << S8_DST_BLEND_FACTOR_SHIFT);
-}
-
-static Bool i830_check_composite_texture(PicturePtr pPict, int unit)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-    int w = pPict->pDrawable->width;
-    int h = pPict->pDrawable->height;
-    int i;
-
-    if ((w > 2048) || (h > 2048))
-        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-
-    for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
-	 i++)
-    {
-        if (i830_tex_formats[i].fmt == pPict->format)
-            break;
-    }
-    if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
-        I830FALLBACK("Unsupported picture format 0x%x\n",
-		     (int)pPict->format);
-
-    if (pPict->repeatType > RepeatReflect)
-        I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
-
-    if (pPict->filter != PictFilterNearest &&
-        pPict->filter != PictFilterBilinear)
-    {
-        I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
-    }
-
-    return TRUE;
-}
-
-static uint32_t
-i8xx_get_card_format(PicturePtr pPict)
-{
-    int i;
-    for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
-	    i++)
-    {
-	if (i830_tex_formats[i].fmt == pPict->format)
-	    break;
-    }
-    return i830_tex_formats[i].card_fmt;
-}
-
-static Bool
-i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
-{
-
-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t format, pitch, filter;
-    uint32_t wrap_mode;
-
-    pitch = intel_get_pixmap_pitch(pPix);
-    pI830->scale_units[unit][0] = pPix->drawable.width;
-    pI830->scale_units[unit][1] = pPix->drawable.height;
-    pI830->transform[unit] = pPict->transform;
-
-    format = i8xx_get_card_format(pPict);
-
-    switch (pPict->repeatType) {
-    case RepeatNone:
-	wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
-	break;
-    case RepeatNormal:
-	wrap_mode = TEXCOORDMODE_WRAP;
-	break;
-    case RepeatPad:
-	wrap_mode = TEXCOORDMODE_CLAMP;
-	break;
-    case RepeatReflect:
-	wrap_mode = TEXCOORDMODE_MIRROR;
-	break;
-    default:
-	FatalError("Unkown repeat type %d\n", pPict->repeatType);
-    }
-
-    switch (pPict->filter) {
-    case PictFilterNearest:
-        filter = ((FILTER_NEAREST<<TM0S3_MAG_FILTER_SHIFT) |
-		  (FILTER_NEAREST<<TM0S3_MIN_FILTER_SHIFT));
-        break;
-    case PictFilterBilinear:
-        filter = ((FILTER_LINEAR<<TM0S3_MAG_FILTER_SHIFT) |
-		  (FILTER_LINEAR<<TM0S3_MIN_FILTER_SHIFT));
-        break;
-    default:
-	filter = 0;
-        I830FALLBACK("Bad filter 0x%x\n", pPict->filter);
-    }
-    filter |= (MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT); 
-
-    {
-	if (pPix->drawable.bitsPerPixel == 8)
-	    format |= MAPSURF_8BIT;
-	else if (pPix->drawable.bitsPerPixel == 16)
-	    format |= MAPSURF_16BIT;
+		if (dblend == BLENDFACTOR_SRC_ALPHA) {
+			dblend = BLENDFACTOR_SRC_COLR;
+		} else if (dblend == BLENDFACTOR_INV_SRC_ALPHA) {
+			dblend = BLENDFACTOR_INV_SRC_COLR;
+		}
+	}
+
+	*blendctl = (sblend << S8_SRC_BLEND_FACTOR_SHIFT) |
+	    (dblend << S8_DST_BLEND_FACTOR_SHIFT);
+
+	return TRUE;
+}
+
+static uint32_t i8xx_get_card_format(intel_screen_private *intel,
+				     PicturePtr picture)
+{
+	int i;
+
+	for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
+	     i++) {
+		if (i830_tex_formats[i].fmt == picture->format)
+			return i830_tex_formats[i].card_fmt;
+	}
+
+	if (IS_I85X(intel) || IS_I865G(intel)) {
+		for (i = 0; i < sizeof(i855_tex_formats) / sizeof(i855_tex_formats[0]);
+		     i++) {
+			if (i855_tex_formats[i].fmt == picture->format)
+				return i855_tex_formats[i].card_fmt;
+		}
+	}
+
+	return 0;
+}
+
+static void i830_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit)
+{
+
+	ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint32_t format, tiling_bits, pitch, filter;
+	uint32_t wrap_mode;
+	uint32_t texcoordtype;
+
+	pitch = intel_get_pixmap_pitch(pixmap);
+	intel->scale_units[unit][0] = pixmap->drawable.width;
+	intel->scale_units[unit][1] = pixmap->drawable.height;
+	intel->transform[unit] = picture->transform;
+
+	if (i830_transform_is_affine(intel->transform[unit]))
+		texcoordtype = TEXCOORDTYPE_CARTESIAN;
 	else
-	    format |= MAPSURF_32BIT;
+		texcoordtype = TEXCOORDTYPE_HOMOGENEOUS;
+
+	switch (picture->repeatType) {
+	case RepeatNone:
+		wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
+		break;
+	case RepeatNormal:
+		wrap_mode = TEXCOORDMODE_WRAP;
+		break;
+	case RepeatPad:
+		wrap_mode = TEXCOORDMODE_CLAMP;
+		break;
+	case RepeatReflect:
+		wrap_mode = TEXCOORDMODE_MIRROR;
+		break;
+	default:
+		FatalError("Unknown repeat type %d\n", picture->repeatType);
+	}
 
-	BEGIN_BATCH(10);
-	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 | LOAD_TEXTURE_MAP(unit) | 4);
-	OUT_RELOC_PIXMAP(pPix, I915_GEM_DOMAIN_SAMPLER, 0, TM0S0_USE_FENCE);
-	OUT_BATCH(((pPix->drawable.height - 1) << TM0S1_HEIGHT_SHIFT) |
-		  ((pPix->drawable.width - 1) << TM0S1_WIDTH_SHIFT) | format);
-	OUT_BATCH((pitch/4 - 1) << TM0S2_PITCH_SHIFT | TM0S2_MAP_2D);
+	switch (picture->filter) {
+	case PictFilterNearest:
+		filter = ((FILTER_NEAREST << TM0S3_MAG_FILTER_SHIFT) |
+			  (FILTER_NEAREST << TM0S3_MIN_FILTER_SHIFT));
+		break;
+	case PictFilterBilinear:
+		filter = ((FILTER_LINEAR << TM0S3_MAG_FILTER_SHIFT) |
+			  (FILTER_LINEAR << TM0S3_MIN_FILTER_SHIFT));
+		break;
+	default:
+		filter = 0;
+		FatalError("Bad filter 0x%x\n", picture->filter);
+	}
+	filter |= (MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT);
+
+	if (i830_pixmap_tiled(pixmap)) {
+		tiling_bits = TM0S1_TILED_SURFACE;
+		if (i830_get_pixmap_intel(pixmap)->tiling
+				== I915_TILING_Y)
+			tiling_bits |= TM0S1_TILE_WALK;
+	} else
+		tiling_bits = 0;
+
+	format = i8xx_get_card_format(intel, picture);
+
+	assert(intel->in_batch_atomic);
+
+	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 |
+		  LOAD_TEXTURE_MAP(unit) | 4);
+	OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_SAMPLER, 0, 0);
+	OUT_BATCH(((pixmap->drawable.height -
+		    1) << TM0S1_HEIGHT_SHIFT) | ((pixmap->drawable.width -
+						  1) <<
+						 TM0S1_WIDTH_SHIFT) |
+		  format | tiling_bits);
+	OUT_BATCH((pitch / 4 - 1) << TM0S2_PITCH_SHIFT | TM0S2_MAP_2D);
 	OUT_BATCH(filter);
-	OUT_BATCH(0); /* default color */
+	OUT_BATCH(0);	/* default color */
 	OUT_BATCH(_3DSTATE_MAP_COORD_SET_CMD | TEXCOORD_SET(unit) |
 		  ENABLE_TEXCOORD_PARAMS | TEXCOORDS_ARE_NORMAL |
-		  TEXCOORDTYPE_CARTESIAN | ENABLE_ADDR_V_CNTL |
+		  texcoordtype | ENABLE_ADDR_V_CNTL |
 		  TEXCOORD_ADDR_V_MODE(wrap_mode) |
 		  ENABLE_ADDR_U_CNTL | TEXCOORD_ADDR_U_MODE(wrap_mode));
 	/* map texel stream */
 	OUT_BATCH(_3DSTATE_MAP_COORD_SETBIND_CMD);
 	if (unit == 0)
-	    OUT_BATCH(TEXBIND_SET0(TEXCOORDSRC_VTXSET_0) |
-		      TEXBIND_SET1(TEXCOORDSRC_KEEP) |
-		      TEXBIND_SET2(TEXCOORDSRC_KEEP) |
-		      TEXBIND_SET3(TEXCOORDSRC_KEEP));
+		OUT_BATCH(TEXBIND_SET0(TEXCOORDSRC_VTXSET_0) |
+			  TEXBIND_SET1(TEXCOORDSRC_KEEP) |
+			  TEXBIND_SET2(TEXCOORDSRC_KEEP) |
+			  TEXBIND_SET3(TEXCOORDSRC_KEEP));
 	else
-	    OUT_BATCH(TEXBIND_SET0(TEXCOORDSRC_VTXSET_0) |
-		      TEXBIND_SET1(TEXCOORDSRC_VTXSET_1) |
-		      TEXBIND_SET2(TEXCOORDSRC_KEEP) |
-		      TEXBIND_SET3(TEXCOORDSRC_KEEP));
+		OUT_BATCH(TEXBIND_SET0(TEXCOORDSRC_VTXSET_0) |
+			  TEXBIND_SET1(TEXCOORDSRC_VTXSET_1) |
+			  TEXBIND_SET2(TEXCOORDSRC_KEEP) |
+			  TEXBIND_SET3(TEXCOORDSRC_KEEP));
 	OUT_BATCH(_3DSTATE_MAP_TEX_STREAM_CMD | (unit << 16) |
 		  DISABLE_TEX_STREAM_BUMP |
 		  ENABLE_TEX_STREAM_COORD_SET |
 		  TEX_STREAM_COORD_SET(unit) |
-		  ENABLE_TEX_STREAM_MAP_IDX |
-		  TEX_STREAM_MAP_IDX(unit));
-	ADVANCE_BATCH();
-     }
-
-#ifdef I830DEBUG
-    ErrorF("try to sync to show any errors...");
-    I830Sync(pScrn);
-#endif
-
-    return TRUE;
+		  ENABLE_TEX_STREAM_MAP_IDX | TEX_STREAM_MAP_IDX(unit));
 }
 
 Bool
-i830_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
-		     PicturePtr pDstPicture)
+i830_check_composite(int op,
+		     PicturePtr source_picture,
+		     PicturePtr mask_picture,
+		     PicturePtr dest_picture,
+		     int width, int height)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
-    uint32_t tmp1;
+	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+	uint32_t tmp1;
+
+	/* Check for unsupported compositing operations. */
+	if (op >= sizeof(i830_blend_op) / sizeof(i830_blend_op[0])) {
+		intel_debug_fallback(scrn, "Unsupported Composite op 0x%x\n",
+				     op);
+		return FALSE;
+	}
 
-    /* Check for unsupported compositing operations. */
-    if (op >= sizeof(i830_blend_op) / sizeof(i830_blend_op[0]))
-        I830FALLBACK("Unsupported Composite op 0x%x\n", op);
-
-    if (pMaskPicture != NULL && pMaskPicture->componentAlpha &&
-	    PICT_FORMAT_RGB(pMaskPicture->format)) {
-        /* Check if it's component alpha that relies on a source alpha and on
-         * the source value.  We can only get one of those into the single
-         * source value that we get to blend with.
-         */
-        if (i830_blend_op[op].src_alpha &&
-            (i830_blend_op[op].src_blend != BLENDFACTOR_ZERO))
-            	I830FALLBACK("Component alpha not supported with source "
-			     "alpha and source value blending.\n");
-    }
-
-    if (!i830_check_composite_texture(pSrcPicture, 0))
-        I830FALLBACK("Check Src picture texture\n");
-    if (pMaskPicture != NULL && !i830_check_composite_texture(pMaskPicture, 1))
-        I830FALLBACK("Check Mask picture texture\n");
+	if (mask_picture != NULL && mask_picture->componentAlpha &&
+	    PICT_FORMAT_RGB(mask_picture->format)) {
+		/* Check if it's component alpha that relies on a source alpha and on
+		 * the source value.  We can only get one of those into the single
+		 * source value that we get to blend with.
+		 */
+		if (i830_blend_op[op].src_alpha &&
+		    (i830_blend_op[op].src_blend != BLENDFACTOR_ZERO)) {
+			intel_debug_fallback(scrn, "Component alpha not "
+					     "supported with source alpha and "
+					     "source value blending.\n");
+			return FALSE;
+		}
+	}
+
+	if (!i830_get_dest_format(dest_picture, &tmp1)) {
+		intel_debug_fallback(scrn, "Get Color buffer format\n");
+		return FALSE;
+	}
 
-    if (!i830_get_dest_format(pDstPicture, &tmp1))
-	I830FALLBACK("Get Color buffer format\n");
+	if (width > 2048 || height > 2048) {
+		intel_debug_fallback(scrn, "Operation is too large (%d, %d)\n", width, height);
+		return FALSE;
+	}
 
-    return TRUE;
+	return TRUE;
 }
 
 Bool
-i830_prepare_composite(int op, PicturePtr pSrcPicture,
-		       PicturePtr pMaskPicture, PicturePtr pDstPicture,
-		       PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t dst_format, dst_pitch;
-    Bool is_affine_src, is_affine_mask;
-    Bool is_nearest = FALSE;
-
-    i830_exa_check_pitch_3d(pSrc);
-    if (pMask)
-	i830_exa_check_pitch_3d(pMask);
-    i830_exa_check_pitch_3d(pDst);
+i830_check_composite_target(PixmapPtr pixmap)
+{
+	if (pixmap->drawable.width > 2048 || pixmap->drawable.height > 2048)
+		return FALSE;
+
+	if(!intel_check_pitch_3d(pixmap))
+		return FALSE;
 
-    IntelEmitInvarientState(pScrn);
-    pI830->last_3d = LAST_3D_RENDER;
+	return TRUE;
+}
+
+Bool
+i830_check_composite_texture(ScreenPtr screen, PicturePtr picture)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (picture->repeatType > RepeatReflect) {
+		intel_debug_fallback(scrn, "Unsupported picture repeat %d\n",
+			     picture->repeatType);
+		return FALSE;
+	}
+
+	if (picture->filter != PictFilterNearest &&
+	    picture->filter != PictFilterBilinear) {
+		intel_debug_fallback(scrn, "Unsupported filter 0x%x\n",
+				     picture->filter);
+		return FALSE;
+	}
+
+	if (picture->pDrawable) {
+		int w, h;
+
+		w = picture->pDrawable->width;
+		h = picture->pDrawable->height;
+		if ((w > 2048) || (h > 2048)) {
+			intel_debug_fallback(scrn,
+					     "Picture w/h too large (%dx%d)\n",
+					     w, h);
+			return FALSE;
+		}
+
+		/* XXX we can use the xrgb32 types if there the picture covers the clip */
+		if (!i8xx_get_card_format(intel, picture)) {
+			intel_debug_fallback(scrn, "Unsupported picture format "
+					     "0x%x\n",
+					     (int)picture->format);
+			return FALSE;
+		}
+
+		return TRUE;
+	}
 
-    if (!i830_get_dest_format(pDstPicture, &dst_format))
 	return FALSE;
-    dst_pitch = intel_get_pixmap_pitch(pDst);
+}
 
-    if (!i830_texture_setup(pSrcPicture, pSrc, 0))
-	I830FALLBACK("fail to setup src texture\n");
-    if (pSrcPicture->filter == PictFilterNearest)
-	is_nearest = TRUE;
-    if (pMask != NULL) {
-	if (!i830_texture_setup(pMaskPicture, pMask, 1))
-	    I830FALLBACK("fail to setup mask texture\n");
-	if (pMaskPicture->filter == PictFilterNearest)
-	    is_nearest = TRUE;
-    } else {
-	pI830->transform[1] = NULL;
-	pI830->scale_units[1][0] = -1;
-	pI830->scale_units[1][1] = -1;
-    }
-
-    is_affine_src = i830_transform_is_affine (pI830->transform[0]);
-    is_affine_mask = i830_transform_is_affine (pI830->transform[1]);
-
-    if (is_nearest)
-	pI830->coord_adjust = -0.125;
-    else
-	pI830->coord_adjust = 0;
-
-    if (!is_affine_src || !is_affine_mask)
-	I830FALLBACK("non-affine transform unsupported on 8xx hardware\n");
+Bool
+i830_prepare_composite(int op, PicturePtr source_picture,
+		       PicturePtr mask_picture, PicturePtr dest_picture,
+		       PixmapPtr source, PixmapPtr mask, PixmapPtr dest)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *bo_table[] = {
+		NULL,		/* batch_bo */
+		i830_get_pixmap_bo(source),
+		mask ? i830_get_pixmap_bo(mask) : NULL,
+		i830_get_pixmap_bo(dest),
+	};
+
+	intel->render_source_picture = source_picture;
+	intel->render_source = source;
+	intel->render_mask_picture = mask_picture;
+	intel->render_mask = mask;
+	intel->render_dest_picture = dest_picture;
+	intel->render_dest = dest;
+
+	if (!intel_check_pitch_3d(source))
+		return FALSE;
+	if (mask) {
+		if (mask_picture->componentAlpha &&
+		    PICT_FORMAT_RGB(mask_picture->format)) {
+			/* Check if it's component alpha that relies on a source alpha and on
+			 * the source value.  We can only get one of those into the single
+			 * source value that we get to blend with.
+			 */
+			if (i830_blend_op[op].src_alpha &&
+			    (i830_blend_op[op].src_blend != BLENDFACTOR_ZERO)) {
+				intel_debug_fallback(scrn, "Component alpha not "
+						     "supported with source alpha and "
+						     "source value blending.\n");
+				return FALSE;
+			}
+		}
+		if (!intel_check_pitch_3d(mask))
+			return FALSE;
+	}
+	if (!intel_check_pitch_3d(dest))
+		return FALSE;
 
-    {
-	uint32_t cblend, ablend, blendctl, vf2;
+	if (!i830_get_dest_format(dest_picture, &intel->render_dest_format))
+		return FALSE;
 
-	BEGIN_BATCH(30);
+	if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
+		return FALSE;
 
-	/* color buffer */
-	OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
-	OUT_BATCH(BUF_3D_ID_COLOR_BACK| BUF_3D_USE_FENCE |
-		  BUF_3D_PITCH(dst_pitch));
-	OUT_RELOC_PIXMAP(pDst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
-	OUT_BATCH(MI_NOOP);
+	if (mask) {
+		intel->transform[1] = NULL;
+		intel->scale_units[1][0] = -1;
+		intel->scale_units[1][1] = -1;
+	}
 
-	OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
-	OUT_BATCH(dst_format);
+	{
+		uint32_t cblend, ablend, blendctl;
 
-	/* defaults */
-	OUT_BATCH(_3DSTATE_DFLT_Z_CMD);
-	OUT_BATCH(0);
+		/* If component alpha is active in the mask and the blend operation
+		 * uses the source alpha, then we know we don't need the source
+		 * value (otherwise we would have hit a fallback earlier), so we
+		 * provide the source alpha (src.A * mask.X) as output color.
+		 * Conversely, if CA is set and we don't need the source alpha, then
+		 * we produce the source value (src.X * mask.X) and the source alpha
+		 * is unused..  Otherwise, we provide the non-CA source value
+		 * (src.X * mask.A).
+		 *
+		 * The PICT_FORMAT_RGB(pict) == 0 fixups are not needed on 855+'s a8
+		 * pictures, but we need to implement it for 830/845 and there's no
+		 * harm done in leaving it in.
+		 */
+		cblend =
+		    TB0C_LAST_STAGE | TB0C_RESULT_SCALE_1X | TB0C_OP_MODULE |
+		    TB0C_OUTPUT_WRITE_CURRENT;
+		ablend =
+		    TB0A_RESULT_SCALE_1X | TB0A_OP_MODULE |
+		    TB0A_OUTPUT_WRITE_CURRENT;
+
+		/* Get the source picture's channels into TBx_ARG1 */
+		if ((mask_picture != NULL &&
+		     mask_picture->componentAlpha &&
+		     PICT_FORMAT_RGB(mask_picture->format) &&
+		     i830_blend_op[op].src_alpha)
+		    || dest_picture->format == PICT_a8) {
+			/* Producing source alpha value, so the first set of channels
+			 * is src.A instead of src.X.  We also do this if the destination
+			 * is a8, in which case src.G is what's written, and the other
+			 * channels are ignored.
+			 */
+			ablend |= TB0A_ARG1_SEL_TEXEL0;
+			cblend |= TB0C_ARG1_SEL_TEXEL0 | TB0C_ARG1_REPLICATE_ALPHA;
+		} else {
+			if (PICT_FORMAT_RGB(source_picture->format) != 0)
+				cblend |= TB0C_ARG1_SEL_TEXEL0;
+			else
+				cblend |= TB0C_ARG1_SEL_ONE | TB0C_ARG1_INVERT;	/* 0.0 */
+			ablend |= TB0A_ARG1_SEL_TEXEL0;
+		}
+
+		if (mask) {
+			cblend |= TB0C_ARG2_SEL_TEXEL1;
+			if (dest_picture->format == PICT_a8 ||
+			    ! mask_picture->componentAlpha ||
+			    ! PICT_FORMAT_RGB(mask_picture->format))
+				cblend |= TB0C_ARG2_REPLICATE_ALPHA;
+			ablend |= TB0A_ARG2_SEL_TEXEL1;
+		} else {
+			cblend |= TB0C_ARG2_SEL_ONE;
+			ablend |= TB0A_ARG2_SEL_ONE;
+		}
+
+		if (!i830_get_blend_cntl
+		    (scrn, op, mask_picture, dest_picture->format, &blendctl)) {
+			return FALSE;
+		}
+
+		intel->cblend = cblend;
+		intel->ablend = ablend;
+		intel->s8_blendctl = blendctl;
+	}
 
-	OUT_BATCH(_3DSTATE_DFLT_DIFFUSE_CMD);
-	OUT_BATCH(0);
+	if(i830_uxa_pixmap_is_dirty(source) ||
+	   (mask && i830_uxa_pixmap_is_dirty(mask)))
+		intel_batch_emit_flush(scrn);
 
-	OUT_BATCH(_3DSTATE_DFLT_SPEC_CMD);
-	OUT_BATCH(0);
+	intel->needs_render_state_emit = TRUE;
+
+	return TRUE;
+}
+
+static void i830_emit_composite_state(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint32_t vf2, tiling_bits;
+	uint32_t texcoordfmt = 0;
+
+	intel->needs_render_state_emit = FALSE;
+
+	IntelEmitInvarientState(scrn);
+	intel->last_3d = LAST_3D_RENDER;
+
+	assert(intel->in_batch_atomic);
+
+	if (i830_pixmap_tiled(intel->render_dest)) {
+		tiling_bits = BUF_3D_TILED_SURFACE;
+		if (i830_get_pixmap_intel(intel->render_dest)->tiling
+				== I915_TILING_Y)
+			tiling_bits |= BUF_3D_TILE_WALK_Y;
+	} else
+		tiling_bits = 0;
+
+	OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
+	OUT_BATCH(BUF_3D_ID_COLOR_BACK | tiling_bits |
+		  BUF_3D_PITCH(intel_get_pixmap_pitch(intel->render_dest)));
+	OUT_RELOC_PIXMAP(intel->render_dest,
+			 I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
+
+	OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
+	OUT_BATCH(intel->render_dest_format);
 
 	OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
 	OUT_BATCH(0);
-	OUT_BATCH(0); /* ymin, xmin */
-	OUT_BATCH(DRAW_YMAX(pDst->drawable.height - 1) |
-		  DRAW_XMAX(pDst->drawable.width - 1));
-	OUT_BATCH(0); /* yorig, xorig */
-
-	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) |
-		  I1_LOAD_S(3) | 1);
-	if (pMask)
-	    vf2 = 2 << 12; /* 2 texture coord sets */
+	OUT_BATCH(0);		/* ymin, xmin */
+	OUT_BATCH(DRAW_YMAX(intel->render_dest->drawable.height - 1) |
+		  DRAW_XMAX(intel->render_dest->drawable.width - 1));
+	OUT_BATCH(0);		/* yorig, xorig */
+
+	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
+		  I1_LOAD_S(2) | I1_LOAD_S(3) | I1_LOAD_S(8) | 2);
+	if (intel->render_mask)
+		vf2 = 2 << 12;	/* 2 texture coord sets */
 	else
-	    vf2 = 1 << 12;
-	OUT_BATCH(vf2); /* TEXCOORDFMT_2D */
+		vf2 = 1 << 12;
+	OUT_BATCH(vf2);		/* number of coordinate sets */
 	OUT_BATCH(S3_CULLMODE_NONE | S3_VERTEXHAS_XY);
+	OUT_BATCH(S8_ENABLE_COLOR_BLEND | S8_BLENDFUNC_ADD | intel->
+		  s8_blendctl | S8_ENABLE_COLOR_BUFFER_WRITE);
 
-	/* If component alpha is active in the mask and the blend operation
-	 * uses the source alpha, then we know we don't need the source
-	 * value (otherwise we would have hit a fallback earlier), so we
-	 * provide the source alpha (src.A * mask.X) as output color.
-	 * Conversely, if CA is set and we don't need the source alpha, then
-	 * we produce the source value (src.X * mask.X) and the source alpha
-	 * is unused..  Otherwise, we provide the non-CA source value
-	 * (src.X * mask.A).
-	 *
-	 * The PICT_FORMAT_RGB(pict) == 0 fixups are not needed on 855+'s a8
-	 * pictures, but we need to implement it for 830/845 and there's no
-	 * harm done in leaving it in.
-	 */
-	cblend = TB0C_LAST_STAGE | TB0C_RESULT_SCALE_1X | TB0C_OP_MODULE |
-		 TB0C_OUTPUT_WRITE_CURRENT;
-	ablend = TB0A_RESULT_SCALE_1X | TB0A_OP_MODULE |
-		 TB0A_OUTPUT_WRITE_CURRENT;
-
-	/* Get the source picture's channels into TBx_ARG1 */
-	if (pMaskPicture != NULL &&
-	    pMaskPicture->componentAlpha &&
-	    PICT_FORMAT_RGB(pMaskPicture->format) &&
-	    i830_blend_op[op].src_alpha)
-	{
-	    /* Producing source alpha value, so the first set of channels
-	     * is src.A instead of src.X
-	     */
-	    if (PICT_FORMAT_A(pSrcPicture->format) != 0) {
-		ablend |= TB0A_ARG1_SEL_TEXEL0;
-		cblend |= TB0C_ARG1_SEL_TEXEL0 | TB0C_ARG1_REPLICATE_ALPHA;
-	    } else {
-		ablend |= TB0A_ARG1_SEL_ONE;
-		cblend |= TB0C_ARG1_SEL_ONE;
-	    }
-	} else {
-	    if (PICT_FORMAT_A(pSrcPicture->format) != 0) {
-		ablend |= TB0A_ARG1_SEL_TEXEL0;
-	    } else {
-		ablend |= TB0A_ARG1_SEL_ONE;
-	    }
-	    if (PICT_FORMAT_RGB(pSrcPicture->format) != 0)
-		cblend |= TB0C_ARG1_SEL_TEXEL0;
-	    else
-		cblend |= TB0C_ARG1_SEL_ONE | TB0C_ARG1_INVERT; /* 0.0 */
-	}
-
-	if (pMask) {
-	    if (pMaskPicture->componentAlpha &&
-		PICT_FORMAT_RGB(pMaskPicture->format))
-	    {
-		cblend |= TB0C_ARG2_SEL_TEXEL1;
-	    } else {
-		if (PICT_FORMAT_A(pMaskPicture->format) != 0)
-		    cblend |= TB0C_ARG2_SEL_TEXEL1 |
-			TB0C_ARG2_REPLICATE_ALPHA;
-		else
-		    cblend |= TB0C_ARG2_SEL_ONE;
-	    }
-	    if (PICT_FORMAT_A(pMaskPicture->format) != 0)
-		ablend |= TB0A_ARG2_SEL_TEXEL1;
-	    else
-		ablend |= TB0A_ARG2_SEL_ONE;
-	} else {
-	    cblend |= TB0C_ARG2_SEL_ONE;
-	    ablend |= TB0A_ARG2_SEL_ONE;
-	}
+	OUT_BATCH(_3DSTATE_INDPT_ALPHA_BLEND_CMD | DISABLE_INDPT_ALPHA_BLEND);
 
 	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 |
-		  LOAD_TEXTURE_BLEND_STAGE(0)|1);
-	OUT_BATCH(cblend);
-	OUT_BATCH(ablend);
-	OUT_BATCH(0);
-
-	blendctl = i830_get_blend_cntl(op, pMaskPicture, pDstPicture->format);
-	OUT_BATCH(_3DSTATE_INDPT_ALPHA_BLEND_CMD | DISABLE_INDPT_ALPHA_BLEND);
-	OUT_BATCH(MI_NOOP);
-	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(8) | 0);
-	OUT_BATCH(S8_ENABLE_COLOR_BLEND | S8_BLENDFUNC_ADD | blendctl |
-		  S8_ENABLE_COLOR_BUFFER_WRITE);
+		  LOAD_TEXTURE_BLEND_STAGE(0) | 1);
+	OUT_BATCH(intel->cblend);
+	OUT_BATCH(intel->ablend);
 
 	OUT_BATCH(_3DSTATE_ENABLES_1_CMD | DISABLE_LOGIC_OP |
 		  DISABLE_STENCIL_TEST | DISABLE_DEPTH_BIAS |
@@ -564,173 +635,234 @@ i830_prepare_composite(int op, PicturePt
 	/* We have to explicitly say we don't want write disabled */
 	OUT_BATCH(_3DSTATE_ENABLES_2_CMD | ENABLE_COLOR_MASK |
 		  DISABLE_STENCIL_WRITE | ENABLE_TEX_CACHE |
-		  DISABLE_DITHER | ENABLE_COLOR_WRITE |
-		  DISABLE_DEPTH_WRITE);
-	ADVANCE_BATCH();
-    }
-
-#ifdef I830DEBUG
-    Error("try to sync to show any errors...");
-    I830Sync(pScrn);
-#endif
+		  DISABLE_DITHER | ENABLE_COLOR_WRITE | DISABLE_DEPTH_WRITE);
+
+	if (i830_transform_is_affine(intel->render_source_picture->transform))
+		texcoordfmt |= (TEXCOORDFMT_2D << 0);
+	else
+		texcoordfmt |= (TEXCOORDFMT_3D << 0);
+	if (intel->render_mask) {
+		if (i830_transform_is_affine
+		    (intel->render_mask_picture->transform))
+			texcoordfmt |= (TEXCOORDFMT_2D << 2);
+		else
+			texcoordfmt |= (TEXCOORDFMT_3D << 2);
+	}
+	OUT_BATCH(_3DSTATE_VERTEX_FORMAT_2_CMD | texcoordfmt);
+
+	i830_texture_setup(intel->render_source_picture, intel->render_source, 0);
+	if (intel->render_mask) {
+		i830_texture_setup(intel->render_mask_picture,
+				   intel->render_mask, 1);
+	}
+}
+
+/* Emit the vertices for a single composite rectangle.
+ *
+ * This function is no longer shared between i830 and i915 generation code.
+ */
+static void
+i830_emit_composite_primitive(PixmapPtr dest,
+			      int srcX, int srcY,
+			      int maskX, int maskY,
+			      int dstX, int dstY, int w, int h)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	Bool is_affine_src, is_affine_mask = TRUE;
+	int per_vertex, num_floats;
+	float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
+
+	per_vertex = 2;		/* dest x/y */
+
+	{
+		float x = srcX, y = srcY;
+
+		is_affine_src = i830_transform_is_affine(intel->transform[0]);
+		if (is_affine_src) {
+			if (!i830_get_transformed_coordinates(x, y,
+							      intel->
+							      transform[0],
+							      &src_x[0],
+							      &src_y[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates(x, y + h,
+							      intel->
+							      transform[0],
+							      &src_x[1],
+							      &src_y[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates(x + w, y + h,
+							      intel->
+							      transform[0],
+							      &src_x[2],
+							      &src_y[2]))
+				return;
+
+			per_vertex += 2;	/* src x/y */
+		} else {
+			if (!i830_get_transformed_coordinates_3d(x, y,
+								 intel->
+								 transform[0],
+								 &src_x[0],
+								 &src_y[0],
+								 &src_w[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(x, y + h,
+								 intel->
+								 transform[0],
+								 &src_x[1],
+								 &src_y[1],
+								 &src_w[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(x + w, y + h,
+								 intel->
+								 transform[0],
+								 &src_x[2],
+								 &src_y[2],
+								 &src_w[2]))
+				return;
+
+			per_vertex += 3;	/* src x/y/w */
+		}
+	}
+
+	if (intel->render_mask) {
+		float x = maskX, y = maskY;
+
+		is_affine_mask = i830_transform_is_affine(intel->transform[1]);
+		if (is_affine_mask) {
+			if (!i830_get_transformed_coordinates(x, y,
+							      intel->
+							      transform[1],
+							      &mask_x[0],
+							      &mask_y[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates(x, y + h,
+							      intel->
+							      transform[1],
+							      &mask_x[1],
+							      &mask_y[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates(x + w, y + h,
+							      intel->
+							      transform[1],
+							      &mask_x[2],
+							      &mask_y[2]))
+				return;
+
+			per_vertex += 2;	/* mask x/y */
+		} else {
+			if (!i830_get_transformed_coordinates_3d(x, y,
+								 intel->
+								 transform[1],
+								 &mask_x[0],
+								 &mask_y[0],
+								 &mask_w[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(x, y + h,
+								 intel->
+								 transform[1],
+								 &mask_x[1],
+								 &mask_y[1],
+								 &mask_w[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(x + w, y + h,
+								 intel->
+								 transform[1],
+								 &mask_x[2],
+								 &mask_y[2],
+								 &mask_w[2]))
+				return;
+
+			per_vertex += 3;	/* mask x/y/w */
+		}
+	}
+
+	num_floats = 3 * per_vertex;
 
-    return TRUE;
+	OUT_BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST | (num_floats - 1));
+	OUT_BATCH_F(dstX + w);
+	OUT_BATCH_F(dstY + h);
+	OUT_BATCH_F(src_x[2] / intel->scale_units[0][0]);
+	OUT_BATCH_F(src_y[2] / intel->scale_units[0][1]);
+	if (!is_affine_src) {
+		OUT_BATCH_F(src_w[2]);
+	}
+	if (intel->render_mask) {
+		OUT_BATCH_F(mask_x[2] / intel->scale_units[1][0]);
+		OUT_BATCH_F(mask_y[2] / intel->scale_units[1][1]);
+		if (!is_affine_mask) {
+			OUT_BATCH_F(mask_w[2]);
+		}
+	}
+
+	OUT_BATCH_F(dstX);
+	OUT_BATCH_F(dstY + h);
+	OUT_BATCH_F(src_x[1] / intel->scale_units[0][0]);
+	OUT_BATCH_F(src_y[1] / intel->scale_units[0][1]);
+	if (!is_affine_src) {
+		OUT_BATCH_F(src_w[1]);
+	}
+	if (intel->render_mask) {
+		OUT_BATCH_F(mask_x[1] / intel->scale_units[1][0]);
+		OUT_BATCH_F(mask_y[1] / intel->scale_units[1][1]);
+		if (!is_affine_mask) {
+			OUT_BATCH_F(mask_w[1]);
+		}
+	}
+
+	OUT_BATCH_F(dstX);
+	OUT_BATCH_F(dstY);
+	OUT_BATCH_F(src_x[0] / intel->scale_units[0][0]);
+	OUT_BATCH_F(src_y[0] / intel->scale_units[0][1]);
+	if (!is_affine_src) {
+		OUT_BATCH_F(src_w[0]);
+	}
+	if (intel->render_mask) {
+		OUT_BATCH_F(mask_x[0] / intel->scale_units[1][0]);
+		OUT_BATCH_F(mask_y[0] / intel->scale_units[1][1]);
+		if (!is_affine_mask) {
+			OUT_BATCH_F(mask_w[0]);
+		}
+	}
 }
 
 /**
  * Do a single rectangle composite operation.
- *
- * This function is shared between i830 and i915 generation code.
  */
 void
-i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
+i830_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
 	       int dstX, int dstY, int w, int h)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    Bool has_mask;
-    Bool is_affine_src, is_affine_mask;
-    int per_vertex, num_floats;
-    float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
-
-    is_affine_src = i830_transform_is_affine (pI830->transform[0]);
-    is_affine_mask = i830_transform_is_affine (pI830->transform[1]);
-
-    if (pI830->scale_units[1][0] == -1 || pI830->scale_units[1][1] == -1) {
-	has_mask = FALSE;
-    } else {
-	has_mask = TRUE;
-    }
-
-    per_vertex = 2; /* dest x/y */
-    if (is_affine_src)
-    {
-	if (!i830_get_transformed_coordinates(srcX, srcY,
-					      pI830->transform[0],
-					      &src_x[0], &src_y[0]))
-	    return;
-	if (!i830_get_transformed_coordinates(srcX, srcY + h,
-					      pI830->transform[0],
-					      &src_x[1], &src_y[1]))
-	    return;
-	if (!i830_get_transformed_coordinates(srcX + w, srcY + h,
-					      pI830->transform[0],
-					      &src_x[2], &src_y[2]))
-	    return;
-	per_vertex += 2;    /* src x/y */
-    } else {
-	if (!i830_get_transformed_coordinates_3d(srcX, srcY,
-						 pI830->transform[0],
-						 &src_x[0], &src_y[0],
-						 &src_w[0]))
-	    return;
-	if (!i830_get_transformed_coordinates_3d(srcX, srcY + h,
-						 pI830->transform[0],
-						 &src_x[1], &src_y[1],
-						 &src_w[1]))
-	    return;
-	if (!i830_get_transformed_coordinates_3d(srcX + w, srcY + h,
-						 pI830->transform[0],
-						 &src_x[2], &src_y[2],
-						 &src_w[2]))
-	    return;
-	per_vertex += 4;    /* src x/y/z/w */
-    }
-    if (has_mask) {
-	if (is_affine_mask) {
-	    if (!i830_get_transformed_coordinates(maskX, maskY,
-						  pI830->transform[1],
-						  &mask_x[0], &mask_y[0]))
-		return;
-	    if (!i830_get_transformed_coordinates(maskX, maskY + h,
-						  pI830->transform[1],
-						  &mask_x[1], &mask_y[1]))
-		return;
-	    if (!i830_get_transformed_coordinates(maskX + w, maskY + h,
-						  pI830->transform[1],
-						  &mask_x[2], &mask_y[2]))
-		return;
-	    per_vertex += 2;	/* mask x/y */
-	} else {
-	    if (!i830_get_transformed_coordinates_3d(maskX, maskY,
-						     pI830->transform[1],
-						     &mask_x[0], &mask_y[0],
-						     &mask_w[0]))
-		return;
-	    if (!i830_get_transformed_coordinates_3d(maskX, maskY + h,
-						     pI830->transform[1],
-						     &mask_x[1], &mask_y[1],
-						     &mask_w[1]))
-		return;
-	    if (!i830_get_transformed_coordinates_3d(maskX + w, maskY + h,
-						     pI830->transform[1],
-						     &mask_x[2], &mask_y[2],
-						     &mask_w[2]))
-		return;
-	    per_vertex += 4;	/* mask x/y/z/w */
-	}
-    }
-
-    num_floats = 3 * per_vertex;
-    BEGIN_BATCH(6 + num_floats);
-
-    OUT_BATCH(MI_NOOP);
-    OUT_BATCH(MI_NOOP);
-    OUT_BATCH(MI_NOOP);
-    OUT_BATCH(MI_NOOP);
-    OUT_BATCH(MI_NOOP);
-
-    OUT_BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST | (num_floats-1));
-    OUT_BATCH_F(pI830->coord_adjust + dstX + w);
-    OUT_BATCH_F(pI830->coord_adjust + dstY + h);
-    OUT_BATCH_F(src_x[2] / pI830->scale_units[0][0]);
-    OUT_BATCH_F(src_y[2] / pI830->scale_units[0][1]);
-    if (!is_affine_src) {
-	OUT_BATCH_F(0.0);
-	OUT_BATCH_F(src_w[2]);
-    }
-    if (has_mask) {
-	OUT_BATCH_F(mask_x[2] / pI830->scale_units[1][0]);
-	OUT_BATCH_F(mask_y[2] / pI830->scale_units[1][1]);
-	if (!is_affine_mask) {
-	    OUT_BATCH_F(0.0);
-	    OUT_BATCH_F(mask_w[2]);
-	}
-    }
-
-    OUT_BATCH_F(pI830->coord_adjust + dstX);
-    OUT_BATCH_F(pI830->coord_adjust + dstY + h);
-    OUT_BATCH_F(src_x[1] / pI830->scale_units[0][0]);
-    OUT_BATCH_F(src_y[1] / pI830->scale_units[0][1]);
-    if (!is_affine_src) {
-	OUT_BATCH_F(0.0);
-	OUT_BATCH_F(src_w[1]);
-    }
-    if (has_mask) {
-	OUT_BATCH_F(mask_x[1] / pI830->scale_units[1][0]);
-	OUT_BATCH_F(mask_y[1] / pI830->scale_units[1][1]);
-	if (!is_affine_mask) {
-	    OUT_BATCH_F(0.0);
-	    OUT_BATCH_F(mask_w[1]);
-	}
-    }
-
-    OUT_BATCH_F(pI830->coord_adjust + dstX);
-    OUT_BATCH_F(pI830->coord_adjust + dstY);
-    OUT_BATCH_F(src_x[0] / pI830->scale_units[0][0]);
-    OUT_BATCH_F(src_y[0] / pI830->scale_units[0][1]);
-    if (!is_affine_src) {
-	OUT_BATCH_F(0.0);
-	OUT_BATCH_F(src_w[0]);
-    }
-    if (has_mask) {
-	OUT_BATCH_F(mask_x[0] / pI830->scale_units[1][0]);
-	OUT_BATCH_F(mask_y[0] / pI830->scale_units[1][1]);
-	if (!is_affine_mask) {
-	    OUT_BATCH_F(0.0);
-	    OUT_BATCH_F(mask_w[0]);
-	}
-    }
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	intel_batch_start_atomic(scrn, 58 +	/* invarient */
+				 22 +	/* setup */
+				 20 +	/* 2 * setup_texture */
+				 1 + 30 /* verts */ );
+
+	if (intel->needs_render_state_emit)
+		i830_emit_composite_state(scrn);
+
+	i830_emit_composite_primitive(dest, srcX, srcY, maskX, maskY, dstX,
+				      dstY, w, h);
+
+	intel_batch_end_atomic(scrn);
+}
+
+void i830_batch_flush_notify(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    ADVANCE_BATCH();
+	intel->needs_render_state_emit = TRUE;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_ring.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_ring.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_ring.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_ring.h	2011-02-08 11:14:00.000000000 +0100
@@ -33,13 +33,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define OUT_RING(n) do {						\
     if (I810_DEBUG & DEBUG_VERBOSE_RING)				\
 	ErrorF("OUT_RING 0x%08x: 0x%08x, (mask %x)\n",			\
-	       pI830->ring_next, (unsigned int)(n),			\
-	       pI830->ring.tail_mask);					\
-    *(volatile uint32_t *)(pI830->ring.virtual_start +			\
-			   pI830->ring_next) = n;			\
-    pI830->ring_used += 4;						\
-    pI830->ring_next += 4;						\
-    pI830->ring_next &= pI830->ring.tail_mask;				\
+	       intel->ring_next, (unsigned int)(n),			\
+	       intel->ring.tail_mask);					\
+    *(volatile uint32_t *)(intel->ring.virtual_start +			\
+			   intel->ring_next) = n;			\
+    intel->ring_used += 4;						\
+    intel->ring_next += 4;						\
+    intel->ring_next &= intel->ring.tail_mask;				\
 } while (0)
 
 #define OUT_RING_F(x) do {			\
@@ -49,43 +49,43 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 } while(0)
 
 #define ADVANCE_LP_RING() do {						\
-    if (pI830->ring_emitting == 0)					\
+    if (intel->ring_emitting == 0)					\
 	FatalError("%s: ADVANCE_LP_RING called with no matching "	\
 		   "BEGIN_LP_RING\n", __FUNCTION__);			\
-    if (pI830->ring_used > pI830->ring_emitting)			\
+    if (intel->ring_used > intel->ring_emitting)			\
 	FatalError("%s: ADVANCE_LP_RING: exceeded allocation %d/%d\n ",	\
-		   __FUNCTION__, pI830->ring_used,			\
-		   pI830->ring_emitting);				\
-    if (pI830->ring_used < pI830->ring_emitting)			\
+		   __FUNCTION__, intel->ring_used,			\
+		   intel->ring_emitting);				\
+    if (intel->ring_used < intel->ring_emitting)			\
 	FatalError("%s: ADVANCE_LP_RING: under-used allocation %d/%d\n ", \
-		   __FUNCTION__, pI830->ring_used,			\
-		   pI830->ring_emitting);				\
-    pI830->ring.tail = pI830->ring_next;				\
-    pI830->ring.space -= pI830->ring_used;				\
-    if (pI830->ring_next & 0x07)					\
+		   __FUNCTION__, intel->ring_used,			\
+		   intel->ring_emitting);				\
+    intel->ring.tail = intel->ring_next;				\
+    intel->ring.space -= intel->ring_used;				\
+    if (intel->ring_next & 0x07)					\
 	FatalError("%s: ADVANCE_LP_RING: "				\
 		   "ring_next (0x%x) isn't on a QWord boundary\n",	\
-		   __FUNCTION__, pI830->ring_next);			\
-    OUTREG(LP_RING + RING_TAIL, pI830->ring_next);			\
-    pI830->ring_emitting = 0;						\
+		   __FUNCTION__, intel->ring_next);			\
+    OUTREG(LP_RING + RING_TAIL, intel->ring_next);			\
+    intel->ring_emitting = 0;						\
 } while (0)
 
 #define BEGIN_LP_RING(n)						\
 do {									\
-    if (pI830->ring_emitting != 0)					\
+    if (intel->ring_emitting != 0)					\
 	FatalError("%s: BEGIN_LP_RING called without closing "		\
 		   "ADVANCE_LP_RING\n", __FUNCTION__);			\
     if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC))			\
-	i830_wait_ring_idle(pScrn);					\
-    pI830->ring_emitting = (n) * 4;					\
+	i830_wait_ring_idle(scrn);					\
+    intel->ring_emitting = (n) * 4;					\
     if ((n) & 1)							\
-	pI830->ring_emitting += 4;					\
-    if (pI830->ring.space < pI830->ring_emitting)			\
-	WaitRingFunc(pScrn, pI830->ring_emitting, 0);			\
-    pI830->ring_next = pI830->ring.tail;				\
+	intel->ring_emitting += 4;					\
+    if (intel->ring.space < intel->ring_emitting)			\
+	WaitRingFunc(scrn, intel->ring_emitting, 0);			\
+    intel->ring_next = intel->ring.tail;				\
     if (I810_DEBUG & DEBUG_VERBOSE_RING)				\
 	ErrorF( "BEGIN_LP_RING %d in %s\n", n, FUNCTION_NAME);		\
-    pI830->ring_used = 0;						\
+    intel->ring_used = 0;						\
     if ((n) & 1)							\
 	OUT_RING(MI_NOOP);						\
 } while (0)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.c	2011-02-08 11:14:00.000000000 +0100
@@ -91,6 +91,15 @@ struct i830_sdvo_priv {
      * This is set if we treat the device as HDMI, instead of DVI.
      */
     Bool is_hdmi;
+    /**
+     * This is set if we detect output of sdvo device as LVDS.
+     */
+    Bool is_lvds;
+    DisplayModePtr sdvo_lvds_fixed_mode;
+    /**
+     *This is set if output is LVDS or TV.
+     */
+    uint8_t sdvo_flags;
 
     /**
      * Returned SDTV resolutions allowed for the current format, if the
@@ -114,6 +123,9 @@ struct i830_sdvo_priv {
     /* Default 0 for full RGB range 0-255, 1 is for RGB range 16-235 */
     uint32_t broadcast_rgb;
 
+    /** This flag means if we should switch ddc bus before next i2c Start */
+    Bool ddc_bus_switch;
+
     /** State for save/restore */
     /** @{ */
     int save_sdvo_mult;
@@ -126,6 +138,9 @@ struct i830_sdvo_priv {
 
 static Atom broadcast_atom;
 
+static void
+i830_sdvo_dump(ScrnInfoPtr scrn);
+
 /**
  * Writes the SDVOB or SDVOC with the given value, but always writes both
  * SDVOB and SDVOC to work around apparent hardware issues (according to
@@ -133,10 +148,10 @@ static Atom broadcast_atom;
  */
 static void i830_sdvo_write_sdvox(xf86OutputPtr output, uint32_t val)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     uint32_t		    bval = val, cval = val;
     int			    i;
 
@@ -286,7 +301,7 @@ static void
 i830_sdvo_write_cmd(xf86OutputPtr output, uint8_t cmd, void *args,
 		    int args_len)
 {
-    I830Ptr pI830 = I830PTR(output->scrn);
+    intel_screen_private    *intel = intel_get_screen_private(output->scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
     int			    i;
@@ -295,7 +310,7 @@ i830_sdvo_write_cmd(xf86OutputPtr output
 	ErrorF ("Mismatch slave addr %x != %x\n", slaveAddr, dev_priv->d.SlaveAddr);
 
     /* Write the SDVO command logging */
-    if (pI830->debug_modes) {
+    if (intel->debug_modes) {
 	xf86DrvMsg(intel_output->pI2CBus->scrnIndex, X_INFO, "%s: W: %02X ",
 		   SDVO_NAME(dev_priv), cmd);
 	for (i = 0; i < args_len; i++)
@@ -339,7 +354,7 @@ static const char *cmd_status_names[] =
 static uint8_t
 i830_sdvo_read_response(xf86OutputPtr output, void *response, int response_len)
 {
-    I830Ptr pI830 = I830PTR(output->scrn);
+    intel_screen_private    *intel = intel_get_screen_private(output->scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     int			    i;
     uint8_t		    status;
@@ -356,7 +371,7 @@ i830_sdvo_read_response(xf86OutputPtr ou
     	i830_sdvo_read_byte(output, SDVO_I2C_CMD_STATUS, &status);
 
     	/* Write the SDVO command logging */
-    	if (pI830->debug_modes) {
+    	if (intel->debug_modes) {
 	    xf86DrvMsg(intel_output->pI2CBus->scrnIndex, X_INFO,
 		   "%s: R: ", SDVO_NAME(SDVO_PRIV(intel_output)));
 	    for (i = 0; i < response_len; i++)
@@ -380,7 +395,7 @@ i830_sdvo_read_response(xf86OutputPtr ou
     return status;
 }
 
-int
+static int
 i830_sdvo_get_pixel_multiplier(DisplayModePtr pMode)
 {
     if (pMode->Clock >= 100000)
@@ -604,6 +619,8 @@ static Bool
 i830_sdvo_create_preferred_input_timing(xf86OutputPtr output, uint16_t clock,
 					uint16_t width, uint16_t height)
 {
+    I830OutputPrivatePtr    intel_output = output->driver_private;
+    struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
     struct i830_sdvo_preferred_input_timing_args args;
     uint8_t status;
 
@@ -612,7 +629,11 @@ i830_sdvo_create_preferred_input_timing(
     args.width = width;
     args.height = height;
     args.interlace = 0;
-    args.scaled = 0;
+    if (dev_priv->is_lvds &&
+        (dev_priv->sdvo_lvds_fixed_mode->HDisplay != width ||
+        (dev_priv->sdvo_lvds_fixed_mode->VDisplay != height)))
+        args.scaled = 1;
+
     i830_sdvo_write_cmd(output, SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING,
 			&args, sizeof(args));
     status = i830_sdvo_read_response(output, NULL, 0);
@@ -973,7 +994,7 @@ static void i830_sdvo_set_avi_infoframe(
 static void
 i830_sdvo_set_tv_format(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
+    ScrnInfoPtr scrn = output->scrn;
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct i830_sdvo_priv *dev_priv = intel_output->dev_priv;
     struct i830_sdvo_tv_format *format, unset;
@@ -982,7 +1003,7 @@ i830_sdvo_set_tv_format(xf86OutputPtr ou
     format = &dev_priv->tv_format;
     memset(&unset, 0, sizeof(unset));
     if (memcmp(format, &unset, sizeof(*format))) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "%s: Choosing default TV format of NTSC-M\n",
 		   SDVO_NAME(dev_priv));
 	format->ntsc_m = 1;
@@ -990,7 +1011,7 @@ i830_sdvo_set_tv_format(xf86OutputPtr ou
 		sizeof(*format));
 	status = i830_sdvo_read_response(output, NULL, 0);
 	if (status != SDVO_CMD_STATUS_SUCCESS)
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		    "%s: Fail to set TV format\n", SDVO_NAME(dev_priv));
     }
 }
@@ -1002,12 +1023,7 @@ i830_sdvo_mode_fixup(xf86OutputPtr outpu
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
 
-    if (!dev_priv->is_tv) {
-	/* Make the CRTC code factor in the SDVO pixel multiplier.  The SDVO
-	 * device will be told of the multiplier during mode_set.
-	 */
-	adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(mode);
-    } else {
+    if (dev_priv->is_tv) {
 	struct i830_sdvo_dtd output_dtd;
 	Bool success;
 
@@ -1028,7 +1044,6 @@ i830_sdvo_mode_fixup(xf86OutputPtr outpu
 	/* Set the input timing to the screen. Assume always input 0. */
 	i830_sdvo_set_target_input(output, TRUE, FALSE);
 
-
 	success = i830_sdvo_create_preferred_input_timing(output,
 							  mode->Clock / 10,
 							  mode->HDisplay,
@@ -1039,6 +1054,7 @@ i830_sdvo_mode_fixup(xf86OutputPtr outpu
 	    i830_sdvo_get_preferred_input_timing(output, &input_dtd);
 
 	    i830_sdvo_get_mode_from_dtd(adjusted_mode, &input_dtd);
+	    dev_priv->sdvo_flags = input_dtd.part2.sdvo_flags;
 
 	    xf86SetModeCrtc(adjusted_mode, 0);
 
@@ -1054,7 +1070,47 @@ i830_sdvo_mode_fixup(xf86OutputPtr outpu
 	} else {
 	    return FALSE;
 	}
-    }
+    } else if (dev_priv->is_lvds) {
+        struct i830_sdvo_dtd output_dtd;
+        Bool success;
+
+        /* Set output timings */
+        i830_sdvo_get_dtd_from_mode(&output_dtd,
+                                    dev_priv->sdvo_lvds_fixed_mode);
+        i830_sdvo_set_target_output(output, dev_priv->controlled_output);
+        i830_sdvo_set_output_timing(output, &output_dtd);
+
+        /* Set the input timing to the screen. Assume always input 0. */
+        i830_sdvo_set_target_input(output, TRUE, FALSE);
+
+
+        success = i830_sdvo_create_preferred_input_timing(output,
+                                                          mode->Clock / 10,
+                                                          mode->HDisplay,
+                                                          mode->VDisplay);
+        if (success) {
+            struct i830_sdvo_dtd input_dtd;
+
+            i830_sdvo_get_preferred_input_timing(output, &input_dtd);
+
+            i830_sdvo_get_mode_from_dtd(adjusted_mode, &input_dtd);
+            dev_priv->sdvo_flags = input_dtd.part2.sdvo_flags;
+
+            xf86SetModeCrtc(adjusted_mode, 0);
+
+            /* adjust origin mode's clock for current input,
+              for correct pixel mulitiplier setting. */
+            mode->Clock = adjusted_mode->Clock;
+
+            /* Clock range is required to be in 100-200Mhz */
+            adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(mode);
+        } else
+            return FALSE;
+    } else
+	/* Make the CRTC code factor in the SDVO pixel multiplier.  The SDVO
+	 * device will be told of the multiplier during mode_set.
+	 */
+	adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(mode);
 
     return TRUE;
 }
@@ -1063,8 +1119,8 @@ static void
 i830_sdvo_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 		   DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
     xf86CrtcPtr	    crtc = output->crtc;
@@ -1098,9 +1154,10 @@ i830_sdvo_mode_set(xf86OutputPtr output,
 
     /* We have tried to get input timing in mode_fixup, and filled into
        adjusted_mode */
-    if (dev_priv->is_tv)
+    if (dev_priv->is_tv || dev_priv->is_lvds) {
 	i830_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode);
-    else
+        input_dtd.part2.sdvo_flags = dev_priv->sdvo_flags;
+    } else
 	i830_sdvo_get_dtd_from_mode(&input_dtd, mode);
 
     /* If it's a TV, we already set the output timing in mode_fixup.
@@ -1113,7 +1170,7 @@ i830_sdvo_mode_set(xf86OutputPtr output,
     if (dev_priv->is_tv)
 	i830_sdvo_set_tv_format(output);
 
-    if (!dev_priv->is_tv) {
+    if (!dev_priv->is_tv && !dev_priv->is_lvds) {
 	/* Set the output timing to the screen */
 	i830_sdvo_set_output_timing(output, &input_dtd);
     }
@@ -1149,7 +1206,7 @@ i830_sdvo_mode_set(xf86OutputPtr output,
     }
 
     /* Set the SDVO control regs. */
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel)) {
 	sdvox |= SDVO_BORDER_ENABLE |
 		SDVO_VSYNC_ACTIVE_HIGH |
 		SDVO_HSYNC_ACTIVE_HIGH;
@@ -1169,24 +1226,29 @@ i830_sdvo_mode_set(xf86OutputPtr output,
 	sdvox |= SDVO_PIPE_B_SELECT;
 
     sdvo_pixel_multiply = i830_sdvo_get_pixel_multiplier(mode);
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel)) {
 	/* done in crtc_mode_set as the dpll_md reg must be written early */
-    } else if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_G33CLASS(pI830)) {
+    } else if (IS_I945G(intel) || IS_I945GM(intel) || IS_G33CLASS(intel)) {
 	/* done in crtc_mode_set as it lives inside the dpll register */
     } else {
 	sdvox |= (sdvo_pixel_multiply - 1) << SDVO_PORT_MULTIPLY_SHIFT;
     }
+    if (dev_priv->sdvo_flags & SDVO_STALL_FLAG)
+        sdvox |= SDVO_STALL_SELECT;
 
     i830_sdvo_write_sdvox(output, sdvox);
+
+    if (0)
+	i830_sdvo_dump(scrn);
 }
 
 static void
 i830_sdvo_dpms(xf86OutputPtr output, int mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     uint32_t  temp;
 
     if (mode != DPMSModeOn) {
@@ -1209,13 +1271,13 @@ i830_sdvo_dpms(xf86OutputPtr output, int
 	if ((temp & SDVO_ENABLE) == 0)
 	    i830_sdvo_write_sdvox(output, temp | SDVO_ENABLE);
 	for (i = 0; i < 2; i++)
-	    i830WaitForVblank(pScrn);
+	    i830WaitForVblank(scrn);
 
 	status = i830_sdvo_get_trained_inputs(output, &input1, &input2);
 
 	/* Warn if the device reported failure to sync. */
 	if (status == SDVO_CMD_STATUS_SUCCESS && !input1) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		       "First %s output reported failure to sync\n",
 		       SDVO_NAME(dev_priv));
 	}
@@ -1229,10 +1291,10 @@ i830_sdvo_dpms(xf86OutputPtr output, int
 static void
 i830_sdvo_save(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     int			    o;
 
     /* XXX: We should save the in/out mapping. */
@@ -1267,7 +1329,7 @@ i830_sdvo_save(xf86OutputPtr output)
 static void
 i830_sdvo_restore(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
     int			    o;
@@ -1306,10 +1368,10 @@ i830_sdvo_restore(xf86OutputPtr output)
     if (dev_priv->save_SDVOX & SDVO_ENABLE)
     {
 	for (i = 0; i < 2; i++)
-	    i830WaitForVblank(pScrn);
+	    i830WaitForVblank(scrn);
 	status = i830_sdvo_get_trained_inputs(output, &input1, &input2);
 	if (status == SDVO_CMD_STATUS_SUCCESS && !input1)
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		       "First %s output reported failure to sync\n",
 		       SDVO_NAME(dev_priv));
     }
@@ -1331,6 +1393,16 @@ i830_sdvo_mode_valid(xf86OutputPtr outpu
 
     if (dev_priv->pixel_clock_max < pMode->Clock)
 	return MODE_CLOCK_HIGH;
+    if (dev_priv->is_lvds) {
+        if (dev_priv->sdvo_lvds_fixed_mode == NULL)
+            return MODE_PANEL;
+
+        if (pMode->HDisplay > dev_priv->sdvo_lvds_fixed_mode->HDisplay)
+            return MODE_PANEL;
+
+        if (pMode->VDisplay > dev_priv->sdvo_lvds_fixed_mode->VDisplay)
+            return MODE_PANEL;
+    }
 
     return MODE_OK;
 }
@@ -1397,7 +1469,10 @@ i830_sdvo_ddc_i2c_start(I2CBusPtr b, int
     I2CBusPtr		    i2cbus = intel_output->pI2CBus;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
 
-    i830_sdvo_set_control_bus_switch(output, dev_priv->ddc_bus);
+    if (dev_priv->ddc_bus_switch) {
+        i830_sdvo_set_control_bus_switch(output, dev_priv->ddc_bus);
+        dev_priv->ddc_bus_switch = FALSE;
+    }
     return i2cbus->I2CStart(i2cbus, timeout);
 }
 
@@ -1408,11 +1483,13 @@ i830_sdvo_ddc_i2c_stop(I2CDevPtr d)
     xf86OutputPtr	    output = d->pI2CBus->DriverPrivate.ptr;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     I2CBusPtr		    i2cbus = intel_output->pI2CBus, savebus;
+    struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
 
     savebus = d->pI2CBus;
     d->pI2CBus = i2cbus;
     i2cbus->I2CStop(d);
     d->pI2CBus = savebus;
+    dev_priv->ddc_bus_switch = TRUE;
 }
 
 /**
@@ -1492,10 +1569,10 @@ i830_sdvo_dump_device(xf86OutputPtr outp
     i830_sdvo_dump_hdmi_buf(output);
 }
 
-void
-i830_sdvo_dump(ScrnInfoPtr pScrn)
+static void
+i830_sdvo_dump(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     int	i;
 
     for (i = 0; i < xf86_config->num_output; i++) 
@@ -1536,6 +1613,36 @@ i830_sdvo_check_hdmi_encode (xf86OutputP
 	return FALSE;
 }
 
+/* This function will try to fetch native modes for sdvo lvds output*/
+static DisplayModePtr i830_sdvo_lvds_fetch_modes(xf86OutputPtr  output)
+{
+    I830OutputPrivatePtr intel_output =output->driver_private;
+    struct i830_sdvo_priv *dev_priv = intel_output->dev_priv;
+    intel_screen_private    *intel = intel_get_screen_private(output->scrn);
+    DisplayModePtr          modes;
+
+    /*
+     * Attempt to get the mode list from DDC.
+     * Assume that the preferred modes are
+     * arranged in priority order,
+     */
+    modes = i830_ddc_get_modes(output);
+    if (modes != NULL)
+        goto end;
+
+    if (intel->sdvo_lvds_fixed_mode != NULL)
+        modes = xf86DuplicateModes(output->scrn, intel->sdvo_lvds_fixed_mode);
+
+end:
+    /* Guarantee the the first preferred mode is chosen by xserver */
+    if (modes != NULL) {
+        dev_priv->sdvo_lvds_fixed_mode = xf86DuplicateMode(modes);
+        modes->type |= (M_T_DRIVER | M_T_PREFERRED);
+        xf86SetModeCrtc(dev_priv->sdvo_lvds_fixed_mode, 0);
+    }
+    return modes;
+}
+
 static void i830_sdvo_select_ddc_bus(struct i830_sdvo_priv *dev_priv);
 
 static Bool
@@ -1554,6 +1661,7 @@ i830_sdvo_output_setup (xf86OutputPtr ou
     /* clear up privates */
     dev_priv->is_tv = FALSE;
     intel_output->needs_tv_clock = FALSE;
+    dev_priv->is_lvds = FALSE;
 
     if (flag & (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1))
     {
@@ -1594,14 +1702,14 @@ i830_sdvo_output_setup (xf86OutputPtr ou
 	dev_priv->controlled_output = SDVO_OUTPUT_RGB1;
 	output->subpixel_order = SubPixelHorizontalRGB;
 	name_prefix="VGA";
-    } else if (flag & SDVO_OUTPUT_LVDS0) {
-	dev_priv->controlled_output = SDVO_OUTPUT_LVDS0;
-	output->subpixel_order = SubPixelHorizontalRGB;
-	name_prefix="LVDS";
-    } else if (flag & SDVO_OUTPUT_LVDS1) {
-	dev_priv->controlled_output = SDVO_OUTPUT_LVDS1;
-	output->subpixel_order = SubPixelHorizontalRGB;
-	name_prefix="LVDS";
+    } else if (flag & (SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_LVDS1)) {
+        if (flag & SDVO_OUTPUT_LVDS0)
+            dev_priv->controlled_output = SDVO_OUTPUT_LVDS0;
+        else
+            dev_priv->controlled_output = SDVO_OUTPUT_LVDS1;
+        output->subpixel_order = SubPixelHorizontalRGB;
+        name_prefix="LVDS";
+        dev_priv->is_lvds = TRUE;
     } else {
 	unsigned char	bytes[2];
 
@@ -1615,7 +1723,7 @@ i830_sdvo_output_setup (xf86OutputPtr ou
     }
 
     /* if exist origin name it will be freed in xf86OutputRename() */
-    dev_priv->name = xalloc(strlen(name_prefix) + strlen(name_suffix) + 1);
+    dev_priv->name = malloc(strlen(name_prefix) + strlen(name_suffix) + 1);
     strcpy (dev_priv->name, name_prefix);
     strcat (dev_priv->name, name_suffix);
 
@@ -1632,11 +1740,11 @@ i830_sdvo_output_setup (xf86OutputPtr ou
     if (output->randr_output) {
 	int nameLength = strlen(dev_priv->name);
 	RROutputPtr randr_output = output->randr_output;
-	char *name = xalloc(nameLength + 1);
+	char *name = malloc(nameLength + 1);
 
 	if (name) {
 	    if (randr_output->name != (char *) (randr_output + 1))
-		xfree(randr_output->name);
+		free(randr_output->name);
 	    randr_output->name = name;
 	    randr_output->nameLength = nameLength;
 	    memcpy(randr_output->name, dev_priv->name, nameLength);
@@ -1715,13 +1823,12 @@ i830_sdvo_detect(xf86OutputPtr output)
     {
 	xf86MonPtr edid_mon;
 	/* Check EDID in DVI-I case */
-	i830_sdvo_set_control_bus_switch(output, dev_priv->ddc_bus);
 	edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
 	if (edid_mon && !DIGITAL(edid_mon->features.input_type)) {
-	    xfree(edid_mon);
+	    free(edid_mon);
 	    return XF86OutputStatusDisconnected;
 	}
-	xfree(edid_mon);
+	free(edid_mon);
     }
     return XF86OutputStatusConnected;
 }
@@ -1729,15 +1836,19 @@ i830_sdvo_detect(xf86OutputPtr output)
 static DisplayModePtr
 i830_sdvo_get_ddc_modes(xf86OutputPtr output)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     DisplayModePtr modes = NULL;
     xf86OutputPtr crt;
-    I830OutputPrivatePtr intel_output;
+    I830OutputPrivatePtr intel_output =output->driver_private;
     xf86MonPtr edid_mon = NULL;
-    struct i830_sdvo_priv *dev_priv;
+    struct i830_sdvo_priv *dev_priv = intel_output->dev_priv;
+
+    if (dev_priv->is_lvds)
+        modes = i830_sdvo_lvds_fetch_modes(output);
+    else
+        modes = i830_ddc_get_modes(output);
 
-    modes = i830_ddc_get_modes(output);
     if (modes != NULL)
 	goto check_hdmi;
 
@@ -1750,7 +1861,7 @@ i830_sdvo_get_ddc_modes(xf86OutputPtr ou
     intel_output = crt->driver_private;
     if (intel_output->type == I830_OUTPUT_ANALOG &&
 	crt->funcs->detect(crt) == XF86OutputStatusDisconnected) {
-	I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOA, "CRTDDC_A");
+	I830I2CInit(scrn, &intel_output->pDDCBus, GPIOA, "CRTDDC_A");
 	edid_mon = xf86OutputGetEDID(crt, intel_output->pDDCBus);
 	xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
     }
@@ -1761,9 +1872,6 @@ i830_sdvo_get_ddc_modes(xf86OutputPtr ou
 
 check_hdmi:
     /* Check if HDMI encode, setup it and set the flag for HDMI audio */
-    intel_output = output->driver_private;
-    dev_priv = intel_output->dev_priv;
-
     if (dev_priv->caps.output_flags & (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1))
     {
 	if (!i830_sdvo_check_hdmi_encode(output)) {
@@ -1790,7 +1898,7 @@ i830_sdvo_get_tv_mode(DisplayModePtr *he
 {
     DisplayModePtr mode;
 
-    mode = xcalloc(1, sizeof(*mode));
+    mode = calloc(1, sizeof(*mode));
     if (mode == NULL)
 	return;
 
@@ -1906,15 +2014,20 @@ i830_sdvo_destroy (xf86OutputPtr output)
 	xf86DestroyI2CBusRec (intel_output->pDDCBus, FALSE, FALSE);
 	xf86DestroyI2CDevRec (&dev_priv->d, FALSE);
 	xf86DestroyI2CBusRec (dev_priv->d.pI2CBus, TRUE, TRUE);
+	free(dev_priv->name);
 
 	if (output->randr_output) {
 	    RROutputPtr	randr_output = output->randr_output;
 	    if (randr_output->name &&
 		    randr_output->name != (char *) (randr_output + 1))
-		xfree(randr_output->name);
+		free(randr_output->name);
 	}
 
-	xfree (intel_output);
+	if (dev_priv->sdvo_lvds_fixed_mode)
+		xf86DeleteMode(&dev_priv->sdvo_lvds_fixed_mode,
+			dev_priv->sdvo_lvds_fixed_mode);
+
+	free (intel_output);
     }
 }
 
@@ -1922,30 +2035,30 @@ i830_sdvo_destroy (xf86OutputPtr output)
 static xf86CrtcPtr
 i830_sdvo_get_crtc(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct i830_sdvo_priv *dev_priv = intel_output->dev_priv;
     int pipe = !!(INREG(dev_priv->output_device) & SDVO_PIPE_B_SELECT);
    
-    return i830_pipe_to_crtc(pScrn, pipe);
+    return i830_pipe_to_crtc(scrn, pipe);
 }
 #endif
 
 static void
 i830_sdvo_create_resources(xf86OutputPtr output)
 {
-    ScrnInfoPtr                 pScrn = output->scrn;
-    I830Ptr                     pI830 = I830PTR(pScrn);
+    ScrnInfoPtr                 scrn = output->scrn;
+    intel_screen_private        *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr        intel_output = output->driver_private;
     struct i830_sdvo_priv       *dev_priv = intel_output->dev_priv;
     INT32			broadcast_range[2];
     int                         err;
 
     /* only R G B are 8bit color mode */
-    if (pScrn->depth != 24 ||
+    if (scrn->depth != 24 ||
         /* only 965G and G4X platform */
-        !(IS_I965G(pI830) || IS_G4X(pI830)) ||
+        !(IS_I965G(intel) || IS_G4X(intel)) ||
         /* only TMDS encoding */
         !(strstr(output->name, "TMDS") || strstr(output->name, "HDMI")))
         return;
@@ -1959,7 +2072,7 @@ i830_sdvo_create_resources(xf86OutputPtr
                                     broadcast_atom,
                                     FALSE, TRUE, FALSE, 2, broadcast_range);
     if (err != 0) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+        xf86DrvMsg(scrn->scrnIndex, X_ERROR,
                    "RRConfigureOutputProperty error, %d\n", err);
         return;
     }
@@ -1971,7 +2084,7 @@ i830_sdvo_create_resources(xf86OutputPtr
                                  1, &dev_priv->broadcast_rgb,
                                  FALSE, TRUE);
     if (err != 0) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+        xf86DrvMsg(scrn->scrnIndex, X_ERROR,
                    "RRChangeOutputProperty error, %d\n", err);
         return;
     }
@@ -1981,8 +2094,8 @@ static Bool
 i830_sdvo_set_property(xf86OutputPtr output, Atom property,
 		       RRPropertyValuePtr value)
 {
-    ScrnInfoPtr             pScrn = output->scrn;
-    I830Ptr                 pI830 = I830PTR(pScrn);
+    ScrnInfoPtr             scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_sdvo_priv   *dev_priv = intel_output->dev_priv;
     uint32_t temp;
@@ -2090,10 +2203,72 @@ i830_sdvo_select_ddc_bus(struct i830_sdv
     /* Corresponds to SDVO_CONTROL_BUS_DDCx */
     dev_priv->ddc_bus = 1 << num_bits;
 }
+/**
+ * find the slave address for the given SDVO port based on the info
+ * parsed in general definition blocks
+ * If the slave address is found in the SDVO device info parsed from
+ * VBT,it will be returned. Otherwise it will return the slave address
+ * by the following steps.
+ * and 0x72 for SDVOC port.
+ * a. If one SDVO device info is found in another DVO port, it will return
+ * the slave address that is not used. For example: if 0x70 is used,
+ * then 0x72 is returned.
+ * b. If no SDVO device info is found in another DVO port, it will return
+ * 0x70 for SDVOB and 0x72 for SDVOC port.
+ */
+static
+void i830_find_sdvo_slave(ScrnInfoPtr scrn, int output_device,
+			  uint8_t *slave_addr)
+{
+    uint8_t temp_slave_addr;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    uint8_t dvo_port, dvo2_port;
+    struct sdvo_device_mapping *p_mapping;
 
+    if (output_device == SDVOB) {
+	/* DEVICE_PORT_DVOB */
+	dvo_port = 0;
+	dvo2_port = 1;
+    } else {
+	/* DEVICE_POTR_DVOC */
+	dvo_port = 1;
+	dvo2_port = 0;
+    }
+
+    p_mapping = &(intel->sdvo_mappings[dvo_port]);
+    temp_slave_addr = p_mapping->slave_addr;
+    if (temp_slave_addr) {
+	/* slave address is found . return it */
+	*slave_addr = temp_slave_addr;
+	return ;
+    }
+    /* Check whether the SDVO device info is found in another dvo port */
+    p_mapping = &(intel->sdvo_mappings[dvo2_port]);
+    temp_slave_addr = p_mapping->slave_addr;
+    if (!temp_slave_addr) {
+	/* no SDVO device is found in another DVO port */
+	/* it will return 0x70 for SDVOB and 0x72 for SDVOC */
+	if (output_device == SDVOB)
+		temp_slave_addr = 0x70;
+	else
+		temp_slave_addr = 0x72;
+	*slave_addr = temp_slave_addr;
+	return ;
+    }
+    /* return the slave address that is not used.
+     * If the 0x70 is used, then 0x72 is returned.
+     * If the 0x72 is used, then 0x70 is returned.
+     */
+    if (temp_slave_addr == 0x70)
+	temp_slave_addr = 0x72;
+    else
+	temp_slave_addr = 0x70;
 
+    *slave_addr = temp_slave_addr;
+    return ;
+}
 Bool
-i830_sdvo_init(ScrnInfoPtr pScrn, int output_device)
+i830_sdvo_init(ScrnInfoPtr scrn, int output_device)
 {
     xf86OutputPtr	    output;
     I830OutputPrivatePtr    intel_output;
@@ -2101,8 +2276,12 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int ou
     int			    i;
     unsigned char	    ch[0x40];
     I2CBusPtr		    i2cbus = NULL, ddcbus;
+    uint8_t slave_addr;
 
-    output = xf86OutputCreate (pScrn, &i830_sdvo_output_funcs,NULL);
+    slave_addr = 0;
+    i830_find_sdvo_slave(scrn, output_device, &slave_addr);
+
+    output = xf86OutputCreate (scrn, &i830_sdvo_output_funcs,NULL);
     if (!output)
 	return FALSE;
     intel_output = xnfcalloc (sizeof (I830OutputPrivateRec) +
@@ -2127,30 +2306,28 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int ou
      * with tracking refcounting ourselves, since the XFree86 DDX bits don't.
      */
     if (output_device == SDVOB)
-	I830I2CInit(pScrn, &i2cbus, GPIOE, "SDVOCTRL_E for SDVOB");
+	I830I2CInit(scrn, &i2cbus, GPIOE, "SDVOCTRL_E for SDVOB");
     else
-	I830I2CInit(pScrn, &i2cbus, GPIOE, "SDVOCTRL_E for SDVOC");
+	I830I2CInit(scrn, &i2cbus, GPIOE, "SDVOCTRL_E for SDVOC");
 
     if (i2cbus == NULL)
     {
 	xf86OutputDestroy (output);
 	return FALSE;
     }
-
     if (output_device == SDVOB) {
 	dev_priv->d.DevName = "SDVO Controller B";
-	dev_priv->d.SlaveAddr = 0x70;
     } else {
 	dev_priv->d.DevName = "SDVO Controller C";
-	dev_priv->d.SlaveAddr = 0x72;
     }
+    dev_priv->d.SlaveAddr = slave_addr;
     dev_priv->d.pI2CBus = i2cbus;
     dev_priv->d.DriverPrivate.ptr = output;
     dev_priv->output_device = output_device;
 
     if (!xf86I2CDevInit(&dev_priv->d)) 
     {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "Failed to initialize %s I2C device\n",
 		   SDVO_NAME(dev_priv));
 	xf86OutputDestroy (output);
@@ -2162,7 +2339,7 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int ou
     /* Read the regs to test if we can talk to the device */
     for (i = 0; i < 0x40; i++) {
 	if (!i830_sdvo_read_byte_quiet(output, i, &ch[i])) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "No SDVO device found on SDVO%c\n",
 		       output_device == SDVOB ? 'B' : 'C');
 	    xf86OutputDestroy (output);
@@ -2192,6 +2369,7 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int ou
     ddcbus->I2CStop = i830_sdvo_ddc_i2c_stop;
     ddcbus->I2CAddress = i830_sdvo_ddc_i2c_address;
     ddcbus->DriverPrivate.ptr = output;
+    dev_priv->ddc_bus_switch = TRUE;
     
     if (!xf86I2CBusInit(ddcbus)) 
     {
@@ -2205,7 +2383,7 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int ou
 
     if (!i830_sdvo_get_capabilities(output, &dev_priv->caps))
     {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "Failed to get %s capabilities\n",
 		   SDVO_NAME(dev_priv));
 	xf86OutputDestroy (output);
@@ -2221,7 +2399,7 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int ou
     i830_sdvo_get_input_pixel_clock_range(output, &dev_priv->pixel_clock_min,
 					  &dev_priv->pixel_clock_max);
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 	       "%s: device VID/DID: %02X:%02X.%02X, "
 	       "clock range %.1fMHz - %.1fMHz\n",
 	       SDVO_NAME(dev_priv),
@@ -2230,14 +2408,14 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int ou
 	       dev_priv->pixel_clock_min / 1000.0,
 	       dev_priv->pixel_clock_max / 1000.0);
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 	       "%s: %d input channel%s\n",
 	       SDVO_NAME(dev_priv), dev_priv->caps.sdvo_input_count,
 	       dev_priv->caps.sdvo_input_count >= 2 ? "s" : "");
 
 #define REPORT_OUTPUT_FLAG(flag, name) do {				\
     if (dev_priv->caps.output_flags & flag) {				\
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s: %s output reported\n", \
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "%s: %s output reported\n", \
 		   SDVO_NAME(dev_priv), name);				\
     }									\
 } while (0)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.h	2008-08-02 07:12:35.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo.h	2011-02-08 11:14:00.000000000 +0100
@@ -26,10 +26,4 @@
  */
 
 Bool
-i830_sdvo_init(ScrnInfoPtr pScrn, int output_device);
-
-int
-i830_sdvo_get_pixel_multiplier(DisplayModePtr pMode);
-
-void
-i830_sdvo_dump(ScrnInfoPtr pScrn);
+i830_sdvo_init(ScrnInfoPtr scrn, int output_device);
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo_regs.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo_regs.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo_regs.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_sdvo_regs.h	2011-02-08 11:14:00.000000000 +0100
@@ -722,3 +722,5 @@ struct i830_sdvo_encode{
     uint8_t dvi_rev;
     uint8_t hdmi_rev;
 } __attribute__ ((packed));
+
+#define SDVO_STALL_FLAG (1 << 7)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_tv.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_tv.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_tv.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_tv.c	2011-02-08 11:14:00.000000000 +0100
@@ -779,8 +779,8 @@ static const color_conversion_t hdtv_com
 static void
 i830_tv_dpms(xf86OutputPtr output, int mode)
 {
-    ScrnInfoPtr pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
 
     switch(mode) {
 	case DPMSModeOn:
@@ -792,14 +792,14 @@ i830_tv_dpms(xf86OutputPtr output, int m
 	    OUTREG(TV_CTL, INREG(TV_CTL) & ~TV_ENC_ENABLE);
 	    break;
     }
-    i830WaitForVblank(pScrn);
+    i830WaitForVblank(scrn);
 }
 
 static void
 i830_tv_save(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_tv_priv	    *dev_priv = intel_output->dev_priv;
     int			    i;
@@ -848,8 +848,8 @@ i830_tv_save(xf86OutputPtr output)
 static void
 i830_tv_restore(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_tv_priv	    *dev_priv = intel_output->dev_priv;
     int			    i;
@@ -893,14 +893,14 @@ i830_tv_restore(xf86OutputPtr output)
 	/* Flush the plane changes */
 	OUTREG(dspbase_reg, INREG(dspbase_reg));
 
-	if (!IS_I9XX(pI830)) {
+	if (!IS_I9XX(intel)) {
 	    /* Wait for vblank for the disable to take effect */
-	    i830WaitForVblank(pScrn);
+	    i830WaitForVblank(scrn);
 	}
 
 	OUTREG(pipeconf_reg, pipeconf & ~PIPEACONF_ENABLE);
 	/* Wait for vblank for the disable to take effect. */
-	i830WaitForVblank(pScrn);
+	i830WaitForVblank(scrn);
 
 	/* Filter ctl must be set before TV_WIN_SIZE */
 	OUTREG(TV_FILTER_CTL_1, dev_priv->save_TV_FILTER_CTL_1);
@@ -925,7 +925,7 @@ i830_tv_restore(xf86OutputPtr output)
 
     OUTREG(TV_DAC, dev_priv->save_TV_DAC);
     OUTREG(TV_CTL, dev_priv->save_TV_CTL);
-    i830WaitForVblank(pScrn);
+    i830WaitForVblank(scrn);
 }
 
 static const tv_mode_t *
@@ -967,8 +967,8 @@ static Bool
 i830_tv_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 		DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr		pScrn = output->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    ScrnInfoPtr		scrn = output->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     int			i;
     const tv_mode_t	*tv_mode = i830_tv_mode_find (output);
 
@@ -1056,7 +1056,7 @@ float_to_fix_2_6(float f)
 }
 
 static void
-i830_tv_update_brightness(I830Ptr pI830, uint8_t brightness)
+i830_tv_update_brightness(intel_screen_private *intel, uint8_t brightness)
 {
     /* brightness in 2's comp value */
     uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_BRIGHTNESS_MASK;
@@ -1067,13 +1067,13 @@ i830_tv_update_brightness(I830Ptr pI830,
 }
 
 static void
-i830_tv_update_contrast(I830Ptr pI830, uint8_t contrast)
+i830_tv_update_contrast(intel_screen_private *intel, uint8_t contrast)
 {
     uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_CONTRAST_MASK;;
     float con;
     uint8_t c;
 
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel)) {
 	/* 2.6 fixed point */
 	con = 3.0 * ((float) contrast / 255);
 	c = float_to_fix_2_6(con);
@@ -1087,14 +1087,14 @@ i830_tv_update_contrast(I830Ptr pI830, u
 }
 
 static void
-i830_tv_update_saturation(I830Ptr pI830, uint8_t saturation)
+i830_tv_update_saturation(intel_screen_private *intel, uint8_t saturation)
 {
     uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_SATURATION_MASK;
     float sat;
     uint8_t s;
 
     /* same as contrast */
-    if (IS_I965G(pI830)) {
+    if (IS_I965G(intel)) {
 	sat = 3.0 * ((float) saturation / 255);
 	s = float_to_fix_2_6(sat);
     } else {
@@ -1106,7 +1106,7 @@ i830_tv_update_saturation(I830Ptr pI830,
 }
 
 static void
-i830_tv_update_hue(I830Ptr pI830, uint8_t hue)
+i830_tv_update_hue(intel_screen_private *intel, uint8_t hue)
 {
     uint32_t val = INREG(TV_CLR_KNOBS) & ~TV_HUE_MASK;
 
@@ -1118,8 +1118,8 @@ static void
 i830_tv_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 		DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     xf86CrtcPtr	    crtc = output->crtc;
     I830OutputPrivatePtr    intel_output = output->driver_private;
     I830CrtcPrivatePtr	    intel_crtc = crtc->driver_private;
@@ -1235,7 +1235,7 @@ i830_tv_mode_set(xf86OutputPtr output, D
 	tv_mode->dda3_inc << TV_SCDDA3_INC_SHIFT;
 
     /* Enable two fixes for the chips that need them. */
-    if (DEVICE_ID(pI830->PciInfo) < PCI_CHIP_I945_G)
+    if (DEVICE_ID(intel->PciInfo) < PCI_CHIP_I945_G)
 	tv_ctl |= TV_ENC_C0_FIX | TV_ENC_SDP_FIX;
 
     OUTREG(TV_H_CTL_1, hctl1);
@@ -1290,14 +1290,14 @@ i830_tv_mode_set(xf86OutputPtr output, D
 	/* Flush the plane changes */
 	OUTREG(dspbase_reg, INREG(dspbase_reg));
 
-	if (!IS_I9XX(pI830)) {
+	if (!IS_I9XX(intel)) {
 	    /* Wait for vblank for the disable to take effect */
-	    i830WaitForVblank(pScrn);
+	    i830WaitForVblank(scrn);
 	}
 
 	OUTREG(pipeconf_reg, pipeconf & ~PIPEACONF_ENABLE);
 	/* Wait for vblank for the disable to take effect. */
-	i830WaitForVblank(pScrn);
+	i830WaitForVblank(scrn);
 
 	/* Filter ctl must be set before TV_WIN_SIZE */
 	OUTREG(TV_FILTER_CTL_1, TV_AUTO_SCALE);
@@ -1333,7 +1333,7 @@ i830_tv_mode_set(xf86OutputPtr output, D
 	OUTREG(TV_V_CHROMA_0 + (i<<2), tv_mode->filter_table[j++]);
     OUTREG(TV_DAC, 0);
     OUTREG(TV_CTL, tv_ctl);
-    i830WaitForVblank(pScrn);
+    i830WaitForVblank(scrn);
 }
 
 static const DisplayModeRec reported_modes[] = {
@@ -1365,8 +1365,8 @@ static int
 i830_tv_detect_type (xf86CrtcPtr    crtc,
 		xf86OutputPtr  output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     uint32_t		    tv_ctl, save_tv_ctl;
     uint32_t		    tv_dac, save_tv_dac;
@@ -1386,6 +1386,9 @@ i830_tv_detect_type (xf86CrtcPtr    crtc
 	tv_ctl &= ~TV_TEST_MODE_MASK;
 	tv_ctl |= TV_TEST_MODE_MONITOR_DETECT;
 	tv_dac &= ~TVDAC_SENSE_MASK;
+        tv_dac &= ~DAC_A_MASK;
+        tv_dac &= ~DAC_B_MASK;
+        tv_dac &= ~DAC_C_MASK;
 	tv_dac |= (TVDAC_STATE_CHG_EN |
 		TVDAC_A_SENSE_CTL |
 		TVDAC_B_SENSE_CTL |
@@ -1396,11 +1399,11 @@ i830_tv_detect_type (xf86CrtcPtr    crtc
 		DAC_C_0_7_V);
 	OUTREG(TV_CTL, tv_ctl);
 	OUTREG(TV_DAC, tv_dac);
-	i830WaitForVblank(pScrn);
+	i830WaitForVblank(scrn);
 	tv_dac = INREG(TV_DAC);
 	OUTREG(TV_DAC, save_tv_dac);
 	OUTREG(TV_CTL, save_tv_ctl);
-	i830WaitForVblank(pScrn);
+	i830WaitForVblank(scrn);
     }
     /*
      *  A B C
@@ -1409,26 +1412,26 @@ i830_tv_detect_type (xf86CrtcPtr    crtc
      *  0 0 0 Component
      */
     if ((tv_dac & TVDAC_SENSE_MASK) == (TVDAC_B_SENSE | TVDAC_C_SENSE)) {
-	if (pI830->debug_modes) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	if (intel->debug_modes) {
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "Detected Composite TV connection\n");
 	}
 	type = TV_TYPE_COMPOSITE;
     } else if ((tv_dac & (TVDAC_A_SENSE|TVDAC_B_SENSE)) == TVDAC_A_SENSE) {
-	if (pI830->debug_modes) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	if (intel->debug_modes) {
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "Detected S-Video TV connection\n");
 	}
 	type = TV_TYPE_SVIDEO;
     } else if ((tv_dac & TVDAC_SENSE_MASK) == 0) {
-	if (pI830->debug_modes) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	if (intel->debug_modes) {
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "Detected Component TV connection\n");
 	}
 	type = TV_TYPE_COMPONENT;
     } else {
-	if (pI830->debug_modes) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	if (intel->debug_modes) {
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		       "No TV connection detected\n");
 	}
 	type = TV_TYPE_NONE;
@@ -1567,7 +1570,7 @@ static void
 i830_tv_destroy (xf86OutputPtr output)
 {
     if (output->driver_private)
-	xfree (output->driver_private);
+	free (output->driver_private);
 }
 
 #ifdef RANDR_12_INTERFACE
@@ -1648,23 +1651,23 @@ static void
 i830_tv_color_set_property(xf86OutputPtr output, Atom property,
 			   uint8_t val)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_tv_priv	    *dev_priv = intel_output->dev_priv;
 
     if (property == brightness_atom) {
 	dev_priv->brightness = val;
-	i830_tv_update_brightness(pI830, val);
+	i830_tv_update_brightness(intel, val);
     } else if (property == contrast_atom) {
 	dev_priv->contrast = val;
-	i830_tv_update_contrast(pI830, val);
+	i830_tv_update_contrast(intel, val);
     } else if (property == saturation_atom) {
 	dev_priv->saturation = val;
-	i830_tv_update_saturation(pI830, val);
+	i830_tv_update_saturation(intel, val);
     } else if (property == hue_atom) {
 	dev_priv->hue = val;
-	i830_tv_update_hue(pI830, val);
+	i830_tv_update_hue(intel, val);
     }
 }
 
@@ -1672,7 +1675,7 @@ static void
 i830_tv_color_create_property(xf86OutputPtr output, Atom *property,
 			      char *name, int name_len, uint8_t val)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
+    ScrnInfoPtr	scrn = output->scrn;
     INT32 range[2];
     int err = 0;
 
@@ -1682,7 +1685,7 @@ i830_tv_color_create_property(xf86Output
     err = RRConfigureOutputProperty(output->randr_output, *property,
 				    FALSE, TRUE, FALSE, 2, range);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRConfigureOutputProperty error, %d\n", err);
 	goto out;
     }
@@ -1693,7 +1696,7 @@ i830_tv_color_create_property(xf86Output
 				 XA_INTEGER, 32, PropModeReplace, 1, &val,
 				 FALSE, FALSE);
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRChangeOutputProperty error, %d\n", err);
     }
 out:
@@ -1706,8 +1709,8 @@ static void
 i830_tv_create_resources(xf86OutputPtr output)
 {
 #ifdef RANDR_12_INTERFACE
-    ScrnInfoPtr		    pScrn = output->scrn;
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct i830_tv_priv	    *dev_priv = intel_output->dev_priv;
     int			    err, i;
@@ -1726,13 +1729,13 @@ i830_tv_create_resources(xf86OutputPtr o
     err = i830_tv_format_configure_property (output);
 
     if (err != 0) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRConfigureOutputProperty error, %d\n", err);
     }
 
     /* Set the current value of the tv_format property */
     if (!i830_tv_format_set_property (output))
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		   "RRChangeOutputProperty error, %d\n", err);
 
     for (i = 0; i < 4; i++)
@@ -1747,7 +1750,7 @@ i830_tv_create_resources(xf86OutputPtr o
 				    TRUE, TRUE, FALSE, 2, range);
 
 	if (err != 0)
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		       "RRConfigureOutputProperty error, %d\n", err);
 
 	err = RRChangeOutputProperty(output->randr_output, margin_atoms[i],
@@ -1755,7 +1758,7 @@ i830_tv_create_resources(xf86OutputPtr o
 				     1, &dev_priv->margin[i],
 				     FALSE, TRUE);
 	if (err != 0)
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 		       "RRChangeOutputProperty error, %d\n", err);
     }
 
@@ -1766,12 +1769,12 @@ i830_tv_create_resources(xf86OutputPtr o
     i830_tv_color_create_property(output, &contrast_atom,
 				  TV_CONTRAST_NAME,
 				  sizeof(TV_CONTRAST_NAME),
-				  IS_I965G(pI830) ? TV_CONTRAST_DEFAULT :
+				  IS_I965G(intel) ? TV_CONTRAST_DEFAULT :
 						TV_CONTRAST_DEFAULT_945G);
     i830_tv_color_create_property(output, &saturation_atom,
 				  TV_SATURATION_NAME,
 				  sizeof(TV_SATURATION_NAME),
-				  IS_I965G(pI830) ? TV_SATURATION_DEFAULT :
+				  IS_I965G(intel) ? TV_SATURATION_DEFAULT :
 						TV_SATURATION_DEFAULT_945G);
     i830_tv_color_create_property(output, &hue_atom, TV_HUE_NAME,
 				  sizeof(TV_HUE_NAME), TV_HUE_DEFAULT);
@@ -1789,7 +1792,7 @@ i830_tv_set_property(xf86OutputPtr outpu
     {
 	I830OutputPrivatePtr    intel_output = output->driver_private;
 	struct i830_tv_priv	*dev_priv = intel_output->dev_priv;
-	I830Ptr			pI830 = I830PTR(output->scrn);
+        intel_screen_private    *intel = intel_get_screen_private(output->scrn);
 	Atom			atom;
 	const char		*name;
 	char			*val;
@@ -1804,19 +1807,19 @@ i830_tv_set_property(xf86OutputPtr outpu
 	memcpy (&atom, value->data, 4);
 	name = NameForAtom (atom);
 
-	val = xalloc (strlen (name) + 1);
+	val = malloc (strlen (name) + 1);
 	if (!val)
 	    return FALSE;
 	strcpy (val, name);
 	if (!i830_tv_mode_lookup (val))
 	{
-	    xfree (val);
+	    free (val);
 	    return FALSE;
 	}
-	xfree (dev_priv->tv_format);
+	free (dev_priv->tv_format);
 	dev_priv->tv_format = val;
 
-	if (pI830->starting)
+	if (intel->starting || output->crtc == NULL)
 	    return TRUE;
 
 	/* TV format change will generate new modelines, try
@@ -1900,11 +1903,11 @@ i830_tv_set_property(xf86OutputPtr outpu
 static xf86CrtcPtr
 i830_tv_get_crtc(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     int pipe = !!(INREG(TV_CTL) & TV_ENC_PIPEB_SELECT);
 
-    return i830_pipe_to_crtc(pScrn, pipe);
+    return i830_pipe_to_crtc(scrn, pipe);
 }
 #endif
 
@@ -1930,9 +1933,9 @@ static const xf86OutputFuncsRec i830_tv_
 };
 
 void
-i830_tv_init(ScrnInfoPtr pScrn)
+i830_tv_init(ScrnInfoPtr scrn)
 {
-    I830Ptr		    pI830 = I830PTR(pScrn);
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     xf86OutputPtr	    output;
     I830OutputPrivatePtr    intel_output;
     struct i830_tv_priv	    *dev_priv;
@@ -1941,7 +1944,7 @@ i830_tv_init(ScrnInfoPtr pScrn)
     char		    *tv_format = NULL;
     char		    *tv_type = NULL;
 
-    if (pI830->quirk_flag & QUIRK_IGNORE_TV)
+    if (intel->quirk_flag & QUIRK_IGNORE_TV)
 	return;
 
     if ((INREG(TV_CTL) & TV_FUSE_STATE_MASK) == TV_FUSE_STATE_DISABLED)
@@ -1970,10 +1973,10 @@ i830_tv_init(ScrnInfoPtr pScrn)
 	    (tv_dac_off & TVDAC_STATE_CHG_EN) != 0)
 	return;
 
-    if (!pI830->tv_present) /* VBIOS claims no TV connector */
+    if (!intel->tv_present) /* VBIOS claims no TV connector */
 	return;
 
-    output = xf86OutputCreate (pScrn, &i830_tv_output_funcs, "TV");
+    output = xf86OutputCreate (scrn, &i830_tv_output_funcs, "TV");
 
     if (!output)
 	return;
@@ -2023,14 +2026,14 @@ i830_tv_init(ScrnInfoPtr pScrn)
 	else if (strcasecmp(tv_type, "Component") == 0)
 	    dev_priv->type = TV_TYPE_COMPONENT;
 	else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		    "Unknown TV Connector type %s\n", tv_type);
 	    dev_priv->force_type = FALSE;
 	}
     }
 
     if (dev_priv->force_type)
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		"Force TV Connector type as %s\n", tv_type);
 
     output->driver_private = intel_output;
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_uxa.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_uxa.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_uxa.c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_uxa.c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1166 @@
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+Copyright (c) 2005 Jesse Barnes <jbarnes@virtuousgeek.org>
+  Based on code from i830_xaa.c.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "xf86.h"
+#include "xaarop.h"
+#include "i830.h"
+#include "i810_reg.h"
+#include "i915_drm.h"
+#include "brw_defines.h"
+#include <string.h>
+#include <sys/mman.h>
+#include <errno.h>
+
+const int I830CopyROP[16] = {
+	ROP_0,			/* GXclear */
+	ROP_DSa,		/* GXand */
+	ROP_SDna,		/* GXandReverse */
+	ROP_S,			/* GXcopy */
+	ROP_DSna,		/* GXandInverted */
+	ROP_D,			/* GXnoop */
+	ROP_DSx,		/* GXxor */
+	ROP_DSo,		/* GXor */
+	ROP_DSon,		/* GXnor */
+	ROP_DSxn,		/* GXequiv */
+	ROP_Dn,			/* GXinvert */
+	ROP_SDno,		/* GXorReverse */
+	ROP_Sn,			/* GXcopyInverted */
+	ROP_DSno,		/* GXorInverted */
+	ROP_DSan,		/* GXnand */
+	ROP_1			/* GXset */
+};
+
+const int I830PatternROP[16] = {
+	ROP_0,
+	ROP_DPa,
+	ROP_PDna,
+	ROP_P,
+	ROP_DPna,
+	ROP_D,
+	ROP_DPx,
+	ROP_DPo,
+	ROP_DPon,
+	ROP_PDxn,
+	ROP_Dn,
+	ROP_PDno,
+	ROP_Pn,
+	ROP_DPno,
+	ROP_DPan,
+	ROP_1
+};
+
+#if HAS_DEVPRIVATEKEYREC
+DevPrivateKeyRec uxa_pixmap_index;
+#else
+int uxa_pixmap_index;
+#endif
+
+static void
+ironlake_blt_workaround(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	/* Ironlake has a limitation that a 3D or Media command can't
+	 * be the first command after a BLT, unless it's
+	 * non-pipelined.  Instead of trying to track it and emit a
+	 * command at the right time, we just emit a dummy
+	 * non-pipelined 3D instruction after each blit.
+	 */
+
+	if (IS_IGDNG(intel)) {
+		BEGIN_BATCH(2);
+		OUT_BATCH(CMD_POLY_STIPPLE_OFFSET << 16);
+		OUT_BATCH(0);
+		ADVANCE_BATCH();
+	}
+}
+
+Bool
+i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
+			int num_bos)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (intel->batch_bo == NULL) {
+		intel_debug_fallback(scrn, "VT inactive\n");
+		return FALSE;
+	}
+
+	bo_table[0] = intel->batch_bo;
+	if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) != 0) {
+		intel_batch_submit(scrn, FALSE);
+		bo_table[0] = intel->batch_bo;
+		if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) !=
+		    0) {
+			intel_debug_fallback(scrn, "Couldn't get aperture "
+					    "space for BOs\n");
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+static unsigned long i830_pixmap_pitch(PixmapPtr pixmap)
+{
+	return pixmap->devKind;
+}
+
+static int i830_pixmap_pitch_is_aligned(PixmapPtr pixmap)
+{
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	return i830_pixmap_pitch(pixmap) %
+	    intel->accel_pixmap_pitch_alignment == 0;
+}
+
+static unsigned int
+i830_uxa_pixmap_compute_size(PixmapPtr pixmap,
+			     int w, int h,
+			     uint32_t *tiling,
+			     int *stride)
+{
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int pitch, size;
+
+	if (*tiling != I915_TILING_NONE) {
+		/* First check whether tiling is necessary. */
+		pitch = (w * pixmap->drawable.bitsPerPixel + 7) / 8;
+		pitch = ROUND_TO(pitch, intel->accel_pixmap_pitch_alignment);
+		size = pitch * ALIGN (h, 2);
+		if (!IS_I965G(intel)) {
+			/* Older hardware requires fences to be pot size
+			 * aligned with a minimum of 1 MiB, so causes
+			 * massive overallocation for small textures.
+			 */
+			if (size < 1024*1024/2)
+				*tiling = I915_TILING_NONE;
+
+			/* Gen 2/3 has a maximum stride for tiling of
+			 * 8192 bytes.
+			 */
+			if (pitch > KB(8))
+				*tiling = I915_TILING_NONE;
+		} else if (size <= 4096) {
+			/* Disable tiling beneath a page size, we will not see
+			 * any benefit from reducing TLB misses and instead
+			 * just incur extra cost when we require a fence.
+			 */
+			*tiling = I915_TILING_NONE;
+		}
+	}
+
+	pitch = (w * pixmap->drawable.bitsPerPixel + 7) / 8;
+	if (pitch <= 256)
+		*tiling = I915_TILING_NONE;
+
+	if (*tiling != I915_TILING_NONE) {
+		int aligned_h;
+
+		if (*tiling == I915_TILING_X)
+			aligned_h = ALIGN(h, 8);
+		else
+			aligned_h = ALIGN(h, 32);
+
+		*stride = i830_get_fence_pitch(intel,
+					       ROUND_TO(pitch, 512),
+					       *tiling);
+
+		/* Round the object up to the size of the fence it will live in
+		 * if necessary.  We could potentially make the kernel allocate
+		 * a larger aperture space and just bind the subset of pages in,
+		 * but this is easier and also keeps us out of trouble (as much)
+		 * with drm_intel_bufmgr_check_aperture().
+		 */
+		size = i830_get_fence_size(intel, *stride * aligned_h);
+
+		if (size > intel->max_tiling_size)
+			*tiling = I915_TILING_NONE;
+	}
+
+	if (*tiling == I915_TILING_NONE) {
+		/* Round the height up so that the GPU's access to a 2x2 aligned
+		 * subspan doesn't address an invalid page offset beyond the
+		 * end of the GTT.
+		 */
+		*stride = ROUND_TO(pitch, intel->accel_pixmap_pitch_alignment);
+		size = *stride * ALIGN(h, 2);
+	}
+
+	return size;
+}
+
+static Bool
+i830_uxa_check_solid(DrawablePtr drawable, int alu, Pixel planemask)
+{
+	ScrnInfoPtr scrn = xf86Screens[drawable->pScreen->myNum];
+
+	if (!UXA_PM_IS_SOLID(drawable, planemask)) {
+		intel_debug_fallback(scrn, "planemask is not solid\n");
+		return FALSE;
+	}
+
+	switch (drawable->bitsPerPixel) {
+	case 8:
+	case 16:
+	case 32:
+		break;
+	default:
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/**
+ * Sets up hardware state for a series of solid fills.
+ */
+static Bool
+i830_uxa_prepare_solid(PixmapPtr pixmap, int alu, Pixel planemask, Pixel fg)
+{
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *bo_table[] = {
+		NULL,		/* batch_bo */
+		i830_get_pixmap_bo(pixmap),
+	};
+
+	if (!intel_check_pitch_2d(pixmap))
+		return FALSE;
+
+	if (!i830_pixmap_pitch_is_aligned(pixmap)) {
+		intel_debug_fallback(scrn, "pixmap pitch not aligned");
+		return FALSE;
+	}
+
+	if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
+		return FALSE;
+
+	intel->BR[13] = (I830PatternROP[alu] & 0xff) << 16;
+	switch (pixmap->drawable.bitsPerPixel) {
+	case 8:
+		break;
+	case 16:
+		/* RGB565 */
+		intel->BR[13] |= (1 << 24);
+		break;
+	case 32:
+		/* RGB8888 */
+		intel->BR[13] |= ((1 << 24) | (1 << 25));
+		break;
+	}
+	intel->BR[16] = fg;
+
+	return TRUE;
+}
+
+static void i830_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2)
+{
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	unsigned long pitch;
+	uint32_t cmd;
+
+	if (x1 < 0)
+		x1 = 0;
+	if (y1 < 0)
+		y1 = 0;
+	if (x2 > pixmap->drawable.width)
+		x2 = pixmap->drawable.width;
+	if (y2 > pixmap->drawable.height)
+		y2 = pixmap->drawable.height;
+
+	if (x2 <= x1 || y2 <= y1)
+		return;
+
+	pitch = i830_pixmap_pitch(pixmap);
+
+	{
+		BEGIN_BATCH(6);
+
+		cmd = XY_COLOR_BLT_CMD;
+
+		if (pixmap->drawable.bitsPerPixel == 32)
+			cmd |=
+			    XY_COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB;
+
+		if (IS_I965G(intel) && i830_pixmap_tiled(pixmap)) {
+			assert((pitch % 512) == 0);
+			pitch >>= 2;
+			cmd |= XY_COLOR_BLT_TILED;
+		}
+
+		OUT_BATCH(cmd);
+
+		OUT_BATCH(intel->BR[13] | pitch);
+		OUT_BATCH((y1 << 16) | (x1 & 0xffff));
+		OUT_BATCH((y2 << 16) | (x2 & 0xffff));
+		OUT_RELOC_PIXMAP_FENCED(pixmap, I915_GEM_DOMAIN_RENDER,
+					I915_GEM_DOMAIN_RENDER, 0);
+		OUT_BATCH(intel->BR[16]);
+		ADVANCE_BATCH();
+	}
+
+	ironlake_blt_workaround(scrn);
+}
+
+static void i830_uxa_done_solid(PixmapPtr pixmap)
+{
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+
+	i830_debug_flush(scrn);
+}
+
+/**
+ * TODO:
+ *   - support planemask using FULL_BLT_CMD?
+ */
+static Bool
+i830_uxa_check_copy(PixmapPtr source, PixmapPtr dest,
+		    int alu, Pixel planemask)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+
+	if (!UXA_PM_IS_SOLID(&source->drawable, planemask)) {
+		intel_debug_fallback(scrn, "planemask is not solid");
+		return FALSE;
+	}
+
+	if (source->drawable.bitsPerPixel != dest->drawable.bitsPerPixel) {
+		intel_debug_fallback(scrn, "mixed bpp copies unsupported\n");
+		return FALSE;
+	}
+	switch (source->drawable.bitsPerPixel) {
+	case 8:
+	case 16:
+	case 32:
+		break;
+	default:
+		return FALSE;
+	}
+
+	if (!intel_check_pitch_2d(source))
+		return FALSE;
+	if (!intel_check_pitch_2d(dest))
+		return FALSE;
+
+	return TRUE;
+}
+
+static Bool
+i830_uxa_prepare_copy(PixmapPtr source, PixmapPtr dest, int xdir,
+		      int ydir, int alu, Pixel planemask)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *bo_table[] = {
+		NULL,		/* batch_bo */
+		i830_get_pixmap_bo(source),
+		i830_get_pixmap_bo(dest),
+	};
+
+	if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
+		return FALSE;
+
+	intel->render_source = source;
+
+	intel->BR[13] = I830CopyROP[alu] << 16;
+	switch (source->drawable.bitsPerPixel) {
+	case 8:
+		break;
+	case 16:
+		intel->BR[13] |= (1 << 24);
+		break;
+	case 32:
+		intel->BR[13] |= ((1 << 25) | (1 << 24));
+		break;
+	}
+
+	return TRUE;
+}
+
+static void
+i830_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1,
+	      int dst_y1, int w, int h)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint32_t cmd;
+	int dst_x2, dst_y2;
+	unsigned int dst_pitch, src_pitch;
+
+	dst_x2 = dst_x1 + w;
+	dst_y2 = dst_y1 + h;
+
+	dst_pitch = i830_pixmap_pitch(dest);
+	src_pitch = i830_pixmap_pitch(intel->render_source);
+
+	{
+		BEGIN_BATCH(8);
+
+		cmd = XY_SRC_COPY_BLT_CMD;
+
+		if (dest->drawable.bitsPerPixel == 32)
+			cmd |=
+			    XY_SRC_COPY_BLT_WRITE_ALPHA |
+			    XY_SRC_COPY_BLT_WRITE_RGB;
+
+		if (IS_I965G(intel)) {
+			if (i830_pixmap_tiled(dest)) {
+				assert((dst_pitch % 512) == 0);
+				dst_pitch >>= 2;
+				cmd |= XY_SRC_COPY_BLT_DST_TILED;
+			}
+
+			if (i830_pixmap_tiled(intel->render_source)) {
+				assert((src_pitch % 512) == 0);
+				src_pitch >>= 2;
+				cmd |= XY_SRC_COPY_BLT_SRC_TILED;
+			}
+		}
+
+		OUT_BATCH(cmd);
+
+		OUT_BATCH(intel->BR[13] | dst_pitch);
+		OUT_BATCH((dst_y1 << 16) | (dst_x1 & 0xffff));
+		OUT_BATCH((dst_y2 << 16) | (dst_x2 & 0xffff));
+		OUT_RELOC_PIXMAP_FENCED(dest,
+					I915_GEM_DOMAIN_RENDER,
+					I915_GEM_DOMAIN_RENDER,
+					0);
+		OUT_BATCH((src_y1 << 16) | (src_x1 & 0xffff));
+		OUT_BATCH(src_pitch);
+		OUT_RELOC_PIXMAP_FENCED(intel->render_source,
+					I915_GEM_DOMAIN_RENDER, 0,
+					0);
+
+		ADVANCE_BATCH();
+	}
+	ironlake_blt_workaround(scrn);
+}
+
+static void i830_uxa_done_copy(PixmapPtr dest)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+
+	i830_debug_flush(scrn);
+}
+
+/**
+ * Do any cleanup from the Composite operation.
+ *
+ * This is shared between i830 through i965.
+ */
+void i830_done_composite(PixmapPtr dest)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (intel->vertex_flush)
+		intel->vertex_flush(intel);
+
+	i830_debug_flush(scrn);
+}
+
+#define xFixedToFloat(val) \
+	((float)xFixedToInt(val) + ((float)xFixedFrac(val) / 65536.0))
+
+static Bool
+_i830_transform_point(PictTransformPtr transform,
+		      float x, float y, float result[3])
+{
+	int j;
+
+	for (j = 0; j < 3; j++) {
+		result[j] = (xFixedToFloat(transform->matrix[j][0]) * x +
+			     xFixedToFloat(transform->matrix[j][1]) * y +
+			     xFixedToFloat(transform->matrix[j][2]));
+	}
+	if (!result[2])
+		return FALSE;
+	return TRUE;
+}
+
+/**
+ * Returns the floating-point coordinates transformed by the given transform.
+ *
+ * transform may be null.
+ */
+Bool
+i830_get_transformed_coordinates(int x, int y, PictTransformPtr transform,
+				 float *x_out, float *y_out)
+{
+	if (transform == NULL) {
+		*x_out = x;
+		*y_out = y;
+	} else {
+		float result[3];
+
+		if (!_i830_transform_point
+		    (transform, (float)x, (float)y, result))
+			return FALSE;
+		*x_out = result[0] / result[2];
+		*y_out = result[1] / result[2];
+	}
+	return TRUE;
+}
+
+/**
+ * Returns the un-normalized floating-point coordinates transformed by the given transform.
+ *
+ * transform may be null.
+ */
+Bool
+i830_get_transformed_coordinates_3d(int x, int y, PictTransformPtr transform,
+				    float *x_out, float *y_out, float *w_out)
+{
+	if (transform == NULL) {
+		*x_out = x;
+		*y_out = y;
+		*w_out = 1;
+	} else {
+		float result[3];
+
+		if (!_i830_transform_point
+		    (transform, (float)x, (float)y, result))
+			return FALSE;
+		*x_out = result[0];
+		*y_out = result[1];
+		*w_out = result[2];
+	}
+	return TRUE;
+}
+
+/**
+ * Returns whether the provided transform is affine.
+ *
+ * transform may be null.
+ */
+Bool i830_transform_is_affine(PictTransformPtr t)
+{
+	if (t == NULL)
+		return TRUE;
+	return t->matrix[2][0] == 0 && t->matrix[2][1] == 0;
+}
+
+dri_bo *i830_get_pixmap_bo(PixmapPtr pixmap)
+{
+	struct intel_pixmap *intel;
+
+	intel = i830_get_pixmap_intel(pixmap);
+	if (intel == NULL)
+		return NULL;
+
+	return intel->bo;
+}
+
+void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo)
+{
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct intel_pixmap *priv;
+
+	priv = i830_get_pixmap_intel(pixmap);
+
+	if (priv == NULL && bo == NULL)
+	    return;
+
+	if (priv != NULL) {
+		if (priv->bo == bo)
+			return;
+
+		if (list_is_empty(&priv->batch)) {
+			dri_bo_unreference(priv->bo);
+		} else if (!drm_intel_bo_is_reusable(priv->bo)) {
+			dri_bo_unreference(priv->bo);
+			list_del(&priv->batch);
+			list_del(&priv->flush);
+		} else {
+			list_add(&priv->in_flight, &intel->in_flight);
+			priv = NULL;
+		}
+
+		if (intel->render_current_dest == pixmap)
+		    intel->render_current_dest = NULL;
+	}
+
+	if (bo != NULL) {
+		uint32_t tiling;
+		uint32_t swizzle_mode;
+		int ret;
+
+		if (priv == NULL) {
+			priv = calloc(1, sizeof (struct intel_pixmap));
+			if (priv == NULL)
+				goto BAIL;
+
+			list_init(&priv->batch);
+			list_init(&priv->flush);
+		}
+
+		dri_bo_reference(bo);
+		priv->bo = bo;
+		priv->stride = i830_pixmap_pitch(pixmap);
+
+		ret = drm_intel_bo_get_tiling(bo,
+					      &tiling,
+					      &swizzle_mode);
+		if (ret != 0) {
+			FatalError("Couldn't get tiling on bo %p: %s\n",
+				   bo, strerror(-ret));
+		}
+
+		priv->tiling = tiling;
+		priv->busy = -1;
+	} else {
+		if (priv != NULL) {
+			free(priv);
+			priv = NULL;
+		}
+	}
+
+  BAIL:
+	i830_set_pixmap_intel(pixmap, priv);
+}
+
+static Bool i830_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access)
+{
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap);
+	dri_bo *bo = priv->bo;
+	int ret;
+
+	if (!list_is_empty(&priv->batch) &&
+	    (access == UXA_ACCESS_RW || priv->batch_write))
+		intel_batch_submit(scrn, FALSE);
+
+	if (bo->size > intel->max_gtt_map_size) {
+		ret = dri_bo_map(bo, access == UXA_ACCESS_RW);
+		if (ret != 0) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "%s: bo map failed: %s\n",
+				   __FUNCTION__,
+				   strerror(-ret));
+			return FALSE;
+		}
+	} else {
+		ret = drm_intel_gem_bo_map_gtt(bo);
+		if (ret != 0) {
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "%s: gtt bo map failed: %s\n",
+				   __FUNCTION__,
+				   strerror(-ret));
+			return FALSE;
+		}
+	}
+	pixmap->devPrivate.ptr = bo->virtual;
+	priv->busy = 0;
+
+	return TRUE;
+}
+
+static void i830_uxa_finish_access(PixmapPtr pixmap)
+{
+	dri_bo *bo = i830_get_pixmap_bo(pixmap);
+	ScreenPtr screen = pixmap->drawable.pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (bo == intel->front_buffer->bo)
+		intel->need_flush = TRUE;
+
+	if (bo->size > intel->max_gtt_map_size)
+		dri_bo_unmap(bo);
+	else
+		drm_intel_gem_bo_unmap_gtt(bo);
+	pixmap->devPrivate.ptr = NULL;
+}
+
+static Bool i830_uxa_pixmap_put_image(PixmapPtr pixmap,
+				      char *src, int src_pitch,
+				      int x, int y, int w, int h)
+{
+	struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap);
+	int stride = i830_pixmap_pitch(pixmap);
+	int ret = FALSE;
+
+	if (src_pitch == stride && w == pixmap->drawable.width && priv->tiling == I915_TILING_NONE) {
+		ret = drm_intel_bo_subdata(priv->bo, y * stride, stride * h, src) == 0;
+	} else if (drm_intel_gem_bo_map_gtt(priv->bo) == 0) {
+		char *dst = priv->bo->virtual;
+		int cpp = pixmap->drawable.bitsPerPixel/8;
+		int row_length = w * cpp;
+		int num_rows = h;
+		if (row_length == src_pitch && src_pitch == stride)
+			num_rows = 1, row_length *= h;
+		dst += y * stride + x * cpp;
+		do {
+			memcpy (dst, src, row_length);
+			src += src_pitch;
+			dst += stride;
+		} while (--num_rows);
+		drm_intel_gem_bo_unmap_gtt(priv->bo);
+		ret = TRUE;
+	}
+
+	return ret;
+}
+
+static Bool i830_uxa_put_image(PixmapPtr pixmap,
+			       int x, int y,
+			       int w, int h,
+			       char *src, int src_pitch)
+{
+	struct intel_pixmap *priv;
+
+	priv = i830_get_pixmap_intel(pixmap);
+	if (!intel_pixmap_is_busy(priv)) {
+		/* bo is not busy so can be replaced without a stall, upload in-place. */
+		return i830_uxa_pixmap_put_image(pixmap, src, src_pitch, x, y, w, h);
+	} else {
+		ScreenPtr screen = pixmap->drawable.pScreen;
+
+		if (x == 0 && y == 0 &&
+		    w == pixmap->drawable.width &&
+		    h == pixmap->drawable.height)
+		{
+			intel_screen_private *intel = intel_get_screen_private(xf86Screens[screen->myNum]);
+			uint32_t tiling = priv->tiling;
+			int size, stride;
+			dri_bo *bo;
+
+			/* Replace busy bo. */
+			size = i830_uxa_pixmap_compute_size (pixmap, w, h,
+							     &tiling, &stride);
+			if (size > intel->max_gtt_map_size)
+				return FALSE;
+
+			bo = drm_intel_bo_alloc(intel->bufmgr, "pixmap", size, 0);
+			if (bo == NULL)
+				return FALSE;
+
+			if (tiling != I915_TILING_NONE)
+				drm_intel_bo_set_tiling(bo, &tiling, stride);
+
+			screen->ModifyPixmapHeader(pixmap,
+						   w, h,
+						   0, 0,
+						   stride, NULL);
+			i830_set_pixmap_bo(pixmap, bo);
+			dri_bo_unreference(bo);
+
+			return i830_uxa_pixmap_put_image(pixmap, src, src_pitch, 0, 0, w, h);
+		}
+		else
+		{
+			PixmapPtr scratch;
+			Bool ret;
+
+			/* Upload to a linear buffer and queue a blit.  */
+			scratch = (*screen->CreatePixmap)(screen, w, h,
+							  pixmap->drawable.depth,
+							  UXA_CREATE_PIXMAP_FOR_MAP);
+			if (!scratch)
+				return FALSE;
+
+			ret = i830_uxa_pixmap_put_image(scratch, src, src_pitch, 0, 0, w, h);
+			if (ret) {
+				GCPtr gc = GetScratchGC(pixmap->drawable.depth, screen);
+				if (gc) {
+					ValidateGC(&pixmap->drawable, gc);
+
+					(*gc->ops->CopyArea)(&scratch->drawable,
+							     &pixmap->drawable,
+							     gc, 0, 0, w, h, x, y);
+
+					FreeScratchGC(gc);
+				} else
+					ret = FALSE;
+			}
+
+			(*screen->DestroyPixmap)(scratch);
+			return ret;
+		}
+	}
+}
+
+static Bool i830_uxa_pixmap_get_image(PixmapPtr pixmap,
+				      int x, int y, int w, int h,
+				      char *dst, int dst_pitch)
+{
+	struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap);
+	int stride = i830_pixmap_pitch(pixmap);
+
+	if (dst_pitch == stride && w == pixmap->drawable.width) {
+		return drm_intel_bo_get_subdata(priv->bo, y * stride, stride * h, dst) == 0;
+	} else {
+		char *src;
+		int cpp;
+
+		if (drm_intel_bo_map(priv->bo, FALSE))
+		    return FALSE;
+
+		cpp = pixmap->drawable.bitsPerPixel/8;
+		src = (char *) priv->bo->virtual + y * stride + x * cpp;
+		w *= cpp;
+		do {
+			memcpy(dst, src, w);
+			src += stride;
+			dst += dst_pitch;
+		} while (--h);
+
+		drm_intel_bo_unmap(priv->bo);
+
+		return TRUE;
+	}
+}
+
+static Bool i830_uxa_get_image(PixmapPtr pixmap,
+			       int x, int y,
+			       int w, int h,
+			       char *dst, int dst_pitch)
+{
+	struct intel_pixmap *priv;
+	PixmapPtr scratch = NULL;
+	Bool ret;
+
+	/* The presumption is that we wish to keep the target hot, so
+	 * copy to a new bo and move that to the CPU in preference to
+	 * causing ping-pong of the original.
+	 *
+	 * Also the gpu is much faster at detiling.
+	 */
+
+	priv = i830_get_pixmap_intel(pixmap);
+	if (intel_pixmap_is_busy(priv) || priv->tiling != I915_TILING_NONE) {
+		ScreenPtr screen = pixmap->drawable.pScreen;
+		GCPtr gc;
+
+		/* Copy to a linear buffer and pull.  */
+		scratch = screen->CreatePixmap(screen, w, h,
+					       pixmap->drawable.depth,
+					       INTEL_CREATE_PIXMAP_TILING_NONE);
+		if (!scratch)
+			return FALSE;
+
+		gc = GetScratchGC(pixmap->drawable.depth, screen);
+		if (!gc) {
+			screen->DestroyPixmap(scratch);
+			return FALSE;
+		}
+
+		ValidateGC(&pixmap->drawable, gc);
+
+		gc->ops->CopyArea(&pixmap->drawable,
+				  &scratch->drawable,
+				  gc, x, y, w, h, 0, 0);
+
+		FreeScratchGC(gc);
+
+		intel_batch_submit(xf86Screens[screen->myNum], FALSE);
+
+		x = y = 0;
+		pixmap = scratch;
+	}
+
+	ret = i830_uxa_pixmap_get_image(pixmap, x, y, w, h, dst, dst_pitch);
+
+	if (scratch)
+		scratch->drawable.pScreen->DestroyPixmap(scratch);
+
+	return ret;
+
+}
+
+void i830_uxa_block_handler(ScreenPtr screen)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (intel->need_flush) {
+		dri_bo_wait_rendering(intel->front_buffer->bo);
+		intel->need_flush = FALSE;
+	}
+}
+
+static Bool i830_uxa_pixmap_is_offscreen(PixmapPtr pixmap)
+{
+	ScreenPtr screen = pixmap->drawable.pScreen;
+
+	/* The front buffer is always in memory and pinned */
+	if (screen->GetScreenPixmap(screen) == pixmap)
+		return TRUE;
+
+	return i830_get_pixmap_bo(pixmap) != NULL;
+}
+
+static PixmapPtr
+i830_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth,
+		       unsigned usage)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	PixmapPtr pixmap;
+
+	if (w > 32767 || h > 32767)
+		return NullPixmap;
+
+	if (depth == 1)
+		return fbCreatePixmap(screen, w, h, depth, usage);
+
+	if (usage == CREATE_PIXMAP_USAGE_GLYPH_PICTURE && w <= 32 && h <= 32)
+		return fbCreatePixmap(screen, w, h, depth, usage);
+
+	pixmap = fbCreatePixmap(screen, 0, 0, depth, usage);
+
+	if (w && h) {
+		struct intel_pixmap *priv;
+		unsigned int size, tiling;
+		int stride;
+
+		/* Always attempt to tile, compute_size() will remove the
+		 * tiling for pixmaps that are either too large or too small
+		 * to be effectively tiled.
+		 */
+		tiling = I915_TILING_X;
+		if (usage == INTEL_CREATE_PIXMAP_TILING_Y)
+			tiling = I915_TILING_Y;
+		if (usage == UXA_CREATE_PIXMAP_FOR_MAP || usage == INTEL_CREATE_PIXMAP_TILING_NONE)
+			tiling = I915_TILING_NONE;
+
+		if (tiling != I915_TILING_NONE) {
+		    if (h <= 4)
+			tiling = I915_TILING_NONE;
+		    if (h <= 16 && tiling == I915_TILING_Y)
+			tiling = I915_TILING_X;
+		}
+		size = i830_uxa_pixmap_compute_size(pixmap, w, h, &tiling, &stride);
+
+		/* Fail very large allocations.  Large BOs will tend to hit SW fallbacks
+		 * frequently, and also will tend to fail to successfully map when doing
+		 * SW fallbacks because we overcommit address space for BO access.
+		 */
+		if (size > intel->max_bo_size || stride >= KB(32)) {
+			fbDestroyPixmap(pixmap);
+			return fbCreatePixmap(screen, w, h, depth, usage);
+		}
+
+		/* Perform a preliminary search for an in-flight bo */
+		if (usage != UXA_CREATE_PIXMAP_FOR_MAP) {
+			int aligned_h;
+
+			if (tiling == I915_TILING_X)
+				aligned_h = ALIGN(h, 8);
+			else if (tiling == I915_TILING_Y)
+				aligned_h = ALIGN(h, 32);
+			else
+				aligned_h = ALIGN(h, 2);
+
+			list_foreach_entry(priv, struct intel_pixmap,
+					   &intel->in_flight,
+					   in_flight) {
+				if (priv->tiling != tiling)
+					continue;
+
+				if (tiling == I915_TILING_NONE) {
+				    if (priv->bo->size < size)
+					    continue;
+
+					priv->stride = stride;
+				} else {
+					if (priv->stride < stride ||
+					    priv->bo->size < priv->stride * aligned_h)
+						continue;
+
+					stride = priv->stride;
+				}
+
+				list_del(&priv->in_flight);
+				screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, stride, NULL);
+				i830_set_pixmap_intel(pixmap, priv);
+				return pixmap;
+			}
+		}
+
+		priv = calloc(1, sizeof (struct intel_pixmap));
+		if (priv == NULL) {
+			fbDestroyPixmap(pixmap);
+			return NullPixmap;
+		}
+
+		if (usage == UXA_CREATE_PIXMAP_FOR_MAP) {
+			priv->busy = 0;
+			priv->bo = drm_intel_bo_alloc(intel->bufmgr,
+						      "pixmap", size, 0);
+		} else {
+			priv->busy = -1;
+			priv->bo = drm_intel_bo_alloc_for_render(intel->bufmgr,
+								 "pixmap",
+								 size, 0);
+		}
+		if (!priv->bo) {
+			free(priv);
+			fbDestroyPixmap(pixmap);
+			if (errno == EFBIG)
+				return fbCreatePixmap(screen, w, h, depth, usage);
+			return NullPixmap;
+		}
+
+		if (tiling != I915_TILING_NONE)
+			drm_intel_bo_set_tiling(priv->bo, &tiling, stride);
+		priv->stride = stride;
+		priv->tiling = tiling;
+
+		screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, stride, NULL);
+
+		list_init(&priv->batch);
+		list_init(&priv->flush);
+		i830_set_pixmap_intel(pixmap, priv);
+	}
+
+	return pixmap;
+}
+
+static Bool i830_uxa_destroy_pixmap(PixmapPtr pixmap)
+{
+	if (pixmap->refcnt == 1)
+		i830_set_pixmap_bo(pixmap, NULL);
+	fbDestroyPixmap(pixmap);
+	return TRUE;
+}
+
+
+void i830_uxa_create_screen_resources(ScreenPtr screen)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	dri_bo *bo = intel->front_buffer->bo;
+
+	if (bo != NULL) {
+		PixmapPtr pixmap = screen->GetScreenPixmap(screen);
+		i830_set_pixmap_bo(pixmap, bo);
+		i830_get_pixmap_intel(pixmap)->busy = 1;
+	}
+}
+
+Bool i830_uxa_init(ScreenPtr screen)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+#if HAS_DIXREGISTERPRIVATEKEY
+	if (!dixRegisterPrivateKey(&uxa_pixmap_index, PRIVATE_PIXMAP, 0))
+#else
+	if (!dixRequestPrivate(&uxa_pixmap_index, 0))
+#endif
+		return FALSE;
+
+	intel->uxa_driver = uxa_driver_alloc();
+	if (intel->uxa_driver == NULL)
+		return FALSE;
+
+	memset(intel->uxa_driver, 0, sizeof(*intel->uxa_driver));
+
+	intel->bufferOffset = 0;
+	intel->uxa_driver->uxa_major = 1;
+	intel->uxa_driver->uxa_minor = 0;
+
+	intel->render_current_dest = NULL;
+	intel->prim_offset = 0;
+	intel->vertex_count = 0;
+	intel->floats_per_vertex = 0;
+	intel->last_floats_per_vertex = 0;
+	intel->vertex_bo = NULL;
+
+	/* Solid fill */
+	intel->uxa_driver->check_solid = i830_uxa_check_solid;
+	intel->uxa_driver->prepare_solid = i830_uxa_prepare_solid;
+	intel->uxa_driver->solid = i830_uxa_solid;
+	intel->uxa_driver->done_solid = i830_uxa_done_solid;
+
+	/* Copy */
+	intel->uxa_driver->check_copy = i830_uxa_check_copy;
+	intel->uxa_driver->prepare_copy = i830_uxa_prepare_copy;
+	intel->uxa_driver->copy = i830_uxa_copy;
+	intel->uxa_driver->done_copy = i830_uxa_done_copy;
+
+	/* Composite */
+	if (!IS_I9XX(intel)) {
+		intel->uxa_driver->check_composite = i830_check_composite;
+		intel->uxa_driver->check_composite_target = i830_check_composite_target;
+		intel->uxa_driver->check_composite_texture = i830_check_composite_texture;
+		intel->uxa_driver->prepare_composite = i830_prepare_composite;
+		intel->uxa_driver->composite = i830_composite;
+		intel->uxa_driver->done_composite = i830_done_composite;
+	} else if (IS_I915G(intel) || IS_I915GM(intel) ||
+		   IS_I945G(intel) || IS_I945GM(intel) || IS_G33CLASS(intel)) {
+		intel->uxa_driver->check_composite = i915_check_composite;
+		intel->uxa_driver->check_composite_target = i915_check_composite_target;
+		intel->uxa_driver->check_composite_texture = i915_check_composite_texture;
+		intel->uxa_driver->prepare_composite = i915_prepare_composite;
+		intel->uxa_driver->composite = i915_composite;
+		intel->uxa_driver->done_composite = i830_done_composite;
+	} else {
+		intel->uxa_driver->check_composite = i965_check_composite;
+		intel->uxa_driver->check_composite_texture = i965_check_composite_texture;
+		intel->uxa_driver->prepare_composite = i965_prepare_composite;
+		intel->uxa_driver->composite = i965_composite;
+		intel->uxa_driver->done_composite = i830_done_composite;
+	}
+
+	/* PutImage */
+	intel->uxa_driver->put_image = i830_uxa_put_image;
+	intel->uxa_driver->get_image = i830_uxa_get_image;
+
+	intel->uxa_driver->prepare_access = i830_uxa_prepare_access;
+	intel->uxa_driver->finish_access = i830_uxa_finish_access;
+	intel->uxa_driver->pixmap_is_offscreen = i830_uxa_pixmap_is_offscreen;
+
+	screen->CreatePixmap = i830_uxa_create_pixmap;
+	screen->DestroyPixmap = i830_uxa_destroy_pixmap;
+
+	if (!uxa_driver_init(screen, intel->uxa_driver)) {
+		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			   "UXA initialization failed\n");
+		free(intel->uxa_driver);
+		return FALSE;
+	}
+
+	uxa_set_fallback_debug(screen, intel->fallback_debug);
+
+	return TRUE;
+}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c new/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c	2010-11-23 10:01:19.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c	2011-02-08 11:14:00.000000000 +0100
@@ -23,7 +23,6 @@
  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
  **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c,v 1.11tsi Exp $ */
 
 /*
  * i830_video.c: i830/i845 Xv driver. 
@@ -69,18 +68,15 @@
 #include "i830_video.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "xaa.h"
-#include "xaalocal.h"
 #include "dixstruct.h"
 #include "fourcc.h"
 
 #ifdef INTEL_XVMC
 #define _INTEL_XVMC_SERVER_
 #include "i830_hwmc.h"
-#include "i915_hwmc.h"
 #endif
 
-#define OFF_DELAY 	250		/* milliseconds */
+#define OFF_DELAY 	250	/* milliseconds */
 #define FREE_DELAY 	15000
 
 #define OFF_TIMER 	0x01
@@ -89,46 +85,37 @@
 
 #define TIMER_MASK      (OFF_TIMER | FREE_TIMER)
 
-static void I830InitOffscreenImages(ScreenPtr);
-
 static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr);
 static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr);
 static void I830StopVideo(ScrnInfoPtr, pointer, Bool);
-static int I830SetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
+static int I830SetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, pointer);
 static int I830SetPortAttributeTextured(ScrnInfoPtr, Atom, INT32, pointer);
 static int I830GetPortAttribute(ScrnInfoPtr, Atom, INT32 *, pointer);
 static void I830QueryBestSize(ScrnInfoPtr, Bool,
 			      short, short, short, short, unsigned int *,
 			      unsigned int *, pointer);
-static int I830PutImage(ScrnInfoPtr, short, short, short, short, short, short,
+static int I830PutImageTextured(ScrnInfoPtr, short, short, short, short, short, short,
+			short, short, int, unsigned char *, short, short,
+			Bool, RegionPtr, pointer, DrawablePtr);
+static int I830PutImageOverlay(ScrnInfoPtr, short, short, short, short, short, short,
 			short, short, int, unsigned char *, short, short,
 			Bool, RegionPtr, pointer, DrawablePtr);
-static int I830QueryImageAttributesOverlay(ScrnInfoPtr, int, unsigned short *,
-					   unsigned short *, int *, int *);
-static int I830QueryImageAttributesTextured(ScrnInfoPtr, int, unsigned short *,
-					    unsigned short *, int *, int *);
+static int I830QueryImageAttributes(ScrnInfoPtr, int, unsigned short *,
+				    unsigned short *, int *, int *);
 
 #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
 
-static Atom xvBrightness, xvContrast, xvSaturation, xvColorKey, xvPipe, xvDoubleBuffer;
+static Atom xvBrightness, xvContrast, xvSaturation, xvColorKey, xvPipe;
 static Atom xvGamma0, xvGamma1, xvGamma2, xvGamma3, xvGamma4, xvGamma5;
 static Atom xvSyncToVblank;
 
 /* Limits for the overlay/textured video source sizes.  The documented hardware
  * limits are 2048x2048 or better for overlay and both of our textured video
- * implementations.  However, we run into the bigrequests limit of (currently)
- * 4MB, which even the planar format's 2048*2048*1.5 bytes is larger than.
- * Conveniently, the HD resolution, even in packed format, takes
- * (1920*1088*2) bytes, which is just shy of 4MB.  Additionally, on the 830
- * and 845, larger sizes resulted in the card hanging, so we keep the limits
- * lower there.
- *
- * While the HD resolution is actually 1920x1080, we increase our advertised
- * size to 1088 because some software wants to send an image aligned to
- * 16-pixel boundaries.
+ * implementations.  Additionally, on the 830 and 845, larger sizes resulted in
+ * the card hanging, so we keep the limits lower there.
  */
-#define IMAGE_MAX_WIDTH		1920
-#define IMAGE_MAX_HEIGHT	1088
+#define IMAGE_MAX_WIDTH		2048
+#define IMAGE_MAX_HEIGHT	2048
 #define IMAGE_MAX_WIDTH_LEGACY	1024
 #define IMAGE_MAX_HEIGHT_LEGACY	1088
 
@@ -139,11 +126,6 @@ static Atom xvSyncToVblank;
 #define OVERLAY_DEBUG if (0) ErrorF
 #endif
 
-/* Oops, I never exported this function in EXA.  I meant to. */
-#ifndef exaMoveInPixmap
-void exaMoveInPixmap (PixmapPtr pPixmap);
-#endif
-
 /*
  * OCMD - Overlay Command Register
  */
@@ -215,83 +197,87 @@ void exaMoveInPixmap (PixmapPtr pPixmap)
 
 /* client libraries expect an encoding */
 static XF86VideoEncodingRec DummyEncoding[1] = {
-    {
-	0,
-	"XV_IMAGE",
-	IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,
-	{1, 1}
-    }
+	{
+	 0,
+	 "XV_IMAGE",
+	 IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,
+	 {1, 1}
+	 }
 };
 
 #define NUM_FORMATS 3
 
 static XF86VideoFormatRec Formats[NUM_FORMATS] = {
-    {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+	{15, TrueColor}, {16, TrueColor}, {24, TrueColor}
 };
 
 #define CLONE_ATTRIBUTES 1
 static XF86AttributeRec CloneAttributes[CLONE_ATTRIBUTES] = {
-    {XvSettable | XvGettable, -1, 1, "XV_PIPE"}
+	{XvSettable | XvGettable, -1, 1, "XV_PIPE"}
 };
 
-#define NUM_ATTRIBUTES 5
+#define NUM_ATTRIBUTES 4
 static XF86AttributeRec Attributes[NUM_ATTRIBUTES] = {
-    {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
-    {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
-    {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
-    {XvSettable | XvGettable, 0, 1023, "XV_SATURATION"},
-    {XvSettable | XvGettable, 0, 1, "XV_DOUBLE_BUFFER"}
+	{XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
+	{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
+	{XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
+	{XvSettable | XvGettable, 0, 1023, "XV_SATURATION"}
 };
 
 #define NUM_TEXTURED_ATTRIBUTES 3
 static XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = {
-    {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
-    {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
-    {XvSettable | XvGettable, -1, 1, "XV_SYNC_TO_VBLANK"},
+	{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
+	{XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
+	{XvSettable | XvGettable, -1, 1, "XV_SYNC_TO_VBLANK"},
 };
 
 #define GAMMA_ATTRIBUTES 6
 static XF86AttributeRec GammaAttributes[GAMMA_ATTRIBUTES] = {
-    {XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA0"},
-    {XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA1"},
-    {XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA2"},
-    {XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA3"},
-    {XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA4"},
-    {XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA5"}
+	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA0"},
+	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA1"},
+	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA2"},
+	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA3"},
+	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA4"},
+	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA5"}
 };
 
+#ifdef INTEL_XVMC
 #define NUM_IMAGES 5
+#define XVMC_IMAGE 1
+#else
+#define NUM_IMAGES 4
+#define XVMC_IMAGE 0
+#endif
 
 static XF86ImageRec Images[NUM_IMAGES] = {
-    XVIMAGE_YUY2,
-    XVIMAGE_YV12,
-    XVIMAGE_I420,
-    XVIMAGE_UYVY,
+	XVIMAGE_YUY2,
+	XVIMAGE_YV12,
+	XVIMAGE_I420,
+	XVIMAGE_UYVY,
 #ifdef INTEL_XVMC
-    {
-        /*
-         * Below, a dummy picture type that is used in XvPutImage only to do
-         * an overlay update. Introduced for the XvMC client lib.
-         * Defined to have a zero data size.
-         */
-        FOURCC_XVMC,
-        XvYUV,
-        LSBFirst,
-        {'X', 'V', 'M', 'C',
-         0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00,
-         0x38, 0x9B, 0x71},
-        12,
-        XvPlanar,
-        3,
-        0, 0, 0, 0,
-        8, 8, 8,
-        1, 2, 2,
-        1, 2, 2,
-        {'Y', 'V', 'U',
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-        XvTopToBottom
-    },
+	{
+	 /*
+	  * Below, a dummy picture type that is used in XvPutImage only to do
+	  * an overlay update. Introduced for the XvMC client lib.
+	  * Defined to have a zero data size.
+	  */
+	 FOURCC_XVMC,
+	 XvYUV,
+	 LSBFirst,
+	 {'X', 'V', 'M', 'C',
+	  0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00,
+	  0x38, 0x9B, 0x71},
+	 12,
+	 XvPlanar,
+	 3,
+	 0, 0, 0, 0,
+	 8, 8, 8,
+	 1, 2, 2,
+	 1, 2, 2,
+	 {'Y', 'V', 'U',
+	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	 XvTopToBottom},
 #endif
 };
 
@@ -350,49 +336,48 @@ typedef struct {
     uint16_t RESERVEDG[0x100 / 2 - N_HORIZ_UV_TAPS * N_PHASES];
 } I830OverlayRegRec, *I830OverlayRegPtr;
 
-#define I830OVERLAYREG(pI830) ((I830OverlayRegPtr)\
-			       ((pI830)->FbBase + \
-				(pI830)->overlay_regs->offset))
+#define I830OVERLAYREG(intel) ((I830OverlayRegPtr)\
+			       ((intel)->FbBase + \
+				(intel)->overlay_regs->offset))
 #if VIDEO_DEBUG
-static void
-CompareOverlay(I830Ptr pI830, uint32_t * overlay, int size)
+static void CompareOverlay(intel_screen_private *intel, uint32_t * overlay, int size)
 {
-    int i;
-    uint32_t val;
-    int bad = 0;
+	int i;
+	uint32_t val;
+	int bad = 0;
 
-    for (i = 0; i < size; i += 4) {
-	val = INREG(0x30100 + i);
-	if (val != overlay[i / 4]) {
-	    OVERLAY_DEBUG("0x%05x value doesn't match (0x%lx != 0x%lx)\n",
-			  0x30100 + i, val, overlay[i / 4]);
-	    bad++;
+	for (i = 0; i < size; i += 4) {
+		val = INREG(0x30100 + i);
+		if (val != overlay[i / 4]) {
+			OVERLAY_DEBUG
+			    ("0x%05x value doesn't match (0x%lx != 0x%lx)\n",
+			     0x30100 + i, val, overlay[i / 4]);
+			bad++;
+		}
 	}
-    }
-    if (!bad)
-	OVERLAY_DEBUG("CompareOverlay: no differences\n");
+	if (!bad)
+		OVERLAY_DEBUG("CompareOverlay: no differences\n");
 }
 #endif
 
-static void
-I830SetOneLineModeRatio(ScrnInfoPtr pScrn);
+static void I830SetOneLineModeRatio(ScrnInfoPtr scrn);
 
 static void
-i830_overlay_switch_to_crtc (ScrnInfoPtr pScrn, xf86CrtcPtr crtc)
+i830_overlay_switch_to_crtc (ScrnInfoPtr scrn, xf86CrtcPtr crtc)
 {
-    I830Ptr		pI830 = I830PTR(pScrn);
-    I830PortPrivPtr	pPriv = GET_PORT_PRIVATE(pScrn);
-    I830CrtcPrivatePtr  intel_crtc = crtc->driver_private;
-    int			pipeconf_reg = intel_crtc->pipe == 0 ? PIPEACONF : PIPEBCONF;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
+	I830CrtcPrivatePtr  intel_crtc = crtc->driver_private;
+	int			pipeconf_reg = intel_crtc->pipe == 0 ? PIPEACONF : PIPEBCONF;
 
     /* overlay can't be used on pipe with double wide, and pipe must be enabled. */
-    if ((!IS_I965G(pI830) && (INREG(pipeconf_reg) & PIPEACONF_DOUBLE_WIDE))
+    if ((!IS_I965G(intel) && (INREG(pipeconf_reg) & PIPEACONF_DOUBLE_WIDE))
 	    || (intel_crtc->dpms_mode == DPMSModeOff))
-	pPriv->overlayOK = FALSE;
+	adaptor_priv->overlayOK = FALSE;
     else
-	pPriv->overlayOK = TRUE;
+	adaptor_priv->overlayOK = TRUE;
 
-    if (!pPriv->overlayOK)
+    if (!adaptor_priv->overlayOK)
 	return;
 
     /* Check we have an LFP connected */
@@ -409,20 +394,20 @@ i830_overlay_switch_to_crtc (ScrnInfoPtr
 	active = INREG(vtotal_reg) & 0x7FF;
 
 	if (vsize < active && hsize > 1024)
-	    I830SetOneLineModeRatio(pScrn);
+	    I830SetOneLineModeRatio(scrn);
 
-	if (pPriv->scaleRatio & 0xFFFE0000) 
+	if (adaptor_priv->scaleRatio & 0xFFFE0000) 
 	{
 	    /* Possible bogus ratio, using in-accurate fallback */
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		       "Bogus panel fit register, Xvideo positioning may not "
 		       "be accurate.\n");
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 		       "Using fallback ratio - was 0x%x, now 0x%x\n",
-		       pPriv->scaleRatio,
+		       adaptor_priv->scaleRatio,
 		       (int)(((float)active * 65536)/(float)vsize));
 
-	    pPriv->scaleRatio = (int)(((float)active * 65536) / (float)vsize);
+	    adaptor_priv->scaleRatio = (int)(((float)active * 65536) / (float)vsize);
 	}
     }
 }
@@ -436,14 +421,14 @@ i830_overlay_switch_to_crtc (ScrnInfoPtr
  */
 
 static void
-i830_overlay_on(ScrnInfoPtr pScrn)
+i830_overlay_on(ScrnInfoPtr scrn)
 {
-    I830Ptr		pI830 = I830PTR(pScrn);
-    I830OverlayRegPtr	overlay = I830OVERLAYREG(pI830);
-    I830PortPrivPtr	pPriv = pI830->adaptor->pPortPrivates[0].ptr;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    I830OverlayRegPtr	overlay = I830OVERLAYREG(intel);
+    intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
     Bool		deactivate = FALSE;
     
-    if (pI830->overlayOn)
+    if (intel->overlayOn)
 	return;
 
     /*
@@ -451,51 +436,51 @@ i830_overlay_on(ScrnInfoPtr pScrn)
      * turn on and blank the entire screen or lock up the ring. Light up pipe
      * A in this case to provide a clock for the overlay hardware
      */
-    if (pPriv->current_crtc && i830_crtc_pipe (pPriv->current_crtc) != 0)
-	deactivate = i830_pipe_a_require_activate (pScrn);
+    if (adaptor_priv->current_crtc && i830_crtc_pipe (adaptor_priv->current_crtc) != 0)
+	deactivate = i830_pipe_a_require_activate (scrn);
 
     overlay->OCMD &= ~OVERLAY_ENABLE;
     BEGIN_BATCH(6);
     OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE);
     OUT_BATCH(MI_NOOP);
     OUT_BATCH(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_ON);
-    if (OVERLAY_NOPHYSICAL(pI830))
-	OUT_BATCH(pI830->overlay_regs->offset | OFC_UPDATE);
+    if (OVERLAY_NOPHYSICAL(intel))
+	OUT_BATCH(intel->overlay_regs->offset | OFC_UPDATE);
     else
-	OUT_BATCH(pI830->overlay_regs->bus_addr | OFC_UPDATE);
+	OUT_BATCH(intel->overlay_regs->bus_addr | OFC_UPDATE);
     /* Wait for the overlay to light up before attempting to use it */
     OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
     OUT_BATCH(MI_NOOP);
     ADVANCE_BATCH();
-    i830WaitSync(pScrn);
+    intel_sync(scrn);
     
     /*
      * If we turned pipe A on up above, turn it
      * back off
      */
     if (deactivate)
-	i830_pipe_a_require_deactivate (pScrn);
+	i830_pipe_a_require_deactivate (scrn);
 
     OVERLAY_DEBUG("overlay_on\n");
-    pI830->overlayOn = TRUE;
+    intel->overlayOn = TRUE;
 
     overlay->OCMD |= OVERLAY_ENABLE;
 }
 
 static void
-i830_overlay_continue(ScrnInfoPtr pScrn, Bool update_filter)
+i830_overlay_continue(ScrnInfoPtr scrn, Bool update_filter)
 {
-    I830Ptr		pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     uint32_t		flip_addr;
-    I830OverlayRegPtr	overlay = I830OVERLAYREG(pI830);
+    I830OverlayRegPtr	overlay = I830OVERLAYREG(intel);
 
-    if (!pI830->overlayOn)
+    if (!intel->overlayOn)
 	return;
 
-    if (OVERLAY_NOPHYSICAL(pI830))
-	flip_addr = pI830->overlay_regs->offset;
+    if (OVERLAY_NOPHYSICAL(intel))
+	flip_addr = intel->overlay_regs->offset;
     else
-	flip_addr = pI830->overlay_regs->bus_addr;
+	flip_addr = intel->overlay_regs->bus_addr;
     if (update_filter)
 	flip_addr |= OFC_UPDATE;
     OVERLAY_DEBUG ("overlay_continue cmd 0x%08x  -> 0x%08x sta 0x%08x\n",
@@ -507,20 +492,22 @@ i830_overlay_continue(ScrnInfoPtr pScrn,
     OUT_BATCH(flip_addr);
     ADVANCE_BATCH();
     OVERLAY_DEBUG("overlay_continue\n");
+
+    intel_sync(scrn);
 }
 
 static void
-i830_overlay_off(ScrnInfoPtr pScrn)
+i830_overlay_off(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830OverlayRegPtr	overlay = I830OVERLAYREG(pI830);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    I830OverlayRegPtr	overlay = I830OVERLAYREG(intel);
 
-    if (!pI830->overlayOn)
+    if (!intel->overlayOn)
 	return;
 
     /*
      * Wait for overlay to go idle. This has to be
-     * separated from the turning off state by a WaitSync
+     * separated from the turning off state by a Sync
      * to ensure the overlay will not read OCMD early and
      * disable the overlay before the commands here are
      * executed
@@ -530,7 +517,7 @@ i830_overlay_off(ScrnInfoPtr pScrn)
 	OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
 	OUT_BATCH(MI_NOOP);
 	ADVANCE_BATCH();
-	i830WaitSync(pScrn);
+	intel_sync(scrn);
     }
     
     /*
@@ -544,131 +531,105 @@ i830_overlay_off(ScrnInfoPtr pScrn)
 	OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE);
 	OUT_BATCH(MI_NOOP);
 	OUT_BATCH(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_CONTINUE);
-	if (OVERLAY_NOPHYSICAL(pI830))
-	    OUT_BATCH(pI830->overlay_regs->offset);
+	if (OVERLAY_NOPHYSICAL(intel))
+	    OUT_BATCH(intel->overlay_regs->offset);
 	else
-	    OUT_BATCH(pI830->overlay_regs->bus_addr);
+	    OUT_BATCH(intel->overlay_regs->bus_addr);
 	OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
 	OUT_BATCH(MI_NOOP);
 	ADVANCE_BATCH();
-	i830WaitSync(pScrn);
+	intel_sync(scrn);
     }
-    pI830->overlayOn = FALSE;
+    intel->overlayOn = FALSE;
     OVERLAY_DEBUG("overlay_off\n");
 }
 
-void
-I830InitVideo(ScreenPtr pScreen)
+void I830InitVideo(ScreenPtr screen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
-    XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
-    int num_adaptors;
-#ifdef INTEL_XVMC
-    Bool xvmc_status = FALSE;
-#endif
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
+	XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
+	int num_adaptors;
+
+	num_adaptors = xf86XVListGenericAdaptors(scrn, &adaptors);
+	/* Give our adaptor list enough space for the overlay and/or texture video
+	 * adaptors.
+	 */
+	newAdaptors =
+	    malloc((num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr *));
+	if (newAdaptors == NULL)
+		return;
+
+	memcpy(newAdaptors, adaptors,
+	       num_adaptors * sizeof(XF86VideoAdaptorPtr));
+	adaptors = newAdaptors;
 
-#if 0
-    {
-	I830OverlayRegRec tmp;
+	/* Add the adaptors supported by our hardware.  First, set up the atoms
+	 * that will be used by both output adaptors.
+	 */
+	xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
+	xvContrast = MAKE_ATOM("XV_CONTRAST");
 
-	ErrorF("sizeof I830OverlayRegRec is 0x%x\n", sizeof(I830OverlayRegRec));
-	ErrorF("Reserved C, D, E, F, G are %x, %x, %x, %x, %x\n",
-	       (unsigned long)&(tmp.RESERVEDC[0]) - (unsigned long)&tmp,
-	       (unsigned long)&(tmp.RESERVEDD[0]) - (unsigned long)&tmp,
-	       (unsigned long)&(tmp.RESERVEDE[0]) - (unsigned long)&tmp,
-	       (unsigned long)&(tmp.RESERVEDF[0]) - (unsigned long)&tmp,
-	       (unsigned long)&(tmp.RESERVEDG[0]) - (unsigned long)&tmp);
-    }
-#endif
+	/* Set up textured video if we can do it at this depth and we are on
+	 * supported hardware.
+	 */
+	if (scrn->bitsPerPixel >= 16 && (IS_I9XX(intel) || IS_I965G(intel))) {
+		texturedAdaptor = I830SetupImageVideoTextured(screen);
+		if (texturedAdaptor != NULL) {
+			xf86DrvMsg(scrn->scrnIndex, X_INFO,
+				   "Set up textured video\n");
+		} else {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+				   "Failed to set up textured video\n");
+		}
+	}
 
-    num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
-    /* Give our adaptor list enough space for the overlay and/or texture video
-     * adaptors.
-     */
-    newAdaptors = xalloc((num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr *));
-    if (newAdaptors == NULL)
-	return;
+	/* Set up overlay video if we can do it at this depth. */
+	if (!OVERLAY_NOEXIST(intel) && scrn->bitsPerPixel != 8 &&
+	    !intel->use_drm_mode && intel->overlay_regs != NULL) {
+		overlayAdaptor = I830SetupImageVideoOverlay(screen);
+		if (overlayAdaptor != NULL) {
+			xf86DrvMsg(scrn->scrnIndex, X_INFO, "Set up overlay video\n");
+		} else {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+			    "Failed to set up overlay video\n");
+		}
+	}
 
-    memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
-    adaptors = newAdaptors;
+	if (overlayAdaptor && intel->XvPreferOverlay)
+	adaptors[num_adaptors++] = overlayAdaptor;
 
-    /* Add the adaptors supported by our hardware.  First, set up the atoms
-     * that will be used by both output adaptors.
-     */
-    xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-    xvContrast = MAKE_ATOM("XV_CONTRAST");
+	if (texturedAdaptor)
+		adaptors[num_adaptors++] = texturedAdaptor;
 
-    /* Set up textured video if we can do it at this depth and we are on
-     * supported hardware.
-     */
-    if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(pI830) || IS_I965G(pI830)) &&
-	!(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
-    {
-	texturedAdaptor = I830SetupImageVideoTextured(pScreen);
-	if (texturedAdaptor != NULL) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
-	} else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Failed to set up textured video\n");
-	}
-    }
+	if (overlayAdaptor && !intel->XvPreferOverlay)
+		adaptors[num_adaptors++] = overlayAdaptor;
 
-    /* Set up overlay video if we can do it at this depth. */
-    if (!OVERLAY_NOEXIST(pI830) && pScrn->bitsPerPixel != 8 &&
-	!pI830->use_drm_mode && pI830->overlay_regs != NULL)
-    {
-	overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
-	if (overlayAdaptor != NULL) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up overlay video\n");
+	if (num_adaptors) {
+		xf86XVScreenInit(screen, adaptors, num_adaptors);
 	} else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "Failed to set up overlay video\n");
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "Disabling Xv because no adaptors could be initialized.\n");
+		intel->XvEnabled = FALSE;
 	}
-	I830InitOffscreenImages(pScreen);
-    }
-
-    if (overlayAdaptor && pI830->XvPreferOverlay)
-       adaptors[num_adaptors++] = overlayAdaptor;
-
-    if (texturedAdaptor)
-       adaptors[num_adaptors++] = texturedAdaptor;
-
-    if (overlayAdaptor && !pI830->XvPreferOverlay)
-       adaptors[num_adaptors++] = overlayAdaptor;
 
 #ifdef INTEL_XVMC
-    if (intel_xvmc_probe(pScrn)) {
 	if (texturedAdaptor)
-	    xvmc_status = intel_xvmc_driver_init(pScreen, texturedAdaptor);
-    }
-#endif
-
-    if (num_adaptors) {
-	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
-    } else {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "Disabling Xv because no adaptors could be initialized.\n");
-	pI830->XvEnabled = FALSE;
-    }
-
-#ifdef INTEL_XVMC
-    if (xvmc_status)
-	intel_xvmc_screen_init(pScreen);
+		intel_xvmc_adaptor_init(screen);
 #endif
-    xfree(adaptors);
+	free(adaptors);
 }
 
 static void
-I830ResetVideo(ScrnInfoPtr pScrn)
+I830ResetVideo(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr;
-    I830OverlayRegPtr	overlay = I830OVERLAYREG(pI830);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
+    I830OverlayRegPtr	overlay = I830OVERLAYREG(intel);
 
     OVERLAY_DEBUG("I830ResetVideo: base: %p, offset: 0x%lx, obase: %p\n",
-		  pI830->FbBase, pI830->overlay_regs->offset, overlay);
+		  intel->FbBase, intel->overlay_regs->offset, overlay);
     /*
      * Default to maximum image size in YV12
      */
@@ -683,8 +644,8 @@ I830ResetVideo(ScrnInfoPtr pScrn)
     overlay->SWIDTH = 0;
     overlay->SWIDTHSW = 0;
     overlay->SHEIGHT = 0;
-    overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
-    overlay->OCLRC1 = pPriv->saturation;
+    overlay->OCLRC0 = (adaptor_priv->contrast << 18) | (adaptor_priv->brightness & 0xff);
+    overlay->OCLRC1 = adaptor_priv->saturation;
 #if 0
     overlay->AWINPOS = 0;
     overlay->AWINSZ = 0;
@@ -694,21 +655,21 @@ I830ResetVideo(ScrnInfoPtr pScrn)
     /*
      * Enable destination color keying
      */
-    switch (pScrn->depth) {
+    switch (scrn->depth) {
     case 8:
 	overlay->DCLRKV = 0;
 	overlay->DCLRKM = 0xffffff | DEST_KEY_ENABLE;
 	break;
     case 15:
-	overlay->DCLRKV = RGB15ToColorKey(pPriv->colorKey);
+	overlay->DCLRKV = RGB15ToColorKey(adaptor_priv->colorKey);
 	overlay->DCLRKM = 0x070707 | DEST_KEY_ENABLE;
 	break;
     case 16:
-	overlay->DCLRKV = RGB16ToColorKey(pPriv->colorKey);
+	overlay->DCLRKV = RGB16ToColorKey(adaptor_priv->colorKey);
 	overlay->DCLRKM = 0x070307 | DEST_KEY_ENABLE;
 	break;
     default:
-	overlay->DCLRKV = pPriv->colorKey;
+	overlay->DCLRKV = adaptor_priv->colorKey;
 	overlay->DCLRKM = DEST_KEY_ENABLE;
 	break;
     }
@@ -717,14 +678,14 @@ I830ResetVideo(ScrnInfoPtr pScrn)
     overlay->SCLRKVL = 0;
     overlay->SCLRKEN = 0;		/* source color key disable */
     overlay->OCONFIG = CC_OUT_8BIT;
-    if (IS_I965GM(pI830))
+    if (IS_I965GM(intel))
 	overlay->OCONFIG |= CSC_MODE_BT709;
 
     /*
      * Select which pipe the overlay is enabled on.
      */
     overlay->OCONFIG &= ~OVERLAY_PIPE_MASK;
-    if (i830_crtc_pipe (pPriv->current_crtc) == 0)
+    if (i830_crtc_pipe (adaptor_priv->current_crtc) == 0)
 	overlay->OCONFIG |= OVERLAY_PIPE_A;
     else 
 	overlay->OCONFIG |= OVERLAY_PIPE_B;
@@ -750,14 +711,14 @@ I830ResetVideo(ScrnInfoPtr pScrn)
 #define PFIT_PROGRAMMED_SCALE_RATIO 0x61234
 
 static void
-I830SetOneLineModeRatio(ScrnInfoPtr pScrn)
+I830SetOneLineModeRatio(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
     uint32_t panelFitControl = INREG(PFIT_CONTROLS);
     int vertScale;
 
-    pPriv->scaleRatio = 0x10000;
+    adaptor_priv->scaleRatio = 0x10000;
 
     if (panelFitControl & PFIT_ON_MASK) {
 	if (panelFitControl & PFIT_AUTOVSCALE_MASK) {
@@ -767,15 +728,15 @@ I830SetOneLineModeRatio(ScrnInfoPtr pScr
 	}
 
 	if (vertScale != 0)
-	    pPriv->scaleRatio = ((double) 0x10000 / (double)vertScale) * 0x10000;
+	    adaptor_priv->scaleRatio = ((double) 0x10000 / (double)vertScale) * 0x10000;
 
-	pPriv->oneLineMode = TRUE;
+	adaptor_priv->oneLineMode = TRUE;
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enabling Xvideo one-line mode\n");
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "Enabling Xvideo one-line mode\n");
     }
 
-    if (pPriv->scaleRatio == 0x10000)
-	pPriv->oneLineMode = FALSE;
+    if (adaptor_priv->scaleRatio == 0x10000)
+	adaptor_priv->oneLineMode = FALSE;
 }
 
 static uint32_t I830BoundGammaElt (uint32_t elt, uint32_t eltPrev)
@@ -791,23 +752,37 @@ static uint32_t I830BoundGammaElt (uint3
 
 static uint32_t I830BoundGamma (uint32_t gamma, uint32_t gammaPrev)
 {
-    return (I830BoundGammaElt (gamma >> 24, gammaPrev >> 24) << 24 |
-	    I830BoundGammaElt (gamma >> 16, gammaPrev >> 16) << 16 |
+    return (I830BoundGammaElt (gamma >> 16, gammaPrev >> 16) << 16 |
 	    I830BoundGammaElt (gamma >>  8, gammaPrev >>  8) <<  8 |
 	    I830BoundGammaElt (gamma      , gammaPrev      ));
 }
 
+static uint32_t I830Gamma5Errata(uint32_t gamma)
+{
+    int i;
+
+    for (i = 0; i < 3; i++) {
+	if ((gamma >> i*8 & 0xff) == 0x80) {
+	    /* According to Intel docs, overlay fails if GAMMA5 is 0x80.
+	     * In this case, change the value to 0x81 */
+	    gamma += 1 << i*8;
+	}
+    }
+
+    return gamma;
+}
+
 static void
-I830UpdateGamma(ScrnInfoPtr pScrn)
+I830UpdateGamma(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr;
-    uint32_t gamma0 = pPriv->gamma0;
-    uint32_t gamma1 = pPriv->gamma1;
-    uint32_t gamma2 = pPriv->gamma2;
-    uint32_t gamma3 = pPriv->gamma3;
-    uint32_t gamma4 = pPriv->gamma4;
-    uint32_t gamma5 = pPriv->gamma5;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
+    uint32_t gamma0 = adaptor_priv->gamma0;
+    uint32_t gamma1 = adaptor_priv->gamma1;
+    uint32_t gamma2 = adaptor_priv->gamma2;
+    uint32_t gamma3 = adaptor_priv->gamma3;
+    uint32_t gamma4 = adaptor_priv->gamma4;
+    uint32_t gamma5 = adaptor_priv->gamma5;
 
 #if 0
     ErrorF ("Original gamma: 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n",
@@ -818,6 +793,7 @@ I830UpdateGamma(ScrnInfoPtr pScrn)
     gamma3 = I830BoundGamma (gamma3, gamma2);
     gamma4 = I830BoundGamma (gamma4, gamma3);
     gamma5 = I830BoundGamma (gamma5, gamma4);
+    gamma5 = I830Gamma5Errata(gamma5);
 #if 0
     ErrorF ("Bounded  gamma: 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n",
 	    gamma0, gamma1, gamma2, gamma3, gamma4, gamma5);
@@ -831,732 +807,682 @@ I830UpdateGamma(ScrnInfoPtr pScrn)
     OUTREG(OGAMC0, gamma0);
 }
 
-static XF86VideoAdaptorPtr
-I830SetupImageVideoOverlay(ScreenPtr pScreen)
+static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr screen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    XF86VideoAdaptorPtr adapt;
-    I830PortPrivPtr pPriv;
-    XF86AttributePtr att;
-
-    OVERLAY_DEBUG("I830SetupImageVideoOverlay\n");
-
-    if (!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-			  sizeof(I830PortPrivRec) + sizeof(DevUnion))))
-	return NULL;
-
-    adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-    adapt->flags = VIDEO_OVERLAID_IMAGES /*| VIDEO_CLIP_TO_VIEWPORT*/;
-    adapt->name = "Intel(R) Video Overlay";
-    adapt->nEncodings = 1;
-    adapt->pEncodings = DummyEncoding;
-    /* update the DummyEncoding for these two chipsets */
-    if (IS_845G(pI830) || IS_I830(pI830)) {
-	adapt->pEncodings->width = IMAGE_MAX_WIDTH_LEGACY;
-	adapt->pEncodings->height = IMAGE_MAX_HEIGHT_LEGACY;
-    }
-    adapt->nFormats = NUM_FORMATS;
-    adapt->pFormats = Formats;
-    adapt->nPorts = 1;
-    adapt->pPortPrivates = (DevUnion *) (&adapt[1]);
-
-    pPriv = (I830PortPrivPtr) (&adapt->pPortPrivates[1]);
-
-    adapt->pPortPrivates[0].ptr = (pointer) (pPriv);
-    adapt->nAttributes = NUM_ATTRIBUTES;
-    adapt->nAttributes += CLONE_ATTRIBUTES;
-    if (IS_I9XX(pI830))
-	adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */
-    adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
-    /* Now copy the attributes */
-    att = adapt->pAttributes;
-    memcpy((char *)att, (char*)Attributes, sizeof(XF86AttributeRec)* NUM_ATTRIBUTES);
-    att+=NUM_ATTRIBUTES;
-    memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES);
-    att+=CLONE_ATTRIBUTES;
-    if (IS_I9XX(pI830)) {
-	memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
-	att+=GAMMA_ATTRIBUTES;
-    }
-    adapt->nImages = NUM_IMAGES;
-    adapt->pImages = Images;
-    adapt->PutVideo = NULL;
-    adapt->PutStill = NULL;
-    adapt->GetVideo = NULL;
-    adapt->GetStill = NULL;
-    adapt->StopVideo = I830StopVideo;
-    adapt->SetPortAttribute = I830SetPortAttribute;
-    adapt->GetPortAttribute = I830GetPortAttribute;
-    adapt->QueryBestSize = I830QueryBestSize;
-    adapt->PutImage = I830PutImage;
-    adapt->QueryImageAttributes = I830QueryImageAttributesOverlay;
-
-    pPriv->textured = FALSE;
-    pPriv->colorKey = pI830->colorKey & ((1 << pScrn->depth) - 1);
-    pPriv->videoStatus = 0;
-    pPriv->brightness = -19; /* (255/219) * -16 */
-    pPriv->contrast = 75;  /* 255/219 * 64 */
-    pPriv->saturation = 146; /* 128/112 * 128 */
-    pPriv->current_crtc = NULL;
-    pPriv->desired_crtc = NULL;
-    pPriv->buf = NULL;
-    pPriv->currentBuf = 0;
-    pPriv->gamma5 = 0xc0c0c0;
-    pPriv->gamma4 = 0x808080;
-    pPriv->gamma3 = 0x404040;
-    pPriv->gamma2 = 0x202020;
-    pPriv->gamma1 = 0x101010;
-    pPriv->gamma0 = 0x080808;
-    pPriv->doubleBuffer = 1;
-
-    pPriv->rotation = RR_Rotate_0;
-
-    /* gotta uninit this someplace */
-    REGION_NULL(pScreen, &pPriv->clip);
-
-    pI830->adaptor = adapt;
-
-    /* With LFP's we need to detect whether we're in One Line Mode, which
-     * essentially means a resolution greater than 1024x768, and fix up
-     * the scaler accordingly. */
-    pPriv->scaleRatio = 0x10000;
-    pPriv->oneLineMode = FALSE;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	XF86VideoAdaptorPtr adapt;
+	intel_adaptor_private *adaptor_priv;
+	XF86AttributePtr att;
+
+	OVERLAY_DEBUG("I830SetupImageVideoOverlay\n");
+
+	if (!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+			      sizeof(intel_adaptor_private) + sizeof(DevUnion))))
+		return NULL;
+
+	adapt->type = XvWindowMask | XvInputMask | XvImageMask;
+	adapt->flags = VIDEO_OVERLAID_IMAGES /*| VIDEO_CLIP_TO_VIEWPORT */ ;
+	adapt->name = "Intel(R) Video Overlay";
+	adapt->nEncodings = 1;
+	adapt->pEncodings = DummyEncoding;
+	/* update the DummyEncoding for these two chipsets */
+	if (IS_845G(intel) || IS_I830(intel)) {
+		adapt->pEncodings->width = IMAGE_MAX_WIDTH_LEGACY;
+		adapt->pEncodings->height = IMAGE_MAX_HEIGHT_LEGACY;
+	}
+	adapt->nFormats = NUM_FORMATS;
+	adapt->pFormats = Formats;
+	adapt->nPorts = 1;
+	adapt->pPortPrivates = (DevUnion *) (&adapt[1]);
+
+	adaptor_priv = (intel_adaptor_private *)&adapt->pPortPrivates[1];
+
+	adapt->pPortPrivates[0].ptr = (pointer) (adaptor_priv);
+	adapt->nAttributes = NUM_ATTRIBUTES;
+	adapt->nAttributes += CLONE_ATTRIBUTES;
+	if (IS_I9XX(intel))
+		adapt->nAttributes += GAMMA_ATTRIBUTES;	/* has gamma */
+	adapt->pAttributes =
+	    xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
+	/* Now copy the attributes */
+	att = adapt->pAttributes;
+	memcpy((char *)att, (char *)Attributes,
+	       sizeof(XF86AttributeRec) * NUM_ATTRIBUTES);
+	att += NUM_ATTRIBUTES;
+	memcpy((char *)att, (char *)CloneAttributes,
+	       sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES);
+	att += CLONE_ATTRIBUTES;
+	if (IS_I9XX(intel)) {
+		memcpy((char *)att, (char *)GammaAttributes,
+		       sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
+		att += GAMMA_ATTRIBUTES;
+	}
+	adapt->nImages = NUM_IMAGES - XVMC_IMAGE;
+
+	adapt->pImages = Images;
+	adapt->PutVideo = NULL;
+	adapt->PutStill = NULL;
+	adapt->GetVideo = NULL;
+	adapt->GetStill = NULL;
+	adapt->StopVideo = I830StopVideo;
+	adapt->SetPortAttribute = I830SetPortAttributeOverlay;
+	adapt->GetPortAttribute = I830GetPortAttribute;
+	adapt->QueryBestSize = I830QueryBestSize;
+	adapt->PutImage = I830PutImageOverlay;
+	adapt->QueryImageAttributes = I830QueryImageAttributes;
+
+	adaptor_priv->textured = FALSE;
+	adaptor_priv->colorKey = intel->colorKey & ((1 << scrn->depth) - 1);
+	adaptor_priv->videoStatus = 0;
+	adaptor_priv->brightness = -19;	/* (255/219) * -16 */
+	adaptor_priv->contrast = 75;	/* 255/219 * 64 */
+	adaptor_priv->saturation = 146;	/* 128/112 * 128 */
+	adaptor_priv->current_crtc = NULL;
+	adaptor_priv->desired_crtc = NULL;
+	adaptor_priv->buf = NULL;
+	adaptor_priv->oldBuf = NULL;
+	adaptor_priv->oldBuf_pinned = FALSE;
+	adaptor_priv->gamma5 = 0xc0c0c0;
+	adaptor_priv->gamma4 = 0x808080;
+	adaptor_priv->gamma3 = 0x404040;
+	adaptor_priv->gamma2 = 0x202020;
+	adaptor_priv->gamma1 = 0x101010;
+	adaptor_priv->gamma0 = 0x080808;
+
+	adaptor_priv->rotation = RR_Rotate_0;
+
+	/* gotta uninit this someplace */
+	REGION_NULL(screen, &adaptor_priv->clip);
+
+	intel->adaptor = adapt;
+
+	/* With LFP's we need to detect whether we're in One Line Mode, which
+	 * essentially means a resolution greater than 1024x768, and fix up
+	 * the scaler accordingly. */
+	adaptor_priv->scaleRatio = 0x10000;
+	adaptor_priv->oneLineMode = FALSE;
 
-    /*
-     * Initialise pPriv->overlayOK.  Set it to TRUE here so that a warning will
-     * be generated if i830_crtc_dpms_video() sets it to FALSE during mode
-     * setup.
-     */
-    pPriv->overlayOK = TRUE;
-
-    xvColorKey = MAKE_ATOM("XV_COLORKEY");
-    xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-    xvContrast = MAKE_ATOM("XV_CONTRAST");
-    xvSaturation = MAKE_ATOM("XV_SATURATION");
-    xvDoubleBuffer = MAKE_ATOM("XV_DOUBLE_BUFFER");
-
-    /* Allow the pipe to be switched from pipe A to B when in clone mode */
-    xvPipe = MAKE_ATOM("XV_PIPE");
+	/*
+	 * Initialise adaptor_priv->overlayOK.  Set it to TRUE here so that a
+	 * warning will be generated if i830_crtc_dpms_video() sets it to
+	 * FALSE during mode setup.
+	 */
+	adaptor_priv->overlayOK = TRUE;
 
-    if (IS_I9XX(pI830)) {
-	xvGamma0 = MAKE_ATOM("XV_GAMMA0");
-	xvGamma1 = MAKE_ATOM("XV_GAMMA1");
-	xvGamma2 = MAKE_ATOM("XV_GAMMA2");
-	xvGamma3 = MAKE_ATOM("XV_GAMMA3");
-	xvGamma4 = MAKE_ATOM("XV_GAMMA4");
-	xvGamma5 = MAKE_ATOM("XV_GAMMA5");
-    }
+	xvColorKey = MAKE_ATOM("XV_COLORKEY");
+	xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
+	xvContrast = MAKE_ATOM("XV_CONTRAST");
+	xvSaturation = MAKE_ATOM("XV_SATURATION");
+
+	/* Allow the pipe to be switched from pipe A to B when in clone mode */
+	xvPipe = MAKE_ATOM("XV_PIPE");
+
+	if (IS_I9XX(intel)) {
+		xvGamma0 = MAKE_ATOM("XV_GAMMA0");
+		xvGamma1 = MAKE_ATOM("XV_GAMMA1");
+		xvGamma2 = MAKE_ATOM("XV_GAMMA2");
+		xvGamma3 = MAKE_ATOM("XV_GAMMA3");
+		xvGamma4 = MAKE_ATOM("XV_GAMMA4");
+		xvGamma5 = MAKE_ATOM("XV_GAMMA5");
+	}
+
+	/* XXX These two acccess the overlay regs, don't call with drmmode */
+	I830ResetVideo(scrn);
+	I830UpdateGamma(scrn);
+
+	return adapt;
+}
+
+static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr screen)
+{
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	XF86VideoAdaptorPtr adapt;
+	XF86AttributePtr attrs;
+	intel_adaptor_private *adaptor_privs;
+	DevUnion *devUnions;
+	int nports = 16, i;
+	int nAttributes;
+
+	OVERLAY_DEBUG("I830SetupImageVideoOverlay\n");
+
+	nAttributes = NUM_TEXTURED_ATTRIBUTES;
+
+	adapt = calloc(1, sizeof(XF86VideoAdaptorRec));
+	adaptor_privs = calloc(nports, sizeof(intel_adaptor_private));
+	devUnions = calloc(nports, sizeof(DevUnion));
+	attrs = calloc(nAttributes, sizeof(XF86AttributeRec));
+	if (adapt == NULL || adaptor_privs == NULL || devUnions == NULL ||
+	    attrs == NULL) {
+		free(adapt);
+		free(adaptor_privs);
+		free(devUnions);
+		free(attrs);
+		return NULL;
+	}
+
+	adapt->type = XvWindowMask | XvInputMask | XvImageMask;
+	adapt->flags = 0;
+	adapt->name = "Intel(R) Textured Video";
+	adapt->nEncodings = 1;
+	adapt->pEncodings = DummyEncoding;
+	adapt->nFormats = NUM_FORMATS;
+	adapt->pFormats = Formats;
+	adapt->nPorts = nports;
+	adapt->pPortPrivates = devUnions;
+	adapt->nAttributes = nAttributes;
+	adapt->pAttributes = attrs;
+	memcpy(attrs, TexturedAttributes,
+	       nAttributes * sizeof(XF86AttributeRec));
+	if (IS_I915G(intel) || IS_I915GM(intel))
+		adapt->nImages = NUM_IMAGES - XVMC_IMAGE;
+	else
+		adapt->nImages = NUM_IMAGES;
 
-    I830ResetVideo(pScrn);
+	adapt->pImages = Images;
+	adapt->PutVideo = NULL;
+	adapt->PutStill = NULL;
+	adapt->GetVideo = NULL;
+	adapt->GetStill = NULL;
+	adapt->StopVideo = I830StopVideo;
+	adapt->SetPortAttribute = I830SetPortAttributeTextured;
+	adapt->GetPortAttribute = I830GetPortAttribute;
+	adapt->QueryBestSize = I830QueryBestSize;
+	adapt->PutImage = I830PutImageTextured;
+	adapt->QueryImageAttributes = I830QueryImageAttributes;
 
-    I830UpdateGamma(pScrn);
+	for (i = 0; i < nports; i++) {
+		intel_adaptor_private *adaptor_priv = &adaptor_privs[i];
 
-    return adapt;
-}
+		adaptor_priv->textured = TRUE;
+		adaptor_priv->videoStatus = 0;
+		adaptor_priv->buf = NULL;
+		adaptor_priv->oldBuf = NULL;
+		adaptor_priv->oldBuf_pinned = FALSE;
 
-static XF86VideoAdaptorPtr
-I830SetupImageVideoTextured(ScreenPtr pScreen)
-{
-    XF86VideoAdaptorPtr adapt;
-    XF86AttributePtr attrs;
-    I830PortPrivPtr portPrivs;
-    DevUnion *devUnions;
-    int nports = 16, i;
-    int nAttributes;
+		adaptor_priv->rotation = RR_Rotate_0;
+		adaptor_priv->SyncToVblank = 1;
 
-    OVERLAY_DEBUG("I830SetupImageVideoOverlay\n");
+		/* gotta uninit this someplace, XXX: shouldn't be necessary for textured */
+		REGION_NULL(screen, &adaptor_priv->clip);
 
-    nAttributes = NUM_TEXTURED_ATTRIBUTES;
+		adapt->pPortPrivates[i].ptr = (pointer) (adaptor_priv);
+	}
 
-    adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec));
-    portPrivs = xcalloc(nports, sizeof(I830PortPrivRec));
-    devUnions = xcalloc(nports, sizeof(DevUnion));
-    attrs = xcalloc(nAttributes, sizeof(XF86AttributeRec));
-    if (adapt == NULL || portPrivs == NULL || devUnions == NULL ||
-	attrs == NULL)
-    {
-	xfree(adapt);
-	xfree(portPrivs);
-	xfree(devUnions);
-	xfree(attrs);
-	return NULL;
-    }
-
-    adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-    adapt->flags = 0;
-    adapt->name = "Intel(R) Textured Video";
-    adapt->nEncodings = 1;
-    adapt->pEncodings = DummyEncoding;
-    adapt->nFormats = NUM_FORMATS;
-    adapt->pFormats = Formats;
-    adapt->nPorts = nports;
-    adapt->pPortPrivates = devUnions;
-    adapt->nAttributes = nAttributes;
-    adapt->pAttributes = attrs;
-    memcpy(attrs, TexturedAttributes, nAttributes * sizeof(XF86AttributeRec));
-    adapt->nImages = NUM_IMAGES;
-    adapt->pImages = Images;
-    adapt->PutVideo = NULL;
-    adapt->PutStill = NULL;
-    adapt->GetVideo = NULL;
-    adapt->GetStill = NULL;
-    adapt->StopVideo = I830StopVideo;
-    adapt->SetPortAttribute = I830SetPortAttributeTextured;
-    adapt->GetPortAttribute = I830GetPortAttribute;
-    adapt->QueryBestSize = I830QueryBestSize;
-    adapt->PutImage = I830PutImage;
-    adapt->QueryImageAttributes = I830QueryImageAttributesTextured;
-
-    for (i = 0; i < nports; i++) {
-	I830PortPrivPtr pPriv = &portPrivs[i];
-
-	pPriv->textured = TRUE;
-	pPriv->videoStatus = 0;
-	pPriv->buf = NULL;
-	pPriv->currentBuf = 0;
-	pPriv->doubleBuffer = 0;
-
-	pPriv->rotation = RR_Rotate_0;
-	pPriv->SyncToVblank = 1;
-
-	/* gotta uninit this someplace, XXX: shouldn't be necessary for textured */
-	REGION_NULL(pScreen, &pPriv->clip);
+	xvSyncToVblank = MAKE_ATOM("XV_SYNC_TO_VBLANK");
 
-	adapt->pPortPrivates[i].ptr = (pointer) (pPriv);
-    }
+	return adapt;
+}
 
-    xvSyncToVblank = MAKE_ATOM("XV_SYNC_TO_VBLANK");
+static void i830_free_video_buffers(intel_adaptor_private *adaptor_priv)
+{
+	if (adaptor_priv->buf) {
+		drm_intel_bo_unreference(adaptor_priv->buf);
+		adaptor_priv->buf = NULL;
+	}
 
-    return adapt;
+	if (adaptor_priv->oldBuf) {
+		if (adaptor_priv->oldBuf_pinned)
+			drm_intel_bo_unpin(adaptor_priv->oldBuf);
+		drm_intel_bo_unreference(adaptor_priv->oldBuf);
+		adaptor_priv->oldBuf = NULL;
+		adaptor_priv->oldBuf_pinned = FALSE;
+	}
 }
 
 static void
-I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ums_overlay_off(ScrnInfoPtr scrn)
 {
-    I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+    i830_overlay_off (scrn);
+}
 
-    if (pPriv->textured)
-	return;
+static void I830StopVideo(ScrnInfoPtr scrn, pointer data, Bool shutdown)
+{
+	intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
 
-    OVERLAY_DEBUG("I830StopVideo\n");
+	if (adaptor_priv->textured)
+		return;
 
-    REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
+	OVERLAY_DEBUG("I830StopVideo\n");
 
-    if (shutdown) {
-	if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
-	    i830_overlay_off(pScrn);
-	}
+	REGION_EMPTY(scrn->screen, &adaptor_priv->clip);
 
-	if (pPriv->buf) {
-	    if (!pPriv->textured)
-		drm_intel_bo_unpin(pPriv->buf);
-	    drm_intel_bo_unreference(pPriv->buf);
-	    pPriv->buf = NULL;
-	    pPriv->videoStatus = 0;
-	}
-    } else {
-	if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
-	    pPriv->videoStatus |= OFF_TIMER;
-	    pPriv->offTime = currentTime.milliseconds + OFF_DELAY;
+	if (shutdown) {
+		if (adaptor_priv->videoStatus & CLIENT_VIDEO_ON)
+			ums_overlay_off(scrn);
+
+		i830_free_video_buffers(adaptor_priv);
+		adaptor_priv->videoStatus = 0;
+	} else {
+		if (adaptor_priv->videoStatus & CLIENT_VIDEO_ON) {
+			adaptor_priv->videoStatus |= OFF_TIMER;
+			adaptor_priv->offTime = currentTime.milliseconds + OFF_DELAY;
+		}
 	}
-    }
 
 }
 
 static int
-I830SetPortAttributeTextured(ScrnInfoPtr pScrn,
+I830SetPortAttributeTextured(ScrnInfoPtr scrn,
 			     Atom attribute, INT32 value, pointer data)
 {
-    I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+	intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
 
-    if (attribute == xvBrightness) {
-	if ((value < -128) || (value > 127))
-	    return BadValue;
-	pPriv->brightness = value;
-	return Success;
-    } else if (attribute == xvContrast) {
-	if ((value < 0) || (value > 255))
-	    return BadValue;
-	pPriv->contrast = value;
-	return Success;
-    } else if (attribute == xvSyncToVblank) {
-        if ((value < -1) || (value > 1))
-            return BadValue;
-        
-        pPriv->SyncToVblank = value;
-        return Success;
-    } else {
-	return BadMatch;
-    }
+	if (attribute == xvBrightness) {
+		if ((value < -128) || (value > 127))
+			return BadValue;
+		adaptor_priv->brightness = value;
+		return Success;
+	} else if (attribute == xvContrast) {
+		if ((value < 0) || (value > 255))
+			return BadValue;
+		adaptor_priv->contrast = value;
+		return Success;
+	} else if (attribute == xvSyncToVblank) {
+		if ((value < -1) || (value > 1))
+			return BadValue;
+		adaptor_priv->SyncToVblank = value;
+		return Success;
+	} else {
+		return BadMatch;
+	}
 }
 
-static int
-I830SetPortAttribute(ScrnInfoPtr pScrn,
-		     Atom attribute, INT32 value, pointer data)
+static void
+ums_overlay_update_attrs(ScrnInfoPtr scrn, intel_adaptor_private * adaptor_priv)
 {
-    I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
-    I830Ptr pI830 = I830PTR(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830OverlayRegPtr overlay;
 
-    overlay = I830OVERLAYREG(pI830);
+    overlay = I830OVERLAYREG(intel);
 
-    if (attribute == xvBrightness) {
-	if ((value < -128) || (value > 127))
-	    return BadValue;
-	pPriv->brightness = value;
-	overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
-	OVERLAY_DEBUG("BRIGHTNESS\n");
-	i830_overlay_continue (pScrn, FALSE);
-    } else if (attribute == xvContrast) {
-	if ((value < 0) || (value > 255))
-	    return BadValue;
-	pPriv->contrast = value;
-	overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
-	OVERLAY_DEBUG("CONTRAST\n");
-	i830_overlay_continue (pScrn, FALSE);
-    } else if (attribute == xvSaturation) {
-	if ((value < 0) || (value > 1023))
-	    return BadValue;
-	pPriv->saturation = value;
-	overlay->OCLRC1 = pPriv->saturation;
-	i830_overlay_continue (pScrn, FALSE);
-    } else if (attribute == xvPipe) {
-	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-	if ((value < -1) || (value > xf86_config->num_crtc))
-	    return BadValue;
-	if (value < 0)
-	    pPriv->desired_crtc = NULL;
-	else
-	    pPriv->desired_crtc = xf86_config->crtc[value];
-	/*
-	 * Leave this to be updated at the next frame
-	 */
-    } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
-	pPriv->gamma0 = value; 
-    } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
-	pPriv->gamma1 = value;
-    } else if (attribute == xvGamma2 && (IS_I9XX(pI830))) {
-	pPriv->gamma2 = value;
-    } else if (attribute == xvGamma3 && (IS_I9XX(pI830))) {
-	pPriv->gamma3 = value;
-    } else if (attribute == xvGamma4 && (IS_I9XX(pI830))) {
-	pPriv->gamma4 = value;
-    } else if (attribute == xvGamma5 && (IS_I9XX(pI830))) {
-	pPriv->gamma5 = value;
-    } else if (attribute == xvColorKey) {
-	pPriv->colorKey = value;
-	switch (pScrn->depth) {
-	case 16:
-	    overlay->DCLRKV = RGB16ToColorKey(pPriv->colorKey);
-	    break;
-	case 15:
-	    overlay->DCLRKV = RGB15ToColorKey(pPriv->colorKey);
-	    break;
-	default:
-	    overlay->DCLRKV = pPriv->colorKey;
-	    break;
-	}
-	OVERLAY_DEBUG("COLORKEY\n");
-	i830_overlay_continue (pScrn, FALSE);
-	REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
-    } else if(attribute == xvDoubleBuffer) {
-	if ((value < 0) || (value > 1))
-	    return BadValue;
-	/* Do not allow buffer change while playing video */
-	if(!pI830->overlayOn)
-	    pPriv->doubleBuffer = value;
-    } else
-	return BadMatch;
+    overlay->OCLRC0 = (adaptor_priv->contrast << 18) | (adaptor_priv->brightness & 0xff);
+    overlay->OCLRC0 = (adaptor_priv->contrast << 18) | (adaptor_priv->brightness & 0xff);
+    overlay->OCLRC1 = adaptor_priv->saturation;
 
-    /* Ensure that the overlay is off, ready for updating */
-    if ((attribute == xvGamma0 ||
-	 attribute == xvGamma1 ||
-	 attribute == xvGamma2 ||
-	 attribute == xvGamma3 ||
-	 attribute == xvGamma4 ||
-	 attribute == xvGamma5) && (IS_I9XX(pI830))) {
-	OVERLAY_DEBUG("GAMMA\n");
-	I830UpdateGamma(pScrn);
+    switch (scrn->depth) {
+    case 16:
+	overlay->DCLRKV = RGB16ToColorKey(adaptor_priv->colorKey);
+	break;
+    case 15:
+	overlay->DCLRKV = RGB15ToColorKey(adaptor_priv->colorKey);
+	break;
+    default:
+	overlay->DCLRKV = adaptor_priv->colorKey;
+	break;
     }
 
-    return Success;
+    I830UpdateGamma(scrn);
+
+    i830_overlay_continue(scrn, FALSE);
 }
 
 static int
-I830GetPortAttribute(ScrnInfoPtr pScrn,
+I830SetPortAttributeOverlay(ScrnInfoPtr scrn,
+			    Atom attribute, INT32 value, pointer data)
+{
+	intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	if (attribute == xvBrightness) {
+		if ((value < -128) || (value > 127))
+			return BadValue;
+		adaptor_priv->brightness = value;
+		OVERLAY_DEBUG("BRIGHTNESS\n");
+	} else if (attribute == xvContrast) {
+		if ((value < 0) || (value > 255))
+			return BadValue;
+		adaptor_priv->contrast = value;
+		OVERLAY_DEBUG("CONTRAST\n");
+	} else if (attribute == xvSaturation) {
+		if ((value < 0) || (value > 1023))
+			return BadValue;
+		adaptor_priv->saturation = value;
+	} else if (attribute == xvPipe) {
+		xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+		if ((value < -1) || (value > xf86_config->num_crtc))
+			return BadValue;
+		if (value < 0)
+			adaptor_priv->desired_crtc = NULL;
+		else
+			adaptor_priv->desired_crtc = xf86_config->crtc[value];
+		/*
+		 * Leave this to be updated at the next frame
+		 */
+	} else if (attribute == xvGamma0 && (IS_I9XX(intel))) {
+		adaptor_priv->gamma0 = value;
+	} else if (attribute == xvGamma1 && (IS_I9XX(intel))) {
+		adaptor_priv->gamma1 = value;
+	} else if (attribute == xvGamma2 && (IS_I9XX(intel))) {
+		adaptor_priv->gamma2 = value;
+	} else if (attribute == xvGamma3 && (IS_I9XX(intel))) {
+		adaptor_priv->gamma3 = value;
+	} else if (attribute == xvGamma4 && (IS_I9XX(intel))) {
+		adaptor_priv->gamma4 = value;
+	} else if (attribute == xvGamma5 && (IS_I9XX(intel))) {
+		adaptor_priv->gamma5 = value;
+	} else if (attribute == xvColorKey) {
+		adaptor_priv->colorKey = value;
+		OVERLAY_DEBUG("COLORKEY\n");
+	} else
+		return BadMatch;
+
+	/* Ensure that the overlay is off, ready for updating */
+	if ((attribute == xvGamma0 ||
+	    attribute == xvGamma1 ||
+	    attribute == xvGamma2 ||
+	    attribute == xvGamma3 ||
+	    attribute == xvGamma4 ||
+	    attribute == xvGamma5) && (IS_I9XX(intel))) {
+		OVERLAY_DEBUG("GAMMA\n");
+	}
+
+	ums_overlay_update_attrs(scrn, adaptor_priv);
+
+	if (attribute == xvColorKey)
+		REGION_EMPTY(scrn->screen, &adaptor_priv->clip);
+
+	if (attribute == xvColorKey)
+		REGION_EMPTY(scrn->screen, &adaptor_priv->clip);
+
+	return Success;
+}
+
+static int
+I830GetPortAttribute(ScrnInfoPtr scrn,
 		     Atom attribute, INT32 * value, pointer data)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
 
-    if (attribute == xvBrightness) {
-	*value = pPriv->brightness;
-    } else if (attribute == xvContrast) {
-	*value = pPriv->contrast;
-    } else if (attribute == xvSaturation) {
-	*value = pPriv->saturation;
-    } else if (attribute == xvPipe) {
-	int		c;
-	xf86CrtcConfigPtr	xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-	for (c = 0; c < xf86_config->num_crtc; c++)
-	    if (xf86_config->crtc[c] == pPriv->desired_crtc)
-		break;
-	if (c == xf86_config->num_crtc)
-	    c = -1;
-	*value = c;
-    } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
-	*value = pPriv->gamma0;
-    } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
-	*value = pPriv->gamma1;
-    } else if (attribute == xvGamma2 && (IS_I9XX(pI830))) {
-	*value = pPriv->gamma2;
-    } else if (attribute == xvGamma3 && (IS_I9XX(pI830))) {
-	*value = pPriv->gamma3;
-    } else if (attribute == xvGamma4 && (IS_I9XX(pI830))) {
-	*value = pPriv->gamma4;
-    } else if (attribute == xvGamma5 && (IS_I9XX(pI830))) {
-	*value = pPriv->gamma5;
-    } else if (attribute == xvColorKey) {
-	*value = pPriv->colorKey;
-    } else if (attribute == xvDoubleBuffer) {
-	*value = pPriv->doubleBuffer;
-    } else if (attribute == xvSyncToVblank) {
-        *value = pPriv->SyncToVblank;
-    } else
-	return BadMatch;
+	if (attribute == xvBrightness) {
+		*value = adaptor_priv->brightness;
+	} else if (attribute == xvContrast) {
+		*value = adaptor_priv->contrast;
+	} else if (attribute == xvSaturation) {
+		*value = adaptor_priv->saturation;
+	} else if (attribute == xvPipe) {
+		int c;
+		xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+		for (c = 0; c < xf86_config->num_crtc; c++)
+			if (xf86_config->crtc[c] == adaptor_priv->desired_crtc)
+				break;
+		if (c == xf86_config->num_crtc)
+			c = -1;
+		*value = c;
+	} else if (attribute == xvGamma0 && (IS_I9XX(intel))) {
+		*value = adaptor_priv->gamma0;
+	} else if (attribute == xvGamma1 && (IS_I9XX(intel))) {
+		*value = adaptor_priv->gamma1;
+	} else if (attribute == xvGamma2 && (IS_I9XX(intel))) {
+		*value = adaptor_priv->gamma2;
+	} else if (attribute == xvGamma3 && (IS_I9XX(intel))) {
+		*value = adaptor_priv->gamma3;
+	} else if (attribute == xvGamma4 && (IS_I9XX(intel))) {
+		*value = adaptor_priv->gamma4;
+	} else if (attribute == xvGamma5 && (IS_I9XX(intel))) {
+		*value = adaptor_priv->gamma5;
+	} else if (attribute == xvColorKey) {
+		*value = adaptor_priv->colorKey;
+	} else if (attribute == xvSyncToVblank) {
+		*value = adaptor_priv->SyncToVblank;
+	} else
+		return BadMatch;
 
-    return Success;
+	return Success;
 }
 
 static void
-I830QueryBestSize(ScrnInfoPtr pScrn,
+I830QueryBestSize(ScrnInfoPtr scrn,
 		  Bool motion,
 		  short vid_w, short vid_h,
 		  short drw_w, short drw_h,
 		  unsigned int *p_w, unsigned int *p_h, pointer data)
 {
-    if (vid_w > (drw_w << 1))
-	drw_w = vid_w >> 1;
-    if (vid_h > (drw_h << 1))
-	drw_h = vid_h >> 1;
+	if (vid_w > (drw_w << 1))
+		drw_w = vid_w >> 1;
+	if (vid_h > (drw_h << 1))
+		drw_h = vid_h >> 1;
 
-    *p_w = drw_w;
-    *p_h = drw_h;
+	*p_w = drw_w;
+	*p_h = drw_h;
 }
 
 static void
-I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+I830CopyPackedData(intel_adaptor_private *adaptor_priv,
 		   unsigned char *buf,
-		   int srcPitch,
-		   int dstPitch, int top, int left, int h, int w)
+		   int srcPitch, int dstPitch, int top, int left, int h, int w)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    unsigned char *src, *dst, *dst_base;
-    int i,j;
-    unsigned char *s;
+	unsigned char *src, *dst, *dst_base;
+	int i, j;
+	unsigned char *s;
 
 #if 0
-    ErrorF("I830CopyPackedData: (%d,%d) (%d,%d)\n"
-	   "srcPitch: %d, dstPitch: %d\n", top, left, h, w,
-	   srcPitch, dstPitch);
+	ErrorF("I830CopyPackedData: (%d,%d) (%d,%d)\n"
+	       "srcPitch: %d, dstPitch: %d\n", top, left, h, w,
+	       srcPitch, dstPitch);
 #endif
 
-    src = buf + (top * srcPitch) + (left << 1);
+	src = buf + (top * srcPitch) + (left << 1);
 
-    if (pPriv->textured) {
-	drm_intel_bo_map(pPriv->buf, TRUE);
-	dst_base = pPriv->buf->virtual;
-    } else {
-	drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE);
-	dst_base = pI830->FbBase;
-    }
+	drm_intel_bo_map(adaptor_priv->buf, TRUE);
+	dst_base = adaptor_priv->buf->virtual;
 
-    if (pPriv->currentBuf == 0)
-	dst = dst_base + pPriv->YBuf0offset;
-    else
-	dst = dst_base + pPriv->YBuf1offset;
+	dst = dst_base + adaptor_priv->YBufOffset;
 
-    switch (pPriv->rotation) {
-    case RR_Rotate_0:
-	w <<= 1;
-	for (i = 0; i < h; i++) {
-	    memcpy(dst, src, w);
-	    src += srcPitch;
-	    dst += dstPitch;
-	}
-	break;
-    case RR_Rotate_90:
-	h <<= 1;
-	for (i = 0; i < h; i+=2) {
-	    s = src;
-	    for (j = 0; j < w; j++) {
-		/* Copy Y */
-		dst[(i + 0) + ((w - j - 1) * dstPitch)] = *s++; 
-		(void)*s++;
-	    }
-	    src += srcPitch;
-	}
-	h >>= 1;
-	src = buf + (top * srcPitch) + (left << 1);
-	for (i = 0; i < h; i+=2) {
-	    for (j = 0; j < w; j+=2) {
-		/* Copy U */
-		dst[((i*2) + 1) + ((w - j - 1) * dstPitch)] = src[(j*2) + 1 + (i * srcPitch)];
-		dst[((i*2) + 1) + ((w - j - 2) * dstPitch)] = src[(j*2) + 1 + ((i+1) * srcPitch)];
-		/* Copy V */
-		dst[((i*2) + 3) + ((w - j - 1) * dstPitch)] = src[(j*2) + 3 + (i * srcPitch)];
-		dst[((i*2) + 3) + ((w - j - 2) * dstPitch)] = src[(j*2) + 3 + ((i+1) * srcPitch)];
-	    }
-	}
-	break;
-    case RR_Rotate_180:
-	w <<= 1;
-	for (i = 0; i < h; i++) {
-	    s = src;
-	    for (j = 0; j < w; j+=4) {
-		dst[(w - j - 4) + ((h - i - 1) * dstPitch)] = *s++;
-		dst[(w - j - 3) + ((h - i - 1) * dstPitch)] = *s++;
-		dst[(w - j - 2) + ((h - i - 1) * dstPitch)] = *s++;
-		dst[(w - j - 1) + ((h - i - 1) * dstPitch)] = *s++;
-	    }
-	    src += srcPitch;
-	}
-	break;
-    case RR_Rotate_270:
-	h <<= 1;
-	for (i = 0; i < h; i+=2) {
-	    s = src;
-	    for (j = 0; j < w; j++) {
-		/* Copy Y */
-		dst[(h - i - 2) + (j * dstPitch)] = *s++;
-		(void)*s++;
-	    }
-	    src += srcPitch;
-	}
-	h >>= 1;
-	src = buf + (top * srcPitch) + (left << 1);
-	for (i = 0; i < h; i+=2) {
-	    for (j = 0; j < w; j+=2) {
-		/* Copy U */
-		dst[(((h - i)*2) - 3) + (j * dstPitch)] = src[(j*2) + 1 + (i * srcPitch)];
-		dst[(((h - i)*2) - 3) + ((j - 1) * dstPitch)] = src[(j*2) + 1 + ((i+1) * srcPitch)];
-		/* Copy V */
-		dst[(((h - i)*2) - 1) + (j * dstPitch)] = src[(j*2) + 3 + (i * srcPitch)];
-		dst[(((h - i)*2) - 1) + ((j - 1) * dstPitch)] = src[(j*2) + 3 + ((i+1) * srcPitch)];
-	    }
+	switch (adaptor_priv->rotation) {
+	case RR_Rotate_0:
+		w <<= 1;
+		for (i = 0; i < h; i++) {
+			memcpy(dst, src, w);
+			src += srcPitch;
+			dst += dstPitch;
+		}
+		break;
+	case RR_Rotate_90:
+		h <<= 1;
+		for (i = 0; i < h; i += 2) {
+			s = src;
+			for (j = 0; j < w; j++) {
+				/* Copy Y */
+				dst[(i + 0) + ((w - j - 1) * dstPitch)] = *s++;
+				(void)*s++;
+			}
+			src += srcPitch;
+		}
+		h >>= 1;
+		src = buf + (top * srcPitch) + (left << 1);
+		for (i = 0; i < h; i += 2) {
+			for (j = 0; j < w; j += 2) {
+				/* Copy U */
+				dst[((i * 2) + 1) + ((w - j - 1) * dstPitch)] =
+				    src[(j * 2) + 1 + (i * srcPitch)];
+				dst[((i * 2) + 1) + ((w - j - 2) * dstPitch)] =
+				    src[(j * 2) + 1 + ((i + 1) * srcPitch)];
+				/* Copy V */
+				dst[((i * 2) + 3) + ((w - j - 1) * dstPitch)] =
+				    src[(j * 2) + 3 + (i * srcPitch)];
+				dst[((i * 2) + 3) + ((w - j - 2) * dstPitch)] =
+				    src[(j * 2) + 3 + ((i + 1) * srcPitch)];
+			}
+		}
+		break;
+	case RR_Rotate_180:
+		w <<= 1;
+		for (i = 0; i < h; i++) {
+			s = src;
+			for (j = 0; j < w; j += 4) {
+				dst[(w - j - 4) + ((h - i - 1) * dstPitch)] =
+				    *s++;
+				dst[(w - j - 3) + ((h - i - 1) * dstPitch)] =
+				    *s++;
+				dst[(w - j - 2) + ((h - i - 1) * dstPitch)] =
+				    *s++;
+				dst[(w - j - 1) + ((h - i - 1) * dstPitch)] =
+				    *s++;
+			}
+			src += srcPitch;
+		}
+		break;
+	case RR_Rotate_270:
+		h <<= 1;
+		for (i = 0; i < h; i += 2) {
+			s = src;
+			for (j = 0; j < w; j++) {
+				/* Copy Y */
+				dst[(h - i - 2) + (j * dstPitch)] = *s++;
+				(void)*s++;
+			}
+			src += srcPitch;
+		}
+		h >>= 1;
+		src = buf + (top * srcPitch) + (left << 1);
+		for (i = 0; i < h; i += 2) {
+			for (j = 0; j < w; j += 2) {
+				/* Copy U */
+				dst[(((h - i) * 2) - 3) + (j * dstPitch)] =
+				    src[(j * 2) + 1 + (i * srcPitch)];
+				dst[(((h - i) * 2) - 3) +
+				    ((j + 1) * dstPitch)] =
+				    src[(j * 2) + 1 + ((i + 1) * srcPitch)];
+				/* Copy V */
+				dst[(((h - i) * 2) - 1) + (j * dstPitch)] =
+				    src[(j * 2) + 3 + (i * srcPitch)];
+				dst[(((h - i) * 2) - 1) +
+				    ((j + 1) * dstPitch)] =
+				    src[(j * 2) + 3 + ((i + 1) * srcPitch)];
+			}
+		}
+		break;
 	}
-	break;
-    }
 
-    if (pPriv->textured)
-	drm_intel_bo_unmap(pPriv->buf);
+	drm_intel_bo_unmap(adaptor_priv->buf);
+}
+
+static void i830_memcpy_plane(unsigned char *dst, unsigned char *src,
+			      int height, int width,
+			      int dstPitch, int srcPitch, Rotation rotation)
+{
+	int i, j = 0;
+	unsigned char *s;
+
+	switch (rotation) {
+	case RR_Rotate_0:
+		/* optimise for the case of no clipping */
+		if (srcPitch == dstPitch && srcPitch == width)
+			memcpy(dst, src, srcPitch * height);
+		else
+			for (i = 0; i < height; i++) {
+				memcpy(dst, src, width);
+				src += srcPitch;
+				dst += dstPitch;
+			}
+		break;
+	case RR_Rotate_90:
+		for (i = 0; i < height; i++) {
+			s = src;
+			for (j = 0; j < width; j++) {
+				dst[(i) + ((width - j - 1) * dstPitch)] = *s++;
+			}
+			src += srcPitch;
+		}
+		break;
+	case RR_Rotate_180:
+		for (i = 0; i < height; i++) {
+			s = src;
+			for (j = 0; j < width; j++) {
+				dst[(width - j - 1) +
+				    ((height - i - 1) * dstPitch)] = *s++;
+			}
+			src += srcPitch;
+		}
+		break;
+	case RR_Rotate_270:
+		for (i = 0; i < height; i++) {
+			s = src;
+			for (j = 0; j < width; j++) {
+				dst[(height - i - 1) + (j * dstPitch)] = *s++;
+			}
+			src += srcPitch;
+		}
+		break;
+	}
 }
 
 static void
-I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
-		   unsigned char *buf, int srcPitch,
-		   int srcPitch2, int dstPitch, int srcH, int top, int left,
+I830CopyPlanarData(intel_adaptor_private *adaptor_priv,
+		   unsigned char *buf, int srcPitch, int srcPitch2,
+		   int dstPitch, int dstPitch2,
+		   int srcH, int top, int left,
 		   int h, int w, int id)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int i, j = 0;
-    unsigned char *src1, *src2, *src3, *dst_base, *dst1, *dst2, *dst3;
-    unsigned char *s;
-    int dstPitch2 = dstPitch << 1;
+	unsigned char *src1, *src2, *src3, *dst_base, *dst1, *dst2, *dst3;
 
 #if 0
-    ErrorF("I830CopyPlanarData: srcPitch %d, srcPitch %d, dstPitch %d\n"
-	   "nlines %d, npixels %d, top %d, left %d\n",
-	   srcPitch, srcPitch2, dstPitch,
-	   h, w, top, left);
+	ErrorF("I830CopyPlanarData: srcPitch %d, srcPitch %d, dstPitch %d\n"
+	       "nlines %d, npixels %d, top %d, left %d\n",
+	       srcPitch, srcPitch2, dstPitch, h, w, top, left);
 #endif
 
-    /* Copy Y data */
-    src1 = buf + (top * srcPitch) + left;
+	/* Copy Y data */
+	src1 = buf + (top * srcPitch) + left;
 #if 0
-    ErrorF("src1 is %p, offset is %ld\n", src1,
-	   (unsigned long)src1 - (unsigned long)buf);
+	ErrorF("src1 is %p, offset is %ld\n", src1,
+	       (unsigned long)src1 - (unsigned long)buf);
 #endif
 
-    if (pPriv->textured) {
-	drm_intel_bo_map(pPriv->buf, TRUE);
-	dst_base = pPriv->buf->virtual;
-    } else {
-	drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE);
-	dst_base = pI830->FbBase;
-    }
+	drm_intel_bo_map(adaptor_priv->buf, TRUE);
+	dst_base = adaptor_priv->buf->virtual;
 
-    if (pPriv->currentBuf == 0)
-	dst1 = dst_base + pPriv->YBuf0offset;
-    else
-	dst1 = dst_base + pPriv->YBuf1offset;
+	dst1 = dst_base + adaptor_priv->YBufOffset;
 
-    switch (pPriv->rotation) {
-    case RR_Rotate_0:
-	if (srcPitch == dstPitch2)
-	    memcpy (dst1, src1, srcPitch * h);
-	else
-	    for (i = 0; i < h; i++) {
-		memcpy(dst1, src1, w);
-		src1 += srcPitch;
-		dst1 += dstPitch2;
-	    }
-	break;
-    case RR_Rotate_90:
-	for (i = 0; i < h; i++) {
-	    s = src1;
-	    for (j = 0; j < w; j++) {
-		dst1[(i) + ((w - j - 1) * dstPitch2)] = *s++;
-	    }
-	    src1 += srcPitch;
-	}
-	break;
-    case RR_Rotate_180:
-	for (i = 0; i < h; i++) {
-	    s = src1;
-	    for (j = 0; j < w; j++) {
-		dst1[(w - j - 1) + ((h - i - 1) * dstPitch2)] = *s++;
-	    }
-	    src1 += srcPitch;
-	}
-	break;
-    case RR_Rotate_270:
-	for (i = 0; i < h; i++) {
-	    s = src1;
-	    for (j = 0; j < w; j++) {
-		dst1[(h - i - 1) + (j * dstPitch2)] = *s++;
-	    }
-	    src1 += srcPitch;
-	}
-	break;
-    }
+	i830_memcpy_plane(dst1, src1, h, w, dstPitch2, srcPitch,
+			  adaptor_priv->rotation);
+
+	/* Copy V data for YV12, or U data for I420 */
+	src2 = buf +		/* start of YUV data */
+	    (srcH * srcPitch) +	/* move over Luma plane */
+	    ((top * srcPitch) >> 2) +	/* move down from by top lines */
+	    (left >> 1);	/* move left by left pixels */
 
-    /* Copy V data for YV12, or U data for I420 */
-    src2 = buf + (srcH * srcPitch) + ((top * srcPitch) >> 2) + (left >> 1);
 #if 0
-    ErrorF("src2 is %p, offset is %ld\n", src2,
-	   (unsigned long)src2 - (unsigned long)buf);
+	ErrorF("src2 is %p, offset is %ld\n", src2,
+	       (unsigned long)src2 - (unsigned long)buf);
 #endif
-    if (pPriv->currentBuf == 0) {
 	if (id == FOURCC_I420)
-	    dst2 = dst_base + pPriv->UBuf0offset;
+		dst2 = dst_base + adaptor_priv->UBufOffset;
 	else
-	    dst2 = dst_base + pPriv->VBuf0offset;
-    } else {
-	if (id == FOURCC_I420)
-	    dst2 = dst_base + pPriv->UBuf1offset;
-	else
-	    dst2 = dst_base + pPriv->VBuf1offset;
-    }
+		dst2 = dst_base + adaptor_priv->VBufOffset;
 
-    switch (pPriv->rotation) {
-    case RR_Rotate_0:
-	if (srcPitch2 == dstPitch)
-	    memcpy (dst2, src2, h/2 * srcPitch2);
-	else
-	    for (i = 0; i < h / 2; i++) {
-		memcpy(dst2, src2, w / 2);
-		src2 += srcPitch2;
-		dst2 += dstPitch;
-	    }
-	break;
-    case RR_Rotate_90:
-	for (i = 0; i < (h/2); i++) {
-	    s = src2;
-	    for (j = 0; j < (w/2); j++) {
-		dst2[(i) + (((w/2) - j - 1) * (dstPitch))] = *s++;
-	    }
-	    src2 += srcPitch2;
-	}
-	break;
-    case RR_Rotate_180:
-	for (i = 0; i < (h/2); i++) {
-	    s = src2;
-	    for (j = 0; j < (w/2); j++) {
-		dst2[((w/2) - j - 1) + (((h/2) - i - 1) * dstPitch)] = *s++;
-	    }
-	    src2 += srcPitch2;
-	}
-	break;
-    case RR_Rotate_270:
-	for (i = 0; i < (h/2); i++) {
-	    s = src2;
-	    for (j = 0; j < (w/2); j++) {
-		dst2[((h/2) - i - 1) + (j * dstPitch)] = *s++;
-	    }
-	    src2 += srcPitch2;
-	}
-	break;
-    }
+	i830_memcpy_plane(dst2, src2, h / 2, w / 2,
+			  dstPitch, srcPitch2, adaptor_priv->rotation);
 
-    /* Copy U data for YV12, or V data for I420 */
-    src3 = buf + (srcH * srcPitch) + ((srcH >> 1) * srcPitch2) +
-    ((top * srcPitch) >> 2) + (left >> 1);
+	/* Copy U data for YV12, or V data for I420 */
+	src3 = buf +		/* start of YUV data */
+	    (srcH * srcPitch) +	/* move over Luma plane */
+	    ((srcH >> 1) * srcPitch2) +	/* move over Chroma plane */
+	    ((top * srcPitch) >> 2) +	/* move down from by top lines */
+	    (left >> 1);	/* move left by left pixels */
 #if 0
-    ErrorF("src3 is %p, offset is %ld\n", src3,
-	   (unsigned long)src3 - (unsigned long)buf);
+	ErrorF("src3 is %p, offset is %ld\n", src3,
+	       (unsigned long)src3 - (unsigned long)buf);
 #endif
-    if (pPriv->currentBuf == 0) {
-	if (id == FOURCC_I420)
-	    dst3 = dst_base + pPriv->VBuf0offset;
-	else
-	    dst3 = dst_base + pPriv->UBuf0offset;
-    } else {
 	if (id == FOURCC_I420)
-	    dst3 = dst_base + pPriv->VBuf1offset;
+		dst3 = dst_base + adaptor_priv->VBufOffset;
 	else
-	    dst3 = dst_base + pPriv->UBuf1offset;
-    }
+		dst3 = dst_base + adaptor_priv->UBufOffset;
 
-    switch (pPriv->rotation) {
-    case RR_Rotate_0:
-	if (srcPitch2 == dstPitch)
-	    memcpy (dst3, src3, srcPitch2 * h/2);
-	else
-	    for (i = 0; i < h / 2; i++) {
-		memcpy(dst3, src3, w / 2);
-		src3 += srcPitch2;
-		dst3 += dstPitch;
-	    }
-	break;
-    case RR_Rotate_90:
-	for (i = 0; i < (h/2); i++) {
-	    s = src3;
-	    for (j = 0; j < (w/2); j++) {
-		dst3[(i) + (((w/2) - j - 1) * (dstPitch))] = *s++;
-	    }
-	    src3 += srcPitch2;
-	}
-	break;
-    case RR_Rotate_180:
-	for (i = 0; i < (h/2); i++) {
-	    s = src3;
-	    for (j = 0; j < (w/2); j++) {
-		dst3[((w/2) - j - 1) + (((h/2) - i - 1) * dstPitch)] = *s++;
-	    }
-	    src3 += srcPitch2;
-	}
-	break;
-    case RR_Rotate_270:
-	for (i = 0; i < (h/2); i++) {
-	    s = src3;
-	    for (j = 0; j < (w/2); j++) {
-		dst3[((h/2) - i - 1) + (j * dstPitch)] = *s++;
-	    }
-	    src3 += srcPitch2;
-	}
-	break;
-    }
+	i830_memcpy_plane(dst3, src3, h / 2, w / 2,
+			  dstPitch, srcPitch2, adaptor_priv->rotation);
 
-    if (pPriv->textured)
-	drm_intel_bo_unmap(pPriv->buf);
+	drm_intel_bo_unmap(adaptor_priv->buf);
 }
 
 typedef struct {
-    uint8_t sign;
-    uint16_t mantissa;
-    uint8_t exponent;
+	uint8_t sign;
+	uint16_t mantissa;
+	uint8_t exponent;
 } coeffRec, *coeffPtr;
 
 static Bool
@@ -1683,35 +1609,32 @@ UpdateCoeff(int taps, double fCutoff, Bo
     }
 }
 
-static void
-i830_box_intersect (BoxPtr dest, BoxPtr a, BoxPtr b)
+static void i830_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
 {
-    dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1;
-    dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2;
-    dest->y1 = a->y1 > b->y1 ? a->y1 : b->y1;
-    dest->y2 = a->y2 < b->y2 ? a->y2 : b->y2;
-    if (dest->x1 >= dest->x2 || dest->y1 >= dest->y2)
-	dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0;
+	dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1;
+	dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2;
+	dest->y1 = a->y1 > b->y1 ? a->y1 : b->y1;
+	dest->y2 = a->y2 < b->y2 ? a->y2 : b->y2;
+	if (dest->x1 >= dest->x2 || dest->y1 >= dest->y2)
+		dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0;
 }
 
-static void
-i830_crtc_box (xf86CrtcPtr crtc, BoxPtr crtc_box)
+static void i830_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
 {
-    if (crtc->enabled)
-    {
-	crtc_box->x1 = crtc->x;
-	crtc_box->x2 = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation);
-	crtc_box->y1 = crtc->y;
-	crtc_box->y2 = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation);
-    }
-    else
-	crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
+	if (crtc->enabled) {
+		crtc_box->x1 = crtc->x;
+		crtc_box->x2 =
+		    crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation);
+		crtc_box->y1 = crtc->y;
+		crtc_box->y2 =
+		    crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation);
+	} else
+		crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
 }
 
-static int
-i830_box_area (BoxPtr box)
+static int i830_box_area(BoxPtr box)
 {
-    return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
+	return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1);
 }
 
 /*
@@ -1720,213 +1643,383 @@ i830_box_area (BoxPtr box)
  * with greater coverage
  */
 
-static xf86CrtcPtr
-i830_covering_crtc (ScrnInfoPtr pScrn,
-		    BoxPtr	box,
-		    xf86CrtcPtr desired,
-		    BoxPtr	crtc_box_ret)
-{
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    xf86CrtcPtr		crtc, best_crtc;
-    int			coverage, best_coverage;
-    int			c;
-    BoxRec		crtc_box, cover_box;
-
-    best_crtc = NULL;
-    best_coverage = 0;
-    crtc_box_ret->x1 = 0;
-    crtc_box_ret->x2 = 0;
-    crtc_box_ret->y1 = 0;
-    crtc_box_ret->y2 = 0;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	crtc = xf86_config->crtc[c];
-	i830_crtc_box (crtc, &crtc_box);
-	i830_box_intersect (&cover_box, &crtc_box, box);
-	coverage = i830_box_area (&cover_box);
-	if (coverage && crtc == desired)
-	{
-	    *crtc_box_ret = crtc_box;
-	    return crtc;
-	}
-	if (coverage > best_coverage)
-	{
-	    *crtc_box_ret = crtc_box;
-	    best_crtc = crtc;
-	    best_coverage = coverage;
+xf86CrtcPtr
+i830_covering_crtc(ScrnInfoPtr scrn,
+		   BoxPtr box, xf86CrtcPtr desired, BoxPtr crtc_box_ret)
+{
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+	xf86CrtcPtr crtc, best_crtc;
+	int coverage, best_coverage;
+	int c;
+	BoxRec crtc_box, cover_box;
+
+	best_crtc = NULL;
+	best_coverage = 0;
+	crtc_box_ret->x1 = 0;
+	crtc_box_ret->x2 = 0;
+	crtc_box_ret->y1 = 0;
+	crtc_box_ret->y2 = 0;
+	for (c = 0; c < xf86_config->num_crtc; c++) {
+		crtc = xf86_config->crtc[c];
+
+		/* If the CRTC is off, treat it as not covering */
+		if (!i830_crtc_on(crtc))
+			continue;
+
+		i830_crtc_box(crtc, &crtc_box);
+		i830_box_intersect(&cover_box, &crtc_box, box);
+		coverage = i830_box_area(&cover_box);
+		if (coverage && crtc == desired) {
+			*crtc_box_ret = crtc_box;
+			return crtc;
+		}
+		if (coverage > best_coverage) {
+			*crtc_box_ret = crtc_box;
+			best_crtc = crtc;
+			best_coverage = coverage;
+		}
 	}
-    }
-    return best_crtc;
+	return best_crtc;
 }
 
 static int
-i830_swidth (I830Ptr pI830, unsigned int offset,
+i830_swidth (intel_screen_private *intel, unsigned int offset,
 	     unsigned int width, unsigned int mask, int shift)
 {
     int	swidth = ((offset + width + mask) >> shift) - (offset >> shift);
-    if (IS_I9XX(pI830))
+    if (IS_I9XX(intel))
 	swidth <<= 1;
     swidth -= 1;
     return swidth << 2;
 }
 
 static void
-i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
-		   int id, short width, short height,
-		   int dstPitch, int x1, int y1, int x2, int y2, BoxPtr dstBox,
-		   short src_w, short src_h, short drw_w, short drw_h)
+i830_calc_src_regs(intel_screen_private *intel, int planar, short width,
+    short height, uint32_t *swidth_out, uint32_t *swidthsw_out,
+    uint32_t *sheigth_out)
 {
-    I830Ptr		pI830 = I830PTR(pScrn);
-    I830PortPrivPtr	pPriv = pI830->adaptor->pPortPrivates[0].ptr;
-    I830OverlayRegPtr	overlay = I830OVERLAYREG(pI830);
-    unsigned int	swidth, swidthy, swidthuv;
     unsigned int	mask, shift, offsety, offsetu;
-    int			tmp;
-    uint32_t		OCMD;
-    Bool		scaleChanged = FALSE;
-
-    OVERLAY_DEBUG("I830DisplayVideo: %dx%d (pitch %d)\n", width, height,
-		  dstPitch);
+    unsigned int	swidth, swidthy, swidthuv;
+    intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
 
-#if VIDEO_DEBUG
-    CompareOverlay(pI830, (uint32_t *) overlay, 0x100);
-#endif
-    
-    /*
-     * If the video isn't visible on any CRTC, turn it off
-     */
-    if (!crtc)
-    {
-	pPriv->current_crtc = NULL;
-	i830_overlay_off (pScrn);
-	return;
-    }
-    
-    if (crtc != pPriv->current_crtc)
-    {
-	i830_overlay_switch_to_crtc (pScrn, crtc);
-	if (pPriv->overlayOK) {
-	    pPriv->current_crtc = crtc;
-	    I830ResetVideo (pScrn);
-	}
+    if (IS_I9XX(intel)) {
+	shift = 6;
+	mask = 0x3f;
+    } else {
+	shift = 5;
+	mask = 0x1f;
     }
 
-    if (!pPriv->overlayOK)
-	return;
+    offsety = adaptor_priv->YBufOffset;
+    offsetu = adaptor_priv->UBufOffset;
+
+    if (planar) {
+	*swidth_out = width | ((width/2 & 0x7ff) << 16);
+	swidthy  = i830_swidth (intel, offsety, width, mask, shift);
+	swidthuv = i830_swidth (intel, offsetu, width/2, mask, shift);
+	*swidthsw_out = (swidthy) | (swidthuv << 16);
+	*sheigth_out = height | ((height / 2) << 16);
+    } else {
+	*swidth_out = width;
+	swidth = i830_swidth (intel, offsety, width << 1, mask, shift);
+	*swidthsw_out = swidth;
+	*sheigth_out = height;
+    }
+
+    return;
+}
+
+static void
+i830_update_dst_box_to_crtc_coords(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
+				   BoxPtr dstBox)
+{
+	int tmp;
 
-    switch (crtc->rotation & 0xf) {
 	/* for overlay, we should take it from crtc's screen
 	 * coordinate to current crtc's display mode.
 	 * yeah, a bit confusing.
 	 */
-    case RR_Rotate_0:
-	dstBox->x1 -= crtc->x;
-	dstBox->x2 -= crtc->x;
-	dstBox->y1 -= crtc->y;
-	dstBox->y2 -= crtc->y;
-	break;
-    case RR_Rotate_90:
-	tmp = dstBox->x1;
-	dstBox->x1 = dstBox->y1 - crtc->x;
-	dstBox->y1 = pScrn->virtualX - tmp - crtc->y;
-	tmp = dstBox->x2;
-	dstBox->x2 = dstBox->y2 - crtc->x;
-	dstBox->y2 = pScrn->virtualX - tmp - crtc->y;
-	tmp = dstBox->y1;
-	dstBox->y1 = dstBox->y2;
-	dstBox->y2 = tmp;
-	break;
-    case RR_Rotate_180:
-	tmp = dstBox->x1;
-	dstBox->x1 = pScrn->virtualX - dstBox->x2 - crtc->x;
-	dstBox->x2 = pScrn->virtualX - tmp - crtc->x;
-	tmp = dstBox->y1;
-	dstBox->y1 = pScrn->virtualY - dstBox->y2 - crtc->y;
-	dstBox->y2 = pScrn->virtualY - tmp - crtc->y;
-	break;
-    case RR_Rotate_270:
-	tmp = dstBox->x1;
-	dstBox->x1 = pScrn->virtualY - dstBox->y1 - crtc->x;
-	dstBox->y1 = tmp - crtc->y;
-	tmp = dstBox->x2;
-	dstBox->x2 = pScrn->virtualY - dstBox->y2 - crtc->x;
-	dstBox->y2 = tmp - crtc->y;
-	tmp = dstBox->x1;
-	dstBox->x1 = dstBox->x2;
-	dstBox->x2 = tmp;
-	break;
+	switch (crtc->rotation & 0xf) {
+	case RR_Rotate_0:
+		dstBox->x1 -= crtc->x;
+		dstBox->x2 -= crtc->x;
+		dstBox->y1 -= crtc->y;
+		dstBox->y2 -= crtc->y;
+		break;
+	case RR_Rotate_90:
+		tmp = dstBox->x1;
+		dstBox->x1 = dstBox->y1 - crtc->x;
+		dstBox->y1 = scrn->virtualX - tmp - crtc->y;
+		tmp = dstBox->x2;
+		dstBox->x2 = dstBox->y2 - crtc->x;
+		dstBox->y2 = scrn->virtualX - tmp - crtc->y;
+		tmp = dstBox->y1;
+		dstBox->y1 = dstBox->y2;
+		dstBox->y2 = tmp;
+		break;
+	case RR_Rotate_180:
+		tmp = dstBox->x1;
+		dstBox->x1 = scrn->virtualX - dstBox->x2 - crtc->x;
+		dstBox->x2 = scrn->virtualX - tmp - crtc->x;
+		tmp = dstBox->y1;
+		dstBox->y1 = scrn->virtualY - dstBox->y2 - crtc->y;
+		dstBox->y2 = scrn->virtualY - tmp - crtc->y;
+		break;
+	case RR_Rotate_270:
+		tmp = dstBox->x1;
+		dstBox->x1 = scrn->virtualY - dstBox->y1 - crtc->x;
+		dstBox->y1 = tmp - crtc->y;
+		tmp = dstBox->x2;
+		dstBox->x2 = scrn->virtualY - dstBox->y2 - crtc->x;
+		dstBox->y2 = tmp - crtc->y;
+		tmp = dstBox->x1;
+		dstBox->x1 = dstBox->x2;
+		dstBox->x2 = tmp;
+		break;
+	}
+
+	return;
+}
+
+static void
+i830_store_coeffs_in_overlay_regs(uint16_t *reg_coeffs, coeffPtr new_coeffs,
+	int max_taps)
+{
+    int i, j, pos;
+
+    for (i = 0; i < N_PHASES; i++) {
+	for (j = 0; j < max_taps; j++) {
+	    pos = i * max_taps + j;
+	    reg_coeffs[pos] = (new_coeffs[pos].sign << 15 |
+				      new_coeffs[pos].exponent << 12 |
+				      new_coeffs[pos].mantissa);
+	}
     }
+}
 
-    if (crtc->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-	tmp = width;
-	width = height;
-	height = tmp;
-	tmp = drw_w;
-	drw_w = drw_h;
-	drw_h = tmp;
-	tmp = src_w;
-	src_w = src_h;
-	src_h = tmp;
+static uint32_t
+i830_overlay_cmd(int id, int planar)
+{
+    uint32_t OCMD = OVERLAY_ENABLE;
+
+    if (planar) {
+	OVERLAY_DEBUG("YUV420\n");
+	OCMD &= ~SOURCE_FORMAT;
+	OCMD &= ~OV_BYTE_ORDER;
+	OCMD |= YUV_420;
+    } else {
+	OVERLAY_DEBUG("YUV422\n");
+	OCMD &= ~SOURCE_FORMAT;
+	OCMD |= YUV_422;
+	OCMD &= ~OV_BYTE_ORDER;
+	if (id == FOURCC_UYVY)
+	    OCMD |= Y_SWAP;
     }
 
-    if (pPriv->oneLineMode) {
-	/* change the coordinates with panel fitting active */
-	dstBox->y1 = (((dstBox->y1 - 1) * pPriv->scaleRatio) >> 16) + 1;
-	dstBox->y2 = ((dstBox->y2 * pPriv->scaleRatio) >> 16) + 1;
+    OCMD &= ~(BUFFER_SELECT | FIELD_SELECT);
+    OCMD |= BUFFER0;
 
-	/* Now, alter the height, so we scale to the correct size */
-	drw_h = ((drw_h * pPriv->scaleRatio) >> 16) + 1;
+    OVERLAY_DEBUG("OCMD is 0x%x\n", OCMD);
+
+    return OCMD;
+}
+
+static double
+i830_limit_coeff(double coeff)
+{
+    /* Limit to between 1.0 and 3.0. */
+    if (coeff < MIN_CUTOFF_FREQ)
+	coeff = MIN_CUTOFF_FREQ;
+    if (coeff > MAX_CUTOFF_FREQ)
+	coeff = MAX_CUTOFF_FREQ;
+
+    return coeff;
+}
+
+static void
+i830_update_polyphase_coeffs(I830OverlayRegPtr	overlay,
+	int xscaleFract, int xscaleFractUV)
+{
+    /*
+     * Only Horizontal coefficients so far.
+     */
+    double fCutoffY;
+    double fCutoffUV;
+    coeffRec xcoeffY[N_HORIZ_Y_TAPS * N_PHASES];
+    coeffRec xcoeffUV[N_HORIZ_UV_TAPS * N_PHASES];
+
+    fCutoffY = xscaleFract / 4096.0;
+    fCutoffUV = xscaleFractUV / 4096.0;
+
+    fCutoffUV = i830_limit_coeff(fCutoffUV);
+    fCutoffY = i830_limit_coeff(fCutoffY);
+
+    UpdateCoeff(N_HORIZ_Y_TAPS, fCutoffY, TRUE, TRUE, xcoeffY);
+    UpdateCoeff(N_HORIZ_UV_TAPS, fCutoffUV, TRUE, FALSE, xcoeffUV);
+
+    i830_store_coeffs_in_overlay_regs(overlay->Y_HCOEFS, xcoeffY,
+		    N_HORIZ_Y_TAPS);
+    i830_store_coeffs_in_overlay_regs(overlay->UV_HCOEFS, xcoeffUV,
+		    N_HORIZ_UV_TAPS);
+}
+
+/*
+ * Calculate horizontal and vertical scaling factors and polyphase
+ * coefficients.
+ */
+
+static Bool
+i830_update_scaling_factors(I830OverlayRegPtr overlay,
+	short src_w, short src_h, short drw_w, short drw_h)
+{
+    int xscaleInt, xscaleFract, yscaleInt, yscaleFract;
+    int xscaleIntUV, xscaleFractUV;
+    int yscaleIntUV, yscaleFractUV;
+    uint32_t newval;
+    Bool scaleChanged = FALSE;
+
+    /*
+     * Y down-scale factor as a multiple of 4096.
+     */
+    xscaleFract = ((src_w - 1) << 12) / drw_w;
+    yscaleFract = ((src_h - 1) << 12) / drw_h;
+
+    /* Calculate the UV scaling factor.
+     * UV is half the size of Y -- YUV420 */
+    xscaleFractUV = xscaleFract / 2;
+    yscaleFractUV = yscaleFract / 2;
+
+    /*
+     * To keep the relative Y and UV ratios exact, round the Y scales
+     * to a multiple of the Y/UV ratio.
+     */
+    xscaleFract = xscaleFractUV * 2;
+    yscaleFract = yscaleFractUV * 2;
+
+    /* Integer (un-multiplied) values. */
+    xscaleInt = xscaleFract >> 12;
+    yscaleInt = yscaleFract >> 12;
+
+    xscaleIntUV = xscaleFractUV >> 12;
+    yscaleIntUV = yscaleFractUV >> 12;
+
+    OVERLAY_DEBUG("xscale: %x.%03x, yscale: %x.%03x\n", xscaleInt,
+		  xscaleFract & 0xFFF, yscaleInt, yscaleFract & 0xFFF);
+    OVERLAY_DEBUG("UV xscale: %x.%03x, UV yscale: %x.%03x\n", xscaleIntUV,
+		  xscaleFractUV & 0xFFF, yscaleIntUV, yscaleFractUV & 0xFFF);
+
+    /* shouldn't get here */
+    if (xscaleInt > 7) {
+	OVERLAY_DEBUG("xscale: bad scale\n");
+	return FALSE;
     }
 
-    if (IS_I9XX(pI830)) {
-	shift = 6;
-	mask = 0x3f;
-    } else {
-	shift = 5;
-	mask = 0x1f;
+    /* shouldn't get here */
+    if (xscaleIntUV > 7) {
+	OVERLAY_DEBUG("xscaleUV: bad scale\n");
+	return FALSE;
     }
 
-    if (pPriv->currentBuf == 0) {
-	offsety = pPriv->YBuf0offset;
-	offsetu = pPriv->UBuf0offset;
-    } else {
-	offsety = pPriv->YBuf1offset;
-	offsetu = pPriv->UBuf1offset;
+    newval = (xscaleInt << 16) |
+    ((xscaleFract & 0xFFF) << 3) | ((yscaleFract & 0xFFF) << 20);
+    if (newval != overlay->YRGBSCALE) {
+	scaleChanged = TRUE;
+	overlay->YRGBSCALE = newval;
     }
 
-    switch (id) {
-    case FOURCC_YV12:
-    case FOURCC_I420:
-	overlay->SWIDTH = width | ((width/2 & 0x7ff) << 16);
-	swidthy  = i830_swidth (pI830, offsety, width, mask, shift);
-	swidthuv = i830_swidth (pI830, offsetu, width/2, mask, shift);
-	overlay->SWIDTHSW = (swidthy) | (swidthuv << 16);
-	overlay->SHEIGHT = height | ((height / 2) << 16);
-	break;
-    case FOURCC_UYVY:
-    case FOURCC_YUY2:
-    default:
-	overlay->SWIDTH = width;
-	swidth = ((offsety + (width << 1) + mask) >> shift) -
-	(offsety >> shift);
-
-	if (IS_I9XX(pI830))
-	    swidth <<= 1;
-
-	swidth -= 1;
-
-	swidth <<= 2;
-	
-	OVERLAY_DEBUG("swidthsw is old %d new %d\n",
-		      swidth,
-		      i830_swidth (pI830, offsety, width << 1,
-				   mask, shift));
+    newval = (xscaleIntUV << 16) | ((xscaleFractUV & 0xFFF) << 3) |
+    ((yscaleFractUV & 0xFFF) << 20);
+    if (newval != overlay->UVSCALE) {
+	scaleChanged = TRUE;
+	overlay->UVSCALE = newval;
+    }
 
-	overlay->SWIDTHSW = swidth;
-	overlay->SHEIGHT = height;
-	break;
+    newval = yscaleInt << 16 | yscaleIntUV;
+    if (newval != overlay->UVSCALEV) {
+	scaleChanged = TRUE;
+	overlay->UVSCALEV = newval;
+    }
+
+    if (scaleChanged) {
+	i830_update_polyphase_coeffs(overlay, xscaleFract, xscaleFractUV);
+    }
+
+    return scaleChanged;
+}
+
+int is_planar_fourcc(int id)
+{
+	switch (id) {
+	case FOURCC_YV12:
+	case FOURCC_I420:
+#ifdef INTEL_XVMC
+	case FOURCC_XVMC:
+#endif
+		return 1;
+	case FOURCC_UYVY:
+	case FOURCC_YUY2:
+		return 0;
+	default:
+		ErrorF("Unknown format 0x%x\n", id);
+		return 0;
+	}
+}
+
+static int xvmc_passthrough(int id)
+{
+#ifdef INTEL_XVMC
+	return id == FOURCC_XVMC;
+#else
+	return 0;
+#endif
+}
+
+static Bool
+ums_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
+		   int id, short width, short height,
+		   int dstPitch, int dstPitch2,
+		   BoxPtr dstBox, short src_w, short src_h, short drw_w,
+		   short drw_h)
+{
+    intel_screen_private *intel = intel_get_screen_private(scrn);
+    intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
+    I830OverlayRegPtr	overlay = I830OVERLAYREG(intel);
+    int			planar;
+    uint32_t		swidth, swidthsw, sheigth;
+    Bool		scaleChanged;
+    drm_intel_bo	*tmp_buf;
+
+    if (crtc != adaptor_priv->current_crtc)
+    {
+	/* this may adjust adaptor_priv->oneLineMode */
+	i830_overlay_switch_to_crtc (scrn, crtc);
+	if (adaptor_priv->overlayOK) {
+	    adaptor_priv->current_crtc = crtc;
+	    I830ResetVideo (scrn);
+	}
     }
 
+    if (!adaptor_priv->overlayOK)
+	return TRUE;
+
+    if (adaptor_priv->oneLineMode) {
+	/* change the coordinates with panel fitting active */
+	dstBox->y1 = (((dstBox->y1 - 1) * adaptor_priv->scaleRatio) >> 16) + 1;
+	dstBox->y2 = ((dstBox->y2 * adaptor_priv->scaleRatio) >> 16) + 1;
+
+	/* Now, alter the height, so we scale to the correct size */
+	drw_h = ((drw_h * adaptor_priv->scaleRatio) >> 16) + 1;
+    }
+
+    planar = is_planar_fourcc(id);
+
+    i830_calc_src_regs(intel, planar, width, height,
+	    &swidth, &swidthsw, &sheigth);
+
+    overlay->SWIDTH = swidth;
+    overlay->SWIDTHSW = swidthsw;
+    overlay->SHEIGHT = sheigth;
+
     overlay->DWINPOS = (dstBox->y1 << 16) | dstBox->x1;
 
     overlay->DWINSZ = (((dstBox->y2 - dstBox->y1) << 16) |
@@ -1936,266 +2029,335 @@ i830_display_video(ScrnInfoPtr pScrn, xf
 		  dstBox->x1, dstBox->y1, dstBox->x2, dstBox->y2);
 
     /* buffer locations */
-    overlay->OBUF_0Y = pPriv->YBuf0offset;
-    overlay->OBUF_0U = pPriv->UBuf0offset;
-    overlay->OBUF_0V = pPriv->VBuf0offset;
-    if(pPriv->doubleBuffer) {
-	overlay->OBUF_1Y = pPriv->YBuf1offset;
-	overlay->OBUF_1U = pPriv->UBuf1offset;
-	overlay->OBUF_1V = pPriv->VBuf1offset;
-    }
+    if (drm_intel_bo_pin(adaptor_priv->buf, GTT_PAGE_SIZE) != 0)
+        return FALSE;
+    overlay->OBUF_0Y = adaptor_priv->YBufOffset + adaptor_priv->buf->offset;
+    overlay->OBUF_0U = adaptor_priv->UBufOffset + adaptor_priv->buf->offset;
+    overlay->OBUF_0V = adaptor_priv->VBufOffset + adaptor_priv->buf->offset;
 
     OVERLAY_DEBUG("pos: 0x%x, size: 0x%x\n",
 		  overlay->DWINPOS, overlay->DWINSZ);
     OVERLAY_DEBUG("dst: %d x %d, src: %d x %d\n", drw_w, drw_h, src_w, src_h);
 
-    /* 
-     * Calculate horizontal and vertical scaling factors and polyphase
-     * coefficients.
-     */
+    scaleChanged = i830_update_scaling_factors(overlay,
+	    src_w, src_h, drw_w, drw_h);
 
-    {
-	int xscaleInt, xscaleFract, yscaleInt, yscaleFract;
-	int xscaleIntUV, xscaleFractUV;
-	int yscaleIntUV, yscaleFractUV;
-	/* UV is half the size of Y -- YUV420 */
-	int uvratio = 2;
-	uint32_t newval;
-	coeffRec xcoeffY[N_HORIZ_Y_TAPS * N_PHASES];
-	coeffRec xcoeffUV[N_HORIZ_UV_TAPS * N_PHASES];
-	int i, j, pos;
+    if (planar) {
+#if 0
+	/* set UV vertical phase to -0.25 */
+	overlay->UV_VPH = 0x30003000;
+#endif
+	overlay->OSTRIDE = (dstPitch2) | (dstPitch << 16);
+	OVERLAY_DEBUG("UV stride is %d, Y stride is %d\n",
+		      dstPitch, dstPitch * 2);
+    } else
+	overlay->OSTRIDE = dstPitch;
+
+    overlay->OCMD = i830_overlay_cmd(id, planar);
+
+    /* make sure the overlay is on */
+    i830_overlay_on (scrn);
+    /* and show this frame */
+    i830_overlay_continue (scrn, scaleChanged);
+
+    /* unpin the old buffer and exchange buffers */
+    if (adaptor_priv->oldBuf_pinned) {
+	drm_intel_bo_unpin(adaptor_priv->oldBuf);
+    }
+    tmp_buf = adaptor_priv->buf;
+    adaptor_priv->buf = adaptor_priv->oldBuf;
+    adaptor_priv->oldBuf = tmp_buf;
+    adaptor_priv->oldBuf_pinned = TRUE;
+
+    return TRUE;
+}
+
+static Bool
+i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
+		     int id, short width, short height,
+		     int dstPitch, int dstPitch2,
+		     BoxPtr dstBox, short src_w, short src_h, short drw_w,
+		     short drw_h)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
+	int tmp;
+
+	OVERLAY_DEBUG("I830DisplayVideo: %dx%d (pitch %d)\n", width, height,
+		      dstPitch);
+
+#if VIDEO_DEBUG
+	CompareOverlay(intel, (uint32_t *) overlay, 0x100);
+#endif
 
 	/*
-	 * Y down-scale factor as a multiple of 4096.
+	 * If the video isn't visible on any CRTC, turn it off
 	 */
-	xscaleFract = ((src_w - 1) << 12) / drw_w;
-	yscaleFract = ((src_h - 1) << 12) / drw_h;
+	if (!crtc) {
+		adaptor_priv->current_crtc = NULL;
+		ums_overlay_off(scrn);
+
+		return TRUE;
+	}
+
+	i830_update_dst_box_to_crtc_coords(scrn, crtc, dstBox);
+
+	if (crtc->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+		tmp = width;
+		width = height;
+		height = tmp;
+		tmp = drw_w;
+		drw_w = drw_h;
+		drw_h = tmp;
+		tmp = src_w;
+		src_w = src_h;
+		src_h = tmp;
+	}
 
-	/* Calculate the UV scaling factor. */
-	xscaleFractUV = xscaleFract / uvratio;
-	yscaleFractUV = yscaleFract / uvratio;
+	return ums_overlay_put_image(scrn, crtc, id, width, height, dstPitch,
+	    dstPitch2, dstBox, src_w, src_h, drw_w, drw_h);
+}
+
+static Bool
+i830_clip_video_helper(ScrnInfoPtr scrn,
+		       intel_adaptor_private *adaptor_priv,
+		       xf86CrtcPtr * crtc_ret,
+		       BoxPtr dst,
+		       short src_x, short src_y,
+		       short drw_x, short drw_y,
+		       short src_w, short src_h,
+		       short drw_w, short drw_h,
+		       int id,
+		       int *top, int* left, int* npixels, int *nlines,
+		       RegionPtr reg, INT32 width, INT32 height)
+{
+	Bool ret;
+	RegionRec crtc_region_local;
+	RegionPtr crtc_region = reg;
+	BoxRec crtc_box;
+	INT32 x1, x2, y1, y2;
+	xf86CrtcPtr crtc;
+
+	x1 = src_x;
+	x2 = src_x + src_w;
+	y1 = src_y;
+	y2 = src_y + src_h;
+
+	dst->x1 = drw_x;
+	dst->x2 = drw_x + drw_w;
+	dst->y1 = drw_y;
+	dst->y2 = drw_y + drw_h;
 
 	/*
-	 * To keep the relative Y and UV ratios exact, round the Y scales
-	 * to a multiple of the Y/UV ratio.
+	 * For overlay video, compute the relevant CRTC and
+	 * clip video to that
 	 */
-	xscaleFract = xscaleFractUV * uvratio;
-	yscaleFract = yscaleFractUV * uvratio;
+	crtc = i830_covering_crtc(scrn, dst, adaptor_priv->desired_crtc,
+					      &crtc_box);
 
-	/* Integer (un-multiplied) values. */
-	xscaleInt = xscaleFract >> 12;
-	yscaleInt = yscaleFract >> 12;
+	/* For textured video, we don't actually want to clip at all. */
+	if (crtc && !adaptor_priv->textured) {
+		REGION_INIT(screen, &crtc_region_local, &crtc_box, 1);
+		crtc_region = &crtc_region_local;
+		REGION_INTERSECT(screen, crtc_region, crtc_region,
+				 reg);
+	}
+	*crtc_ret = crtc;
 
-	xscaleIntUV = xscaleFractUV >> 12;
-	yscaleIntUV = yscaleFractUV >> 12;
+	ret = xf86XVClipVideoHelper(dst, &x1, &x2, &y1, &y2,
+				    crtc_region, width, height);
+	if (crtc_region != reg)
+		REGION_UNINIT(screen, &crtc_region_local);
+
+	*top = y1 >> 16;
+	*left = (x1 >> 16) & ~1;
+	*npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - *left;
+	if (is_planar_fourcc(id)) {
+		*top &= ~1;
+		*nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - *top;
+	} else
+		*nlines = ((y2 + 0xffff) >> 16) - *top;
 
-	OVERLAY_DEBUG("xscale: %x.%03x, yscale: %x.%03x\n", xscaleInt,
-		      xscaleFract & 0xFFF, yscaleInt, yscaleFract & 0xFFF);
-	OVERLAY_DEBUG("UV xscale: %x.%03x, UV yscale: %x.%03x\n", xscaleIntUV,
-		      xscaleFractUV & 0xFFF, yscaleIntUV, yscaleFractUV & 0xFFF);
+	return ret;
+}
 
-	/* shouldn't get here */
-	if (xscaleInt > 7) {
-	    OVERLAY_DEBUG("xscale: bad scale\n");
-	    return;
-	}
+static void
+i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pixmap,
+		       xf86CrtcPtr crtc, RegionPtr clipBoxes)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	BoxPtr box;
+	pixman_box16_t box_in_crtc_coordinates;
+	int pipe = -1, event, load_scan_lines_pipe;
+
+	if (pixmap_is_scanout(pixmap))
+		pipe = i830_crtc_to_pipe(crtc);
+
+	if (pipe >= 0) {
+		if (pipe == 0) {
+			event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
+			load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEA;
+		} else {
+			event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
+			load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEB;
+		}
 
-	/* shouldn't get here */
-	if (xscaleIntUV > 7) {
-	    OVERLAY_DEBUG("xscaleUV: bad scale\n");
-	    return;
+		box = REGION_EXTENTS(unused, clipBoxes);
+		box_in_crtc_coordinates = *box;
+		if (crtc->transform_in_use)
+			pixman_f_transform_bounds(&crtc->f_framebuffer_to_crtc,
+						  &box_in_crtc_coordinates);
+
+		BEGIN_BATCH(5);
+		/* The documentation says that the LOAD_SCAN_LINES command
+		 * always comes in pairs. Don't ask me why. */
+		OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe);
+		OUT_BATCH((box_in_crtc_coordinates.
+			   y1 << 16) | box_in_crtc_coordinates.y2);
+		OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe);
+		OUT_BATCH((box_in_crtc_coordinates.
+			   y1 << 16) | box_in_crtc_coordinates.y2);
+		OUT_BATCH(MI_WAIT_FOR_EVENT | event);
+		ADVANCE_BATCH();
 	}
+}
+
+static Bool
+i830_setup_video_buffer(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv,
+			int alloc_size, int id, unsigned char *buf)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-	newval = (xscaleInt << 16) |
-	((xscaleFract & 0xFFF) << 3) | ((yscaleFract & 0xFFF) << 20);
-	if (newval != overlay->YRGBSCALE) {
-	    scaleChanged = TRUE;
-	    overlay->YRGBSCALE = newval;
+	/* Free the current buffer if we're going to have to reallocate */
+	if (adaptor_priv->buf && adaptor_priv->buf->size < alloc_size) {
+		drm_intel_bo_unreference(adaptor_priv->buf);
+		adaptor_priv->buf = NULL;
 	}
 
-	newval = (xscaleIntUV << 16) | ((xscaleFractUV & 0xFFF) << 3) |
-	((yscaleFractUV & 0xFFF) << 20);
-	if (newval != overlay->UVSCALE) {
-	    scaleChanged = TRUE;
-	    overlay->UVSCALE = newval;
+	if (adaptor_priv->buf == NULL) {
+		adaptor_priv->buf = drm_intel_bo_alloc(intel->bufmgr,
+						"xv buffer", alloc_size,
+						4096);
+		if (adaptor_priv->buf == NULL)
+			return FALSE;
 	}
 
-	newval = yscaleInt << 16 | yscaleIntUV;
-	if (newval != overlay->UVSCALEV) {
-	    scaleChanged = TRUE;
-	    overlay->UVSCALEV = newval;
+	return TRUE;
+}
+
+static void
+i830_setup_dst_params(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, short width,
+			short height, int *dstPitch, int *dstPitch2, int *size,
+			int id)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int pitchAlignMask;
+
+	/* Only needs to be DWORD-aligned for textured on i915, but overlay has
+	 * stricter requirements.
+	 */
+	if (adaptor_priv->textured) {
+		pitchAlignMask = 3;
+	} else {
+		if (IS_I965G(intel))
+			/* Actually the alignment is 64 bytes, too. But the
+			 * stride must be at least 512 bytes. Take the easy fix
+			 * and align on 512 bytes unconditionally. */
+			pitchAlignMask = 511;
+		else
+			pitchAlignMask = 63;
 	}
 
-	/* Recalculate coefficients if the scaling changed. */
+#if INTEL_XVMC
+	/* for i915 xvmc, hw requires 1kb aligned surfaces */
+	if ((id == FOURCC_XVMC) && IS_I915(intel))
+		pitchAlignMask = 0x3ff;
+#endif
 
-	/*
-	 * Only Horizontal coefficients so far.
+	/* Determine the desired destination pitch (representing the chroma's pitch,
+	 * in the planar case.
 	 */
-	if (scaleChanged) {
-	    double fCutoffY;
-	    double fCutoffUV;
-
-	    fCutoffY = xscaleFract / 4096.0;
-	    fCutoffUV = xscaleFractUV / 4096.0;
-
-	    /* Limit to between 1.0 and 3.0. */
-	    if (fCutoffY < MIN_CUTOFF_FREQ)
-		fCutoffY = MIN_CUTOFF_FREQ;
-	    if (fCutoffY > MAX_CUTOFF_FREQ)
-		fCutoffY = MAX_CUTOFF_FREQ;
-	    if (fCutoffUV < MIN_CUTOFF_FREQ)
-		fCutoffUV = MIN_CUTOFF_FREQ;
-	    if (fCutoffUV > MAX_CUTOFF_FREQ)
-		fCutoffUV = MAX_CUTOFF_FREQ;
-
-	    UpdateCoeff(N_HORIZ_Y_TAPS, fCutoffY, TRUE, TRUE, xcoeffY);
-	    UpdateCoeff(N_HORIZ_UV_TAPS, fCutoffUV, TRUE, FALSE, xcoeffUV);
-
-	    for (i = 0; i < N_PHASES; i++) {
-		for (j = 0; j < N_HORIZ_Y_TAPS; j++) {
-		    pos = i * N_HORIZ_Y_TAPS + j;
-		    overlay->Y_HCOEFS[pos] = (xcoeffY[pos].sign << 15 |
-					      xcoeffY[pos].exponent << 12 |
-					      xcoeffY[pos].mantissa);
+	if (is_planar_fourcc(id)) {
+		if (adaptor_priv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+			*dstPitch =
+			    ((height / 2) + pitchAlignMask) & ~pitchAlignMask;
+			*dstPitch2 =
+			    (height + pitchAlignMask) & ~pitchAlignMask;
+			*size = *dstPitch * width * 3;
+		} else {
+			*dstPitch =
+			    ((width / 2) + pitchAlignMask) & ~pitchAlignMask;
+			*dstPitch2 =
+			    (width + pitchAlignMask) & ~pitchAlignMask;
+			*size = *dstPitch * height * 3;
 		}
-	    }
-	    for (i = 0; i < N_PHASES; i++) {
-		for (j = 0; j < N_HORIZ_UV_TAPS; j++) {
-		    pos = i * N_HORIZ_UV_TAPS + j;
-		    overlay->UV_HCOEFS[pos] = (xcoeffUV[pos].sign << 15 |
-					       xcoeffUV[pos].exponent << 12 |
-					       xcoeffUV[pos].mantissa);
+	} else {
+		if (adaptor_priv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+			*dstPitch =
+			    ((height << 1) + pitchAlignMask) & ~pitchAlignMask;
+			*size = *dstPitch * width;
+		} else {
+			*dstPitch =
+			    ((width << 1) + pitchAlignMask) & ~pitchAlignMask;
+			*size = *dstPitch * height;
 		}
-	    }
+		*dstPitch2 = 0;
 	}
-    }
-
-    OCMD = OVERLAY_ENABLE;
-    
-    switch (id) {
-    case FOURCC_YV12:
-    case FOURCC_I420:
-#ifdef INTEL_XVMC
-    case FOURCC_XVMC:
-#endif
-	OVERLAY_DEBUG("YUV420\n");
 #if 0
-	/* set UV vertical phase to -0.25 */
-	overlay->UV_VPH = 0x30003000;
+	ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, *dstPitch,
+	       size);
 #endif
-	OVERLAY_DEBUG("UV stride is %d, Y stride is %d\n",
-		      dstPitch, dstPitch * 2);
-	overlay->OSTRIDE = (dstPitch * 2) | (dstPitch << 16);
-	OCMD &= ~SOURCE_FORMAT;
-	OCMD &= ~OV_BYTE_ORDER;
-	OCMD |= YUV_420;
-	break;
-    case FOURCC_UYVY:
-    case FOURCC_YUY2:
-	OVERLAY_DEBUG("YUV422\n");
-	overlay->OSTRIDE = dstPitch;
-	OCMD &= ~SOURCE_FORMAT;
-	OCMD |= YUV_422;
-	OCMD &= ~OV_BYTE_ORDER;
-	if (id == FOURCC_UYVY)
-	    OCMD |= Y_SWAP;
-	break;
-    }
-
-    OCMD &= ~(BUFFER_SELECT | FIELD_SELECT);
-    if (pPriv->currentBuf == 0)
-	OCMD |= BUFFER0;
-    else
-	OCMD |= BUFFER1;
 
-    overlay->OCMD = OCMD;
-    OVERLAY_DEBUG("OCMD is 0x%x\n", OCMD);
+	adaptor_priv->YBufOffset = 0;
 
-    /* make sure the overlay is on */
-    i830_overlay_on (pScrn);
-    /* and show this frame */
-    i830_overlay_continue (pScrn, scaleChanged);
+	if (adaptor_priv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+		adaptor_priv->UBufOffset =
+		    adaptor_priv->YBufOffset + (*dstPitch2 * width);
+		adaptor_priv->VBufOffset =
+		    adaptor_priv->UBufOffset + (*dstPitch * width / 2);
+	} else {
+		adaptor_priv->UBufOffset =
+		    adaptor_priv->YBufOffset + (*dstPitch2 * height);
+		adaptor_priv->VBufOffset =
+		    adaptor_priv->UBufOffset + (*dstPitch * height / 2);
+	}
 }
 
 static Bool
-i830_clip_video_helper (ScrnInfoPtr pScrn,
-			I830PortPrivPtr pPriv,
-			xf86CrtcPtr *crtc_ret,
-			BoxPtr	    dst,
-			INT32	    *xa,
-			INT32	    *xb,
-			INT32	    *ya,
-			INT32	    *yb,
-			RegionPtr   reg,
-			INT32	    width,
-			INT32	    height)
-{
-    Bool	ret;
-    RegionRec	crtc_region_local;
-    RegionPtr	crtc_region = reg;
-    
-    /*
-     * For overlay video, compute the relevant CRTC and
-     * clip video to that
-     */
-    if (crtc_ret)
-    {
-	BoxRec		crtc_box;
-	xf86CrtcPtr	crtc = i830_covering_crtc (pScrn, dst,
-						   pPriv->desired_crtc,
-						   &crtc_box);
-	
-	/* For textured video, we don't actually want to clip at all. */
-	if (crtc && !pPriv->textured)
-	{
-	    REGION_INIT (pScreen, &crtc_region_local, &crtc_box, 1);
-	    crtc_region = &crtc_region_local;
-	    REGION_INTERSECT (pScreen, crtc_region, crtc_region, reg);
+i830_copy_video_data(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv,
+		     short width, short height, int *dstPitch, int *dstPitch2,
+		     int top, int left, int npixels, int nlines,
+		     int id, unsigned char *buf)
+{
+	int srcPitch = 0, srcPitch2 = 0;
+	int size;
+
+	if (is_planar_fourcc(id)) {
+		srcPitch = (width + 0x3) & ~0x3;
+		srcPitch2 = ((width >> 1) + 0x3) & ~0x3;
+	} else {
+		srcPitch = width << 1;
 	}
-	*crtc_ret = crtc;
-    }
-    ret = xf86XVClipVideoHelper (dst, xa, xb, ya, yb, 
-				 crtc_region, width, height);
-    if (crtc_region != reg)
-	REGION_UNINIT (pScreen, &crtc_region_local);
-    return ret;
-}
 
-#if 0
-static void
-i830_fill_colorkey (ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
-{
-   DrawablePtr root = &WindowTable[pScreen->myNum]->drawable;
-   XID	       pval[2];
-   BoxPtr      pbox = REGION_RECTS(clipboxes);
-   int	       i, nbox = REGION_NUM_RECTS(clipboxes);
-   xRectangle  *rects;
-   GCPtr       gc;
-
-   if(!xf86Screens[pScreen->myNum]->vtSema) return;
-
-   gc = GetScratchGC(root->depth, pScreen);
-   pval[0] = key;
-   pval[1] = IncludeInferiors;
-   (void) ChangeGC(gc, GCForeground|GCSubwindowMode, pval);
-   ValidateGC(root, gc);
-
-   rects = xalloc (nbox * sizeof(xRectangle));
-
-   for(i = 0; i < nbox; i++, pbox++) 
-   {
-      rects[i].x = pbox->x1;
-      rects[i].y = pbox->y1;
-      rects[i].width = pbox->x2 - pbox->x1;
-      rects[i].height = pbox->y2 - pbox->y1;
-   }
-   
-   (*gc->ops->PolyFillRect)(root, gc, nbox, rects);
-   
-   xfree (rects);
-   FreeScratchGC (gc);
+	i830_setup_dst_params(scrn, adaptor_priv, width, height, dstPitch,
+				dstPitch2, &size, id);
+
+	if (!i830_setup_video_buffer(scrn, adaptor_priv, size, id, buf))
+		return FALSE;
+
+	/* copy data */
+	if (is_planar_fourcc(id)) {
+		I830CopyPlanarData(adaptor_priv, buf, srcPitch, srcPitch2,
+				   *dstPitch, *dstPitch2,
+				   height, top, left, nlines,
+				   npixels, id);
+	} else {
+		I830CopyPackedData(adaptor_priv, buf, srcPitch, *dstPitch, top, left,
+				   nlines, npixels);
+	}
+
+	return TRUE;
 }
-#endif
 
 /*
  * The source rectangle of the video is defined by (src_x, src_y, src_w, src_h).
@@ -2207,11 +2369,11 @@ i830_fill_colorkey (ScreenPtr pScreen, u
  * (which we always are).
  * clipBoxes is the clipping region in screen space.
  * data is a pointer to our port private.
- * pDraw is a Drawable, which might not be the screen in the case of
+ * drawable is some Drawable, which might not be the screen in the case of
  * compositing.  It's a new argument to the function in the 1.1 server.
  */
 static int
-I830PutImage(ScrnInfoPtr pScrn,
+I830PutImageTextured(ScrnInfoPtr scrn,
 	     short src_x, short src_y,
 	     short drw_x, short drw_y,
 	     short src_w, short src_h,
@@ -2219,739 +2381,305 @@ I830PutImage(ScrnInfoPtr pScrn,
 	     int id, unsigned char *buf,
 	     short width, short height,
 	     Bool sync, RegionPtr clipBoxes, pointer data,
-	     DrawablePtr pDraw)
+	     DrawablePtr drawable)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
-    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-    I830OverlayRegPtr overlay;
-    PixmapPtr pPixmap;
-    INT32 x1, x2, y1, y2;
-    int srcPitch = 0, srcPitch2 = 0, dstPitch, destId;
-    int dstPitch2 = 0;
-    int top, left, npixels, nlines, size;
-    BoxRec dstBox;
-    int pitchAlignMask;
-    int alloc_size;
-    xf86CrtcPtr	crtc;
-
-    if (pPriv->textured)
-	overlay = NULL;
-    else
-	overlay = I830OVERLAYREG(pI830);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
+	PixmapPtr pixmap = get_drawable_pixmap(drawable);
+	int dstPitch, dstPitch2;
+	BoxRec dstBox;
+	xf86CrtcPtr crtc;
+	int top, left, npixels, nlines;
 
 #if 0
-    ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n"
-	   "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x, drw_y,
-	   drw_w, drw_h, width, height);
-#endif
-
-    if (!pPriv->textured) {
-        /* If dst width and height are less than 1/8th the src size, the
-         * src/dst scale factor becomes larger than 8 and doesn't fit in
-         * the scale register. */
-        if(src_w >= (drw_w * 8))
-            drw_w = src_w/7;
-
-        if(src_h >= (drw_h * 8))
-            drw_h = src_h/7;
-    }
-
-    /* Clip */
-    x1 = src_x;
-    x2 = src_x + src_w;
-    y1 = src_y;
-    y2 = src_y + src_h;
-
-    dstBox.x1 = drw_x;
-    dstBox.x2 = drw_x + drw_w;
-    dstBox.y1 = drw_y;
-    dstBox.y2 = drw_y + drw_h;
-
-    if (!i830_clip_video_helper(pScrn, 
-				pPriv,
-				&crtc,
-				&dstBox, &x1, &x2, &y1, &y2, clipBoxes,
-				width, height))
-	return Success;
-
-     if (!pPriv->textured) {
-	 /* texture video handles rotation differently. */
-	if (crtc)
-	    pPriv->rotation = crtc->rotation;
-	else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		    "Fail to clip video to any crtc!\n");
-	    return Success;
-	}
-     }
-
-    destId = id;
-    switch (id) {
-    case FOURCC_YV12:
-    case FOURCC_I420:
-	srcPitch = (width + 0x3) & ~0x3;
-	srcPitch2 = ((width >> 1) + 0x3) & ~0x3;
-	break;
-#ifdef INTEL_XVMC
-    case FOURCC_XVMC:
-	srcPitch = (width + 0x3) & ~0x3;
-	srcPitch2 = ((width >> 1) + 0x3) & ~0x3;
-	break;
-#endif
-    case FOURCC_UYVY:
-    case FOURCC_YUY2:
-    default:
-	srcPitch = width << 1;
-	break;
-    }
-
-    /* Only needs to be DWORD-aligned for textured on i915, but overlay has
-     * stricter requirements.
-     */
-    if (pPriv->textured) {
-	pitchAlignMask = 3;
-#ifdef INTEL_XVMC
-	/* for i915 xvmc, hw requires at least 1kb aligned surface */
-	if ((id == FOURCC_XVMC) && IS_I915(pI830))
-	    pitchAlignMask = 0x3ff;
-#endif
-    } else {
-	if (IS_I965G(pI830))
-	    pitchAlignMask = 255;
-	else
-	    pitchAlignMask = 63;
-    }
+	ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n"
+	       "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x,
+	       drw_y, drw_w, drw_h, width, height);
+#endif
+
+	if (!i830_clip_video_helper(scrn,
+				    adaptor_priv,
+				    &crtc,
+				    &dstBox,
+				    src_x, src_y, drw_x, drw_y,
+				    src_w, src_h, drw_w, drw_h,
+				    id,
+				    &top, &left, &npixels, &nlines, clipBoxes,
+				    width, height))
+		return Success;
+
+	if (xvmc_passthrough(id)) {
+		int size;
+		uint32_t *gem_handle = (uint32_t *)buf;
+
+		i830_free_video_buffers(adaptor_priv);
+
+		i830_setup_dst_params(scrn, adaptor_priv, width, height,
+				&dstPitch, &dstPitch2, &size, id);
+
+		if (IS_I915G(intel) || IS_I915GM(intel)) {
+			/* XXX: i915 is not support and needs some
+			 * serious care.  grep for KMS in i915_hwmc.c */
+			return BadAlloc;
+		}
 
-    /* Determine the desired destination pitch (representing the chroma's pitch,
-     * in the planar case.
-     */
-    switch (destId) {
-    case FOURCC_YV12:
-    case FOURCC_I420:
-	if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-	    dstPitch = ((height / 2) + pitchAlignMask) & ~pitchAlignMask;
-	    size = dstPitch * width * 3;
+		adaptor_priv->buf =
+			drm_intel_bo_gem_create_from_name(intel->bufmgr,
+							  "xvmc surface",
+							  *gem_handle);
 	} else {
-	    dstPitch = ((width / 2) + pitchAlignMask) & ~pitchAlignMask;
-	    size = dstPitch * height * 3;
+		if (!i830_copy_video_data(scrn, adaptor_priv, width, height,
+					  &dstPitch, &dstPitch2,
+					  top, left, npixels, nlines, id, buf))
+			return BadAlloc;
 	}
-	break;
-    case FOURCC_UYVY:
-    case FOURCC_YUY2:
 
-	if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-	    dstPitch = ((height << 1) + pitchAlignMask) & ~pitchAlignMask;
-	    size = dstPitch * width;
-	} else {
-	    dstPitch = ((width << 1) + pitchAlignMask) & ~pitchAlignMask;
-	    size = dstPitch * height;
+	if (crtc && adaptor_priv->SyncToVblank != 0) {
+		i830_wait_for_scanline(scrn, pixmap, crtc, clipBoxes);
 	}
-	break;
-#ifdef INTEL_XVMC
-    case FOURCC_XVMC:
-	dstPitch = ((width / 2) + pitchAlignMask ) & ~pitchAlignMask;
-	dstPitch2 = (width + pitchAlignMask ) & ~pitchAlignMask;
-	size = 0;
-	break;
-#endif
-    default:
-	dstPitch = 0;
-	size = 0;
-	break;
-    }
-#if 0
-    ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, dstPitch, size);
-#endif
-
-    alloc_size = size;
-    if (pPriv->doubleBuffer)
-	alloc_size *= 2;
-
-    /* Free the current buffer if we're going to have to reallocate */
-    if (pPriv->buf && pPriv->buf->size < alloc_size) {
-	if (!pPriv->textured)
-	    drm_intel_bo_unpin(pPriv->buf);
-	drm_intel_bo_unreference(pPriv->buf);
-	pPriv->buf = NULL;
-    }
-
-#ifdef INTEL_XVMC
-    if (id == FOURCC_XVMC && 
-        pPriv->rotation == RR_Rotate_0) {
-        if (pPriv->buf) {
-            assert(pPriv->textured);
-            drm_intel_bo_unreference(pPriv->buf);
-            pPriv->buf = NULL;
-        }
-    } else {
-#endif
-        if (pPriv->buf == NULL) {
-            pPriv->buf = drm_intel_bo_alloc(pI830->bufmgr,
-                                         "xv buffer", alloc_size, 4096);
-            if (pPriv->buf == NULL)
-                return BadAlloc;
-            if (!pPriv->textured && drm_intel_bo_pin(pPriv->buf, 4096) != 0) {
-                drm_intel_bo_unreference(pPriv->buf);
-                pPriv->buf = NULL;
-                xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                           "Failed to pin xv buffer\n");
-                return BadAlloc;
-            }
-        }
-#ifdef INTEL_XVMC
-    }
-#endif
-
-    /* fixup pointers */
-#ifdef INTEL_XVMC
-    if (id == FOURCC_XVMC && IS_I915(pI830)) {
-	pPriv->YBuf0offset = (uint32_t)((uintptr_t)buf);
-	pPriv->VBuf0offset = pPriv->YBuf0offset + (dstPitch2 * height);
-	pPriv->UBuf0offset = pPriv->VBuf0offset + (dstPitch * height / 2);
-	destId = FOURCC_YV12;
-    } else {
-#endif
-	if (pPriv->textured)
-	    pPriv->YBuf0offset = 0;
-	else
-	    pPriv->YBuf0offset = pPriv->buf->offset;
 
-	if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-	    pPriv->UBuf0offset = pPriv->YBuf0offset + (dstPitch * 2 * width);
-	    pPriv->VBuf0offset = pPriv->UBuf0offset + (dstPitch * width / 2);
-	    if(pPriv->doubleBuffer) {
-		pPriv->YBuf1offset = pPriv->YBuf0offset + size;
-		pPriv->UBuf1offset = pPriv->YBuf1offset + (dstPitch * 2 * width);
-		pPriv->VBuf1offset = pPriv->UBuf1offset + (dstPitch * width / 2);
-	    }
+	if (IS_I965G(intel)) {
+		I965DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes,
+					 width, height, dstPitch, dstPitch2,
+					 src_w, src_h,
+					 drw_w, drw_h, pixmap);
 	} else {
-	    pPriv->UBuf0offset = pPriv->YBuf0offset + (dstPitch * 2 * height);
-	    pPriv->VBuf0offset = pPriv->UBuf0offset + (dstPitch * height / 2);
-	    if(pPriv->doubleBuffer) {
-		pPriv->YBuf1offset = pPriv->YBuf0offset + size;
-		pPriv->UBuf1offset = pPriv->YBuf1offset + (dstPitch * 2 * height);
-		pPriv->VBuf1offset = pPriv->UBuf1offset + (dstPitch * height / 2);
-	    }
+		I915DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes,
+					 width, height, dstPitch, dstPitch2,
+					 src_w, src_h, drw_w, drw_h,
+					 pixmap);
 	}
-#ifdef INTEL_XVMC
-    }
-#endif
 
-    /* Pick the idle buffer */
-    if (!pPriv->textured && pI830->overlayOn && pPriv->doubleBuffer)
-	pPriv->currentBuf = !((INREG(DOVSTA) & OC_BUF) >> 20);
-
-    /* copy data */
-    top = y1 >> 16;
-    left = (x1 >> 16) & ~1;
-    npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
-
-    switch (id) {
-    case FOURCC_YV12:
-    case FOURCC_I420:
-	top &= ~1;
-	nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
-	I830CopyPlanarData(pScrn, pPriv, buf, srcPitch, srcPitch2, dstPitch,
-	    	       height, top, left, nlines, npixels, id);
-	break;
-    case FOURCC_UYVY:
-    case FOURCC_YUY2:
-	nlines = ((y2 + 0xffff) >> 16) - top;
-	I830CopyPackedData(pScrn, pPriv, buf, srcPitch, dstPitch, top, left,
-			   nlines, npixels);
-	break;
-#ifdef INTEL_XVMC
-    case FOURCC_XVMC:
-	if (pPriv->rotation != RR_Rotate_0) {
-	    top &= ~1;
-	    nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
-	    I830CopyPlanarData(pScrn, pPriv, buf, srcPitch, srcPitch2, dstPitch,
-		    height, top, left, nlines, npixels, id);
-	}
+	DamageDamageRegion(drawable, clipBoxes);
 
-	break;
-#endif
-    default:
-	break;
-    }
+	return Success;
+}
 
-    if (pDraw->type == DRAWABLE_WINDOW) {
-	pPixmap = (*pScreen->GetWindowPixmap)((WindowPtr)pDraw);
-    } else {
-	pPixmap = (PixmapPtr)pDraw;
-    }
+static int
+I830PutImageOverlay(ScrnInfoPtr scrn,
+	     short src_x, short src_y,
+	     short drw_x, short drw_y,
+	     short src_w, short src_h,
+	     short drw_w, short drw_h,
+	     int id, unsigned char *buf,
+	     short width, short height,
+	     Bool sync, RegionPtr clipBoxes, pointer data,
+	     DrawablePtr drawable)
+{
+	intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
+	int dstPitch, dstPitch2;
+	BoxRec dstBox;
+	xf86CrtcPtr crtc;
+	int top, left, npixels, nlines;
 
-#ifdef I830_USE_EXA
-    if (pPriv->textured && pI830->accel == ACCEL_EXA) {
-	/* Force the pixmap into framebuffer so we can draw to it. */
-	exaMoveInPixmap(pPixmap);
-    }
+#if 0
+	ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n" "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x,
+	       drw_y, drw_w, drw_h, width, height);
 #endif
 
-    if (pPriv->textured && pI830->accel <= ACCEL_XAA &&
-	    (((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
-	     ((char *)pPixmap->devPrivate.ptr >= (char *)pI830->FbBase +
-	      pI830->FbMapSize))) {
-	/* If the pixmap wasn't in framebuffer, then we have no way in XAA to
-	 * force it there.  So, we simply refuse to draw and fail.
-	 */
-	return BadAlloc;
-    }
+	/* If dst width and height are less than 1/8th the src size, the
+	 * src/dst scale factor becomes larger than 8 and doesn't fit in
+	 * the scale register. */
+	if (src_w >= (drw_w * 8))
+		drw_w = src_w / 7;
+
+	if (src_h >= (drw_h * 8))
+		drw_h = src_h / 7;
+
+	if (!i830_clip_video_helper(scrn,
+				    adaptor_priv,
+				    &crtc,
+				    &dstBox,
+				    src_x, src_y, drw_x, drw_y,
+				    src_w, src_h, drw_w, drw_h,
+				    id,
+				    &top, &left, &npixels, &nlines, clipBoxes,
+				    width, height))
+		return Success;
 
-    if (!pPriv->textured) {
-	i830_display_video(pScrn, crtc, destId, width, height, dstPitch,
-			   x1, y1, x2, y2, &dstBox, src_w, src_h,
-			   drw_w, drw_h);
-	
-	/* update cliplist */
-	if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
-	    REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
-#if 0
-	    i830_fill_colorkey (pScreen, pPriv->colorKey, clipBoxes);
-#else
-            xf86XVFillKeyHelperDrawable(pDraw,
-					pPriv->colorKey,
-					clipBoxes);
-#endif
+	/* overlay can't handle rotation natively, store it for the copy func */
+	if (crtc)
+		adaptor_priv->rotation = crtc->rotation;
+	else {
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+			   "Fail to clip video to any crtc!\n");
+		return Success;
 	}
-    } else {
-        Bool sync = TRUE;
-        
-        if (crtc == NULL) {
-            sync = FALSE;
-        } else if (pPriv->SyncToVblank == 0) {
-            sync = FALSE;
-        }
-
-        if (sync) {
-	    BoxPtr box;
-	    int y1, y2;
-            int event, pipe;
-	    I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-
-	    if (intel_crtc->pipe == 0) {
-		event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
-		pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEA;
-	    } else {
-		event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
-		pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEB;
-	    }
 
-	    box = REGION_EXTENTS(unused, clipBoxes);
-	    y1 = box->y1 - crtc->y;
-	    y2 = box->y2 - crtc->y;
-
-            BEGIN_BATCH(5);
-	    /* The documentation says that the LOAD_SCAN_LINES command
-	     * always comes in pairs. Don't ask me why. */
-	    OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | pipe);
-	    OUT_BATCH((y1 << 16) | y2);
-	    OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | pipe);
-	    OUT_BATCH((y1 << 16) | y2);
-            OUT_BATCH(MI_WAIT_FOR_EVENT | event);
-            ADVANCE_BATCH();
-        }
+	if (!i830_copy_video_data(scrn, adaptor_priv, width, height,
+				  &dstPitch, &dstPitch2,
+				  top, left, npixels, nlines, id, buf))
+		return BadAlloc;
+
+	if (!i830_display_overlay
+	    (scrn, crtc, id, width, height, dstPitch, dstPitch2,
+	     &dstBox, src_w, src_h, drw_w, drw_h))
+		return BadAlloc;
 
-        if (IS_I965G(pI830)) {
-#ifdef INTEL_XVMC
-            if (id == FOURCC_XVMC && pPriv->rotation == RR_Rotate_0) {
-                pPriv->YBuf0offset = buf -  pI830->FbBase;
-                pPriv->UBuf0offset = pPriv->YBuf0offset + height*width; 
-                pPriv->VBuf0offset = pPriv->UBuf0offset + height*width/4; 
-            }
-#endif
-            I965DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height,
-                                     dstPitch, x1, y1, x2, y2,
-                                     src_w, src_h, drw_w, drw_h, pPixmap);
-        } else {
-            I915DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height,
-                                     dstPitch, dstPitch2, x1, y1, x2, y2,
-                                     src_w, src_h, drw_w, drw_h, pPixmap);
-        }
-    }
-    if (pPriv->textured) {
-	DamageDamageRegion(pDraw, clipBoxes);
-    }
+	/* update cliplist */
+	if (!REGION_EQUAL(scrn->pScreen, &adaptor_priv->clip, clipBoxes)) {
+		REGION_COPY(scrn->pScreen, &adaptor_priv->clip, clipBoxes);
+		xf86XVFillKeyHelperDrawable(drawable,
+					    adaptor_priv->colorKey,
+					    clipBoxes);
+	}
 
-    pPriv->videoStatus = CLIENT_VIDEO_ON;
+	adaptor_priv->videoStatus = CLIENT_VIDEO_ON;
 
-    return Success;
+	return Success;
 }
 
 static int
-I830QueryImageAttributes(ScrnInfoPtr pScrn,
+I830QueryImageAttributes(ScrnInfoPtr scrn,
 			 int id,
 			 unsigned short *w, unsigned short *h,
-			 int *pitches, int *offsets, Bool textured)
+			 int *pitches, int *offsets)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int size, tmp;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int size, tmp;
 
 #if 0
-    ErrorF("I830QueryImageAttributes: w is %d, h is %d\n", *w, *h);
+	ErrorF("I830QueryImageAttributes: w is %d, h is %d\n", *w, *h);
 #endif
 
-    if (IS_845G(pI830) || IS_I830(pI830)) {
-	if (*w > IMAGE_MAX_WIDTH_LEGACY)
-	    *w = IMAGE_MAX_WIDTH_LEGACY;
-	if (*h > IMAGE_MAX_HEIGHT_LEGACY)
-	    *h = IMAGE_MAX_HEIGHT_LEGACY;
-    } else {
-	if (*w > IMAGE_MAX_WIDTH)
-	    *w = IMAGE_MAX_WIDTH;
-	if (*h > IMAGE_MAX_HEIGHT)
-	    *h = IMAGE_MAX_HEIGHT;
-    }
-
-    *w = (*w + 1) & ~1;
-    if (offsets)
-	offsets[0] = 0;
-
-    switch (id) {
-	/* IA44 is for XvMC only */
-    case FOURCC_IA44:
-    case FOURCC_AI44:
-	if (pitches)
-	    pitches[0] = *w;
-	size = *w * *h;
-	break;
-    case FOURCC_YV12:
-    case FOURCC_I420:
-	*h = (*h + 1) & ~1;
-	size = (*w + 3) & ~3;
-	if (pitches)
-	    pitches[0] = size;
-	size *= *h;
-	if (offsets)
-	    offsets[1] = size;
-	tmp = ((*w >> 1) + 3) & ~3;
-	if (pitches)
-	    pitches[1] = pitches[2] = tmp;
-	tmp *= (*h >> 1);
-	size += tmp;
+	if (IS_845G(intel) || IS_I830(intel)) {
+		if (*w > IMAGE_MAX_WIDTH_LEGACY)
+			*w = IMAGE_MAX_WIDTH_LEGACY;
+		if (*h > IMAGE_MAX_HEIGHT_LEGACY)
+			*h = IMAGE_MAX_HEIGHT_LEGACY;
+	} else {
+		if (*w > IMAGE_MAX_WIDTH)
+			*w = IMAGE_MAX_WIDTH;
+		if (*h > IMAGE_MAX_HEIGHT)
+			*h = IMAGE_MAX_HEIGHT;
+	}
+
+	*w = (*w + 1) & ~1;
 	if (offsets)
-	    offsets[2] = size;
-	size += tmp;
+		offsets[0] = 0;
+
+	switch (id) {
+		/* IA44 is for XvMC only */
+	case FOURCC_IA44:
+	case FOURCC_AI44:
+		if (pitches)
+			pitches[0] = *w;
+		size = *w * *h;
+		break;
+	case FOURCC_YV12:
+	case FOURCC_I420:
+		*h = (*h + 1) & ~1;
+		size = (*w + 3) & ~3;
+		if (pitches)
+			pitches[0] = size;
+		size *= *h;
+		if (offsets)
+			offsets[1] = size;
+		tmp = ((*w >> 1) + 3) & ~3;
+		if (pitches)
+			pitches[1] = pitches[2] = tmp;
+		tmp *= (*h >> 1);
+		size += tmp;
+		if (offsets)
+			offsets[2] = size;
+		size += tmp;
 #if 0
-	if (pitches)
-	    ErrorF("pitch 0 is %d, pitch 1 is %d, pitch 2 is %d\n", pitches[0],
-		   pitches[1], pitches[2]);
-	if (offsets)
-	    ErrorF("offset 1 is %d, offset 2 is %d\n", offsets[1], offsets[2]);
-	if (offsets)
-	    ErrorF("size is %d\n", size);
+		if (pitches)
+			ErrorF("pitch 0 is %d, pitch 1 is %d, pitch 2 is %d\n",
+			       pitches[0], pitches[1], pitches[2]);
+		if (offsets)
+			ErrorF("offset 1 is %d, offset 2 is %d\n", offsets[1],
+			       offsets[2]);
+		if (offsets)
+			ErrorF("size is %d\n", size);
 #endif
-	break;
+		break;
 #ifdef INTEL_XVMC
-    case FOURCC_XVMC:
-        *h = (*h + 1) & ~1;
-        size = sizeof(struct intel_xvmc_command);
-        if (pitches)
-            pitches[0] = size;
-        break;
+	case FOURCC_XVMC:
+		*h = (*h + 1) & ~1;
+		size = sizeof(struct intel_xvmc_command);
+		if (pitches)
+			pitches[0] = size;
+		break;
 #endif
-    case FOURCC_UYVY:
-    case FOURCC_YUY2:
-    default:
-	size = *w << 1;
-	if (pitches)
-	    pitches[0] = size;
-	size *= *h;
-	break;
-    }
-
-    return size;
-}
-
-static int
-I830QueryImageAttributesOverlay(ScrnInfoPtr pScrn,
-				int id,
-				unsigned short *w, unsigned short *h,
-				int *pitches, int *offsets)
-{
-    return I830QueryImageAttributes(pScrn, id, w, h, pitches, offsets, FALSE);
-}
+	case FOURCC_UYVY:
+	case FOURCC_YUY2:
+	default:
+		size = *w << 1;
+		if (pitches)
+			pitches[0] = size;
+		size *= *h;
+		break;
+	}
 
-static int
-I830QueryImageAttributesTextured(ScrnInfoPtr pScrn,
-				 int id,
-				 unsigned short *w, unsigned short *h,
-				 int *pitches, int *offsets)
-{
-    return I830QueryImageAttributes(pScrn, id, w, h, pitches, offsets, TRUE);
+	return size;
 }
 
 void
 I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
 		      pointer pReadmask)
 {
-    ScrnInfoPtr pScrn = xf86Screens[i];
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pPriv;
+	ScrnInfoPtr scrn = xf86Screens[i];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	intel_adaptor_private *adaptor_priv;
 
-    /* no overlay */
-    if (pI830->adaptor == NULL)
-        return;
+	/* no overlay */
+	if (intel->adaptor == NULL)
+		return;
 
-    pPriv = GET_PORT_PRIVATE(pScrn);
+	adaptor_priv = intel_get_adaptor_private(scrn);
 
-    if (pPriv->videoStatus & TIMER_MASK) {
+	if (adaptor_priv->videoStatus & TIMER_MASK) {
 #if 1
-	Time now = currentTime.milliseconds;
+		Time now = currentTime.milliseconds;
 #else
-	UpdateCurrentTime();
+		UpdateCurrentTime();
 #endif
-	if (pPriv->videoStatus & OFF_TIMER) {
-	    if (pPriv->offTime < now) {
-		/* Turn off the overlay */
-		OVERLAY_DEBUG("BLOCKHANDLER\n");
-
-		i830_overlay_off (pScrn);
-
-		pPriv->videoStatus = FREE_TIMER;
-		pPriv->freeTime = now + FREE_DELAY;
-	    }
-	} else {				/* FREE_TIMER */
-	    if (pPriv->freeTime < now) {
-		if (!pPriv->textured)
-		    drm_intel_bo_unpin(pPriv->buf);
-		drm_intel_bo_unreference(pPriv->buf);
-		pPriv->buf = NULL;
-		pPriv->videoStatus = 0;
-	    }
+		if (adaptor_priv->videoStatus & OFF_TIMER) {
+			if (adaptor_priv->offTime < now) {
+				/* Turn off the overlay */
+				OVERLAY_DEBUG("BLOCKHANDLER\n");
+
+				ums_overlay_off (scrn);
+
+				adaptor_priv->videoStatus = FREE_TIMER;
+				adaptor_priv->freeTime = now + FREE_DELAY;
+			    }
+		} else {				/* FREE_TIMER */
+			if (adaptor_priv->freeTime < now) {
+				i830_free_video_buffers(adaptor_priv);
+				adaptor_priv->videoStatus = 0;
+			}
+		}
 	}
-    }
-}
-
-/***************************************************************************
- * Offscreen Images
- ***************************************************************************/
-
-typedef struct {
-    Bool isOn;
-} OffscreenPrivRec, *OffscreenPrivPtr;
-
-static int
-I830AllocateSurface(ScrnInfoPtr pScrn,
-		    int id,
-		    unsigned short w,
-		    unsigned short h, XF86SurfacePtr surface)
-{
-    int pitch, fbpitch, size;
-    OffscreenPrivPtr pPriv;
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    OVERLAY_DEBUG("I830AllocateSurface\n");
-
-    if (IS_845G(pI830) || IS_I830(pI830)) {
-	if ((w > IMAGE_MAX_WIDTH_LEGACY) || (h > IMAGE_MAX_HEIGHT_LEGACY))
-	    return BadAlloc;
-    } else {
-	if ((w > IMAGE_MAX_WIDTH) || (h > IMAGE_MAX_HEIGHT))
-	    return BadAlloc;
-    }
-
-    /* What to do when rotated ?? */
-    if (pI830->rotation != RR_Rotate_0)
-	return BadAlloc;
-
-    if (!(surface->pitches = xalloc(sizeof(int))))
-	return BadAlloc;
-    if (!(surface->offsets = xalloc(sizeof(int)))) {
-	xfree(surface->pitches);
-	return BadAlloc;
-    }
-    if (!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
-	xfree(surface->pitches);
-	xfree(surface->offsets);
-	return BadAlloc;
-    }
-
-    w = (w + 1) & ~1;
-    pitch = ((w << 1) + 15) & ~15;
-    fbpitch = pI830->cpp * pScrn->displayWidth;
-    size = pitch * h;
-
-    surface->width = w;
-    surface->height = h;
-
-    pPriv->isOn = FALSE;
-
-    surface->pScrn = pScrn;
-    surface->id = id;
-    surface->pitches[0] = pitch;
-    surface->offsets[0] = 0;
-    surface->devPrivate.ptr = (pointer) pPriv;
-
-    return Success;
-}
-
-static int
-I830StopSurface(XF86SurfacePtr surface)
-{
-    OffscreenPrivPtr pPriv = (OffscreenPrivPtr) surface->devPrivate.ptr;
-    ScrnInfoPtr pScrn = surface->pScrn;
-
-    if (pPriv->isOn) {
-	OVERLAY_DEBUG("StopSurface\n");
-
-	i830_overlay_off (pScrn);
-
-	pPriv->isOn = FALSE;
-    }
-
-    return Success;
-}
-
-static int
-I830FreeSurface(XF86SurfacePtr surface)
-{
-    I830StopSurface(surface);
-    xfree(surface->pitches);
-    xfree(surface->offsets);
-    xfree(surface->devPrivate.ptr);
-
-    return Success;
-}
-
-static int
-I830GetSurfaceAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 * value)
-{
-    return I830GetPortAttribute(pScrn, attribute, value, NULL);
-}
-
-static int
-I830SetSurfaceAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 value)
-{
-    return I830SetPortAttribute(pScrn, attribute, value, NULL);
-}
-
-static int
-I830DisplaySurface(XF86SurfacePtr surface,
-		   short src_x, short src_y,
-		   short drw_x, short drw_y,
-		   short src_w, short src_h,
-		   short drw_w, short drw_h, RegionPtr clipBoxes)
-{
-    OffscreenPrivPtr pPriv = (OffscreenPrivPtr) surface->devPrivate.ptr;
-    ScrnInfoPtr pScrn = surface->pScrn;
-    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pI830Priv = GET_PORT_PRIVATE(pScrn);
-    INT32 x1, y1, x2, y2;
-    BoxRec dstBox;
-    xf86CrtcPtr crtc;
-
-    OVERLAY_DEBUG("I830DisplaySurface\n");
-
-    x1 = src_x;
-    x2 = src_x + src_w;
-    y1 = src_y;
-    y2 = src_y + src_h;
-
-    dstBox.x1 = drw_x;
-    dstBox.x2 = drw_x + drw_w;
-    dstBox.y1 = drw_y;
-    dstBox.y2 = drw_y + drw_h;
-
-    if (!i830_clip_video_helper (pScrn, pI830Priv, &crtc, &dstBox,
-				 &x1, &x2, &y1, &y2, clipBoxes,
-				 surface->width, surface->height))
-	return Success;
-
-    /* fixup pointers */
-    pI830Priv->YBuf0offset = surface->offsets[0];
-    pI830Priv->YBuf1offset = pI830Priv->YBuf0offset;
-
-    /* Pick the idle buffer */
-    if (!pI830Priv->textured && pI830->overlayOn && pI830Priv->doubleBuffer)
-	pI830Priv->currentBuf = !((INREG(DOVSTA) & OC_BUF) >> 20);
-
-    i830_display_video(pScrn, crtc, surface->id, surface->width, surface->height,
-		     surface->pitches[0], x1, y1, x2, y2, &dstBox,
-		     src_w, src_h, drw_w, drw_h);
-
-#if 0
-#if 0
-    i830_fill_colorkey (pScreen, pI830Priv->colorKey, clipBoxes);
-#else
-    xf86XVFillKeyHelperDrawable(drawable,
-				pI830Priv->colorKey,
-				clipBoxes);
-#endif
-#endif
-
-    pPriv->isOn = TRUE;
-    /* we've prempted the XvImage stream so set its free timer */
-    if (pI830Priv->videoStatus & CLIENT_VIDEO_ON) {
-	REGION_EMPTY(pScrn->pScreen, &pI830Priv->clip);
-	UpdateCurrentTime();
-	pI830Priv->videoStatus = FREE_TIMER;
-	pI830Priv->freeTime = currentTime.milliseconds + FREE_DELAY;
-    }
-
-    return Success;
-}
-
-static void
-I830InitOffscreenImages(ScreenPtr pScreen)
-{
-    XF86OffscreenImagePtr offscreenImages;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-
-    /* need to free this someplace */
-    if (!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) {
-	return;
-    }
-
-    offscreenImages[0].image = &Images[0];
-    offscreenImages[0].flags = VIDEO_OVERLAID_IMAGES /*| VIDEO_CLIP_TO_VIEWPORT*/;
-    offscreenImages[0].alloc_surface = I830AllocateSurface;
-    offscreenImages[0].free_surface = I830FreeSurface;
-    offscreenImages[0].display = I830DisplaySurface;
-    offscreenImages[0].stop = I830StopSurface;
-    offscreenImages[0].setAttribute = I830SetSurfaceAttribute;
-    offscreenImages[0].getAttribute = I830GetSurfaceAttribute;
-    if (IS_845G(pI830) || IS_I830(pI830)) {
-	offscreenImages[0].max_width = IMAGE_MAX_WIDTH_LEGACY;
-	offscreenImages[0].max_height = IMAGE_MAX_HEIGHT_LEGACY;
-    } else {
-	offscreenImages[0].max_width = IMAGE_MAX_WIDTH;
-	offscreenImages[0].max_height = IMAGE_MAX_HEIGHT; 
-    }
-    offscreenImages[0].num_attributes = 1;
-    offscreenImages[0].attributes = Attributes;
-
-    xf86XVRegisterOffscreenImages(pScreen, offscreenImages, 1);
 }
 
 void
 i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on)
 {
-    ScrnInfoPtr pScrn = crtc->scrn;
-    I830Ptr pI830 = I830PTR(pScrn);
-    I830PortPrivPtr pPriv;
-
-    /* no overlay */
-    if (pI830->adaptor == NULL)
-	return;
-
-    pPriv = GET_PORT_PRIVATE(pScrn);
-
-    if (crtc != pPriv->current_crtc)
-	return;
-
-    /* Check if it's the crtc the overlay is off */
-    if (!on) {
-	/* We stop the video when mode switching, so we don't lock up
-	 * the engine. The overlayOK will determine whether we can re-enable
-	 * with the current video on completion of the mode switch.
-	 */
-	I830StopVideo(pScrn, pPriv, TRUE);
-	pPriv->current_crtc = NULL;
-	pPriv->overlayOK = FALSE;
-	pPriv->oneLineMode = FALSE;
-    }
+	ScrnInfoPtr scrn = crtc->scrn;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	intel_adaptor_private *adaptor_priv;
+
+	/* no overlay */
+	if (intel->adaptor == NULL)
+		return;
+
+	adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
+
+	if (crtc != adaptor_priv->current_crtc)
+		return;
+
+	/* Check if it's the crtc the overlay is off */
+	if (!on) {
+		/* We stop the video when mode switching, so we don't lock up
+		 * the engine. The overlayOK will determine whether we can
+		 * re-enable with the current video on completion of the mode
+		 * switch.
+		 */
+		I830StopVideo(scrn, adaptor_priv, TRUE);
+		adaptor_priv->current_crtc = NULL;
+		adaptor_priv->overlayOK = FALSE;
+		adaptor_priv->oneLineMode = FALSE;
+	}
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.h new/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i830_video.h	2011-02-08 11:14:00.000000000 +0100
@@ -28,66 +28,66 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
 #include "xf86_OSproc.h"
 
 typedef struct {
-   uint32_t YBuf0offset;
-   uint32_t UBuf0offset;
-   uint32_t VBuf0offset;
-
-   uint32_t YBuf1offset;
-   uint32_t UBuf1offset;
-   uint32_t VBuf1offset;
-
-   unsigned char currentBuf;
-
-   int brightness;
-   int contrast;
-   int saturation;
-   xf86CrtcPtr current_crtc;
-   xf86CrtcPtr desired_crtc;
-   int doubleBuffer;
-
-   RegionRec clip;
-   uint32_t colorKey;
-
-   uint32_t gamma0;
-   uint32_t gamma1;
-   uint32_t gamma2;
-   uint32_t gamma3;
-   uint32_t gamma4;
-   uint32_t gamma5;
-
-   uint32_t videoStatus;
-   Time offTime;
-   Time freeTime;
-   drm_intel_bo *buf; /** YUV data buffer */
-
-   Bool overlayOK;
-   int oneLineMode;
-   int scaleRatio;
-   Bool textured;
-   Rotation rotation; /* should remove I830->rotation later*/
+	uint32_t YBufOffset;
+	uint32_t UBufOffset;
+	uint32_t VBufOffset;
+
+	int brightness;
+	int contrast;
+	int saturation;
+	xf86CrtcPtr current_crtc;
+	xf86CrtcPtr desired_crtc;
+
+	RegionRec clip;
+	uint32_t colorKey;
+
+	uint32_t gamma0;
+	uint32_t gamma1;
+	uint32_t gamma2;
+	uint32_t gamma3;
+	uint32_t gamma4;
+	uint32_t gamma5;
+
+	/* only used by the overlay */
+	uint32_t videoStatus;
+	Time offTime;
+	Time freeTime;
+   /** YUV data buffers */
+	drm_intel_bo *buf;	/* current buffer to draw into */
+	drm_intel_bo *oldBuf;	/* old buffer, may be in use by the overlay hw */
+	Bool oldBuf_pinned;	/* only actually pinned when in use by the overlay hw */
+
+	Bool overlayOK;
+	int oneLineMode;
+	int scaleRatio;
+	Bool textured;
+	Rotation rotation;	/* should remove intel->rotation later */
+
+	int SyncToVblank;	/* -1: auto, 0: off, 1: on */
+} intel_adaptor_private;
+
+static inline intel_adaptor_private *
+intel_get_adaptor_private(ScrnInfoPtr scrn)
+{
+	return intel_get_screen_private(scrn)->adaptor->pPortPrivates[0].ptr;
+}
 
-   int SyncToVblank; /* -1: auto, 0: off, 1: on */
-} I830PortPrivRec, *I830PortPrivPtr;
-
-#define GET_PORT_PRIVATE(pScrn) \
-   (I830PortPrivPtr)((I830PTR(pScrn))->adaptor->pPortPrivates[0].ptr)
-
-void I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+void I915DisplayVideoTextured(ScrnInfoPtr scrn,
+			      intel_adaptor_private *adaptor_priv,
 			      int id, RegionPtr dstRegion, short width,
 			      short height, int video_pitch, int video_pitch2,
-			      int x1, int y1, int x2, int y2,
 			      short src_w, short src_h,
-			      short drw_w, short drw_h,
-			      PixmapPtr pPixmap);
+			      short drw_w, short drw_h, PixmapPtr pixmap);
 
-void I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+void I965DisplayVideoTextured(ScrnInfoPtr scrn,
+			      intel_adaptor_private *adaptor_priv,
 			      int id, RegionPtr dstRegion, short width,
-			      short height, int video_pitch,
-			      int x1, int y1, int x2, int y2,
+			      short height, int video_pitch, int video_pitch2,
 			      short src_w, short src_h,
-			      short drw_w, short drw_h,
-			      PixmapPtr pPixmap);
+			      short drw_w, short drw_h, PixmapPtr pixmap);
 
 void I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
 			   pointer pReadmask);
 void i965_free_video(ScrnInfoPtr scrn);
+
+int is_planar_fourcc(int id);
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.c new/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.c	2008-08-02 07:12:38.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.c	2011-02-08 11:14:00.000000000 +0100
@@ -34,78 +34,79 @@
 
 #include "i915_reg.h"
 
-void I915EmitInvarientState( ScrnInfoPtr pScrn )
+void I915EmitInvarientState(ScrnInfoPtr scrn)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-   BEGIN_BATCH(24);
+	assert(intel->in_batch_atomic);
 
-   OUT_BATCH(_3DSTATE_AA_CMD |
-	     AA_LINE_ECAAR_WIDTH_ENABLE |
-	     AA_LINE_ECAAR_WIDTH_1_0 |
-	     AA_LINE_REGION_WIDTH_ENABLE |
-	     AA_LINE_REGION_WIDTH_1_0);
-
-   /* Disable independent alpha blend */
-   OUT_BATCH(_3DSTATE_INDEPENDENT_ALPHA_BLEND_CMD |
-	     IAB_MODIFY_ENABLE |
-	     IAB_MODIFY_FUNC | (BLENDFUNC_ADD << IAB_FUNC_SHIFT) |
-	     IAB_MODIFY_SRC_FACTOR | (BLENDFACT_ONE << IAB_SRC_FACTOR_SHIFT) |
-	     IAB_MODIFY_DST_FACTOR | (BLENDFACT_ZERO << IAB_DST_FACTOR_SHIFT));
-
-   OUT_BATCH(_3DSTATE_DFLT_DIFFUSE_CMD);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_DFLT_SPEC_CMD);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_DFLT_Z_CMD);
-   OUT_BATCH(0);
-
-   /* Don't support texture crossbar yet */
-   OUT_BATCH(_3DSTATE_COORD_SET_BINDINGS |
-	     CSB_TCB(0, 0) |
-	     CSB_TCB(1, 1) |
-	     CSB_TCB(2, 2) |
-	     CSB_TCB(3, 3) |
-	     CSB_TCB(4, 4) |
-	     CSB_TCB(5, 5) |
-	     CSB_TCB(6, 6) |
-	     CSB_TCB(7, 7));
-
-   OUT_BATCH(_3DSTATE_RASTER_RULES_CMD |
-	     ENABLE_POINT_RASTER_RULE |
-	     OGL_POINT_RASTER_RULE |
-	     ENABLE_LINE_STRIP_PROVOKE_VRTX |
-	     ENABLE_TRI_FAN_PROVOKE_VRTX |
-	     LINE_STRIP_PROVOKE_VRTX(1) |
-	     TRI_FAN_PROVOKE_VRTX(2) | 
-	     ENABLE_TEXKILL_3D_4D |
-	     TEXKILL_4D);
-
-   OUT_BATCH(_3DSTATE_MODES_4_CMD |
-	     ENABLE_LOGIC_OP_FUNC | LOGIC_OP_FUNC(LOGICOP_COPY) |
-	     ENABLE_STENCIL_WRITE_MASK | STENCIL_WRITE_MASK(0xff) |
-	     ENABLE_STENCIL_TEST_MASK | STENCIL_TEST_MASK(0xff));
-
-   OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(3) | 0);
-   OUT_BATCH(0x00000000);	/* Disable texture coordinate wrap-shortest */
-
-   OUT_BATCH(_3DSTATE_SCISSOR_ENABLE_CMD | DISABLE_SCISSOR_RECT);
-   OUT_BATCH(_3DSTATE_SCISSOR_RECT_0_CMD);
-   OUT_BATCH(0);
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_DEPTH_SUBRECT_DISABLE);
-
-   OUT_BATCH(_3DSTATE_LOAD_INDIRECT | 0); /* disable indirect state */
-   OUT_BATCH(0);
-
-   OUT_BATCH(_3DSTATE_STIPPLE);
-   OUT_BATCH(0x00000000);
-
-   OUT_BATCH(_3DSTATE_BACKFACE_STENCIL_OPS | BFO_ENABLE_STENCIL_TWO_SIDE | 0 );
-   OUT_BATCH(MI_NOOP);
-
-   ADVANCE_BATCH();
+	OUT_BATCH(_3DSTATE_AA_CMD |
+		  AA_LINE_ECAAR_WIDTH_ENABLE |
+		  AA_LINE_ECAAR_WIDTH_1_0 |
+		  AA_LINE_REGION_WIDTH_ENABLE | AA_LINE_REGION_WIDTH_1_0);
+
+	/* Disable independent alpha blend */
+	OUT_BATCH(_3DSTATE_INDEPENDENT_ALPHA_BLEND_CMD |
+		  IAB_MODIFY_ENABLE |
+		  IAB_MODIFY_FUNC | (BLENDFUNC_ADD << IAB_FUNC_SHIFT) |
+		  IAB_MODIFY_SRC_FACTOR | (BLENDFACT_ONE <<
+					   IAB_SRC_FACTOR_SHIFT) |
+		  IAB_MODIFY_DST_FACTOR | (BLENDFACT_ZERO <<
+					   IAB_DST_FACTOR_SHIFT));
+
+	OUT_BATCH(_3DSTATE_DFLT_DIFFUSE_CMD);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_DFLT_SPEC_CMD);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_DFLT_Z_CMD);
+	OUT_BATCH(0);
+
+	/* Don't support texture crossbar yet */
+	OUT_BATCH(_3DSTATE_COORD_SET_BINDINGS |
+		  CSB_TCB(0, 0) |
+		  CSB_TCB(1, 1) |
+		  CSB_TCB(2, 2) |
+		  CSB_TCB(3, 3) |
+		  CSB_TCB(4, 4) |
+		  CSB_TCB(5, 5) | CSB_TCB(6, 6) | CSB_TCB(7, 7));
+
+	OUT_BATCH(_3DSTATE_RASTER_RULES_CMD |
+		  ENABLE_POINT_RASTER_RULE |
+		  OGL_POINT_RASTER_RULE |
+		  ENABLE_LINE_STRIP_PROVOKE_VRTX |
+		  ENABLE_TRI_FAN_PROVOKE_VRTX |
+		  LINE_STRIP_PROVOKE_VRTX(1) |
+		  TRI_FAN_PROVOKE_VRTX(2) | ENABLE_TEXKILL_3D_4D | TEXKILL_4D);
+
+	OUT_BATCH(_3DSTATE_MODES_4_CMD |
+		  ENABLE_LOGIC_OP_FUNC | LOGIC_OP_FUNC(LOGICOP_COPY) |
+		  ENABLE_STENCIL_WRITE_MASK | STENCIL_WRITE_MASK(0xff) |
+		  ENABLE_STENCIL_TEST_MASK | STENCIL_TEST_MASK(0xff));
+
+	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(3) | I1_LOAD_S(4) | I1_LOAD_S(5) | 2);
+	OUT_BATCH(0x00000000);	/* Disable texture coordinate wrap-shortest */
+	OUT_BATCH((1 << S4_POINT_WIDTH_SHIFT) |
+		  S4_LINE_WIDTH_ONE |
+		  S4_CULLMODE_NONE |
+		  S4_VFMT_XY);
+	OUT_BATCH(0x00000000);	/* Stencil. */
+
+	OUT_BATCH(_3DSTATE_SCISSOR_ENABLE_CMD | DISABLE_SCISSOR_RECT);
+	OUT_BATCH(_3DSTATE_SCISSOR_RECT_0_CMD);
+	OUT_BATCH(0);
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_DEPTH_SUBRECT_DISABLE);
+
+	OUT_BATCH(_3DSTATE_LOAD_INDIRECT | 0);	/* disable indirect state */
+	OUT_BATCH(0);
+
+	OUT_BATCH(_3DSTATE_STIPPLE);
+	OUT_BATCH(0x00000000);
+
+	OUT_BATCH(_3DSTATE_BACKFACE_STENCIL_OPS | BFO_ENABLE_STENCIL_TWO_SIDE |
+		  0);
+	OUT_BATCH(MI_NOOP);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.h new/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.h	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.h	2011-02-08 11:14:00.000000000 +0100
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 4 -*- */
 /*
- * Copyright © 2006 Intel Corporation
+ * Copyright © 2006,2010 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,9 +23,213 @@
  *
  * Authors:
  *    Eric Anholt <eric@anholt.net>
+ *    Chris Wilson <chris@chris-wilson.co.uk>
  *
  */
 
+/* Each instruction is 3 dwords long, though most don't require all
+ * this space.  Maximum of 123 instructions.  Smaller maxes per insn
+ * type.
+ */
+#define _3DSTATE_PIXEL_SHADER_PROGRAM    (CMD_3D|(0x1d<<24)|(0x5<<16))
+
+#define REG_TYPE_R                 0 /* temporary regs, no need to
+				      * dcl, must be written before
+				      * read -- Preserved between
+				      * phases.
+				      */
+#define REG_TYPE_T                 1 /* Interpolated values, must be
+				      * dcl'ed before use.
+				      *
+				      * 0..7: texture coord,
+				      * 8: diffuse spec,
+				      * 9: specular color,
+				      * 10: fog parameter in w.
+				      */
+#define REG_TYPE_CONST             2 /* Restriction: only one const
+				      * can be referenced per
+				      * instruction, though it may be
+				      * selected for multiple inputs.
+				      * Constants not initialized
+				      * default to zero.
+				      */
+#define REG_TYPE_S                 3 /* sampler */
+#define REG_TYPE_OC                4 /* output color (rgba) */
+#define REG_TYPE_OD                5 /* output depth (w), xyz are
+				      * temporaries.  If not written,
+				      * interpolated depth is used?
+				      */
+#define REG_TYPE_U                 6 /* unpreserved temporaries */
+#define REG_TYPE_MASK              0x7
+#define REG_TYPE_SHIFT		   4
+#define REG_NR_MASK                0xf
+
+/* REG_TYPE_T:
+*/
+#define T_TEX0     0
+#define T_TEX1     1
+#define T_TEX2     2
+#define T_TEX3     3
+#define T_TEX4     4
+#define T_TEX5     5
+#define T_TEX6     6
+#define T_TEX7     7
+#define T_DIFFUSE  8
+#define T_SPECULAR 9
+#define T_FOG_W    10		/* interpolated fog is in W coord */
+
+/* Arithmetic instructions */
+
+/* .replicate_swizzle == selection and replication of a particular
+ * scalar channel, ie., .xxxx, .yyyy, .zzzz or .wwww
+ */
+#define A0_NOP    (0x0<<24)		/* no operation */
+#define A0_ADD    (0x1<<24)		/* dst = src0 + src1 */
+#define A0_MOV    (0x2<<24)		/* dst = src0 */
+#define A0_MUL    (0x3<<24)		/* dst = src0 * src1 */
+#define A0_MAD    (0x4<<24)		/* dst = src0 * src1 + src2 */
+#define A0_DP2ADD (0x5<<24)		/* dst.xyzw = src0.xy dot src1.xy + src2.replicate_swizzle */
+#define A0_DP3    (0x6<<24)		/* dst.xyzw = src0.xyz dot src1.xyz */
+#define A0_DP4    (0x7<<24)		/* dst.xyzw = src0.xyzw dot src1.xyzw */
+#define A0_FRC    (0x8<<24)		/* dst = src0 - floor(src0) */
+#define A0_RCP    (0x9<<24)		/* dst.xyzw = 1/(src0.replicate_swizzle) */
+#define A0_RSQ    (0xa<<24)		/* dst.xyzw = 1/(sqrt(abs(src0.replicate_swizzle))) */
+#define A0_EXP    (0xb<<24)		/* dst.xyzw = exp2(src0.replicate_swizzle) */
+#define A0_LOG    (0xc<<24)		/* dst.xyzw = log2(abs(src0.replicate_swizzle)) */
+#define A0_CMP    (0xd<<24)		/* dst = (src0 >= 0.0) ? src1 : src2 */
+#define A0_MIN    (0xe<<24)		/* dst = (src0 < src1) ? src0 : src1 */
+#define A0_MAX    (0xf<<24)		/* dst = (src0 >= src1) ? src0 : src1 */
+#define A0_FLR    (0x10<<24)		/* dst = floor(src0) */
+#define A0_MOD    (0x11<<24)		/* dst = src0 fmod 1.0 */
+#define A0_TRC    (0x12<<24)		/* dst = int(src0) */
+#define A0_SGE    (0x13<<24)		/* dst = src0 >= src1 ? 1.0 : 0.0 */
+#define A0_SLT    (0x14<<24)		/* dst = src0 < src1 ? 1.0 : 0.0 */
+#define A0_DEST_SATURATE                 (1<<22)
+#define A0_DEST_TYPE_SHIFT                19
+/* Allow: R, OC, OD, U */
+#define A0_DEST_NR_SHIFT                 14
+/* Allow R: 0..15, OC,OD: 0..0, U: 0..2 */
+#define A0_DEST_CHANNEL_X                (1<<10)
+#define A0_DEST_CHANNEL_Y                (2<<10)
+#define A0_DEST_CHANNEL_Z                (4<<10)
+#define A0_DEST_CHANNEL_W                (8<<10)
+#define A0_DEST_CHANNEL_ALL              (0xf<<10)
+#define A0_DEST_CHANNEL_SHIFT            10
+#define A0_SRC0_TYPE_SHIFT               7
+#define A0_SRC0_NR_SHIFT                 2
+
+#define A0_DEST_CHANNEL_XY              (A0_DEST_CHANNEL_X|A0_DEST_CHANNEL_Y)
+#define A0_DEST_CHANNEL_XYZ             (A0_DEST_CHANNEL_XY|A0_DEST_CHANNEL_Z)
+
+#define SRC_X        0
+#define SRC_Y        1
+#define SRC_Z        2
+#define SRC_W        3
+#define SRC_ZERO     4
+#define SRC_ONE      5
+
+#define A1_SRC0_CHANNEL_X_NEGATE         (1<<31)
+#define A1_SRC0_CHANNEL_X_SHIFT          28
+#define A1_SRC0_CHANNEL_Y_NEGATE         (1<<27)
+#define A1_SRC0_CHANNEL_Y_SHIFT          24
+#define A1_SRC0_CHANNEL_Z_NEGATE         (1<<23)
+#define A1_SRC0_CHANNEL_Z_SHIFT          20
+#define A1_SRC0_CHANNEL_W_NEGATE         (1<<19)
+#define A1_SRC0_CHANNEL_W_SHIFT          16
+#define A1_SRC1_TYPE_SHIFT               13
+#define A1_SRC1_NR_SHIFT                 8
+#define A1_SRC1_CHANNEL_X_NEGATE         (1<<7)
+#define A1_SRC1_CHANNEL_X_SHIFT          4
+#define A1_SRC1_CHANNEL_Y_NEGATE         (1<<3)
+#define A1_SRC1_CHANNEL_Y_SHIFT          0
+
+#define A2_SRC1_CHANNEL_Z_NEGATE         (1<<31)
+#define A2_SRC1_CHANNEL_Z_SHIFT          28
+#define A2_SRC1_CHANNEL_W_NEGATE         (1<<27)
+#define A2_SRC1_CHANNEL_W_SHIFT          24
+#define A2_SRC2_TYPE_SHIFT               21
+#define A2_SRC2_NR_SHIFT                 16
+#define A2_SRC2_CHANNEL_X_NEGATE         (1<<15)
+#define A2_SRC2_CHANNEL_X_SHIFT          12
+#define A2_SRC2_CHANNEL_Y_NEGATE         (1<<11)
+#define A2_SRC2_CHANNEL_Y_SHIFT          8
+#define A2_SRC2_CHANNEL_Z_NEGATE         (1<<7)
+#define A2_SRC2_CHANNEL_Z_SHIFT          4
+#define A2_SRC2_CHANNEL_W_NEGATE         (1<<3)
+#define A2_SRC2_CHANNEL_W_SHIFT          0
+
+/* Texture instructions */
+#define T0_TEXLD     (0x15<<24)	/* Sample texture using predeclared
+				 * sampler and address, and output
+				 * filtered texel data to destination
+				 * register */
+#define T0_TEXLDP    (0x16<<24)	/* Same as texld but performs a
+				 * perspective divide of the texture
+				 * coordinate .xyz values by .w before
+				 * sampling. */
+#define T0_TEXLDB    (0x17<<24)	/* Same as texld but biases the
+				 * computed LOD by w.  Only S4.6 two's
+				 * comp is used.  This implies that a
+				 * float to fixed conversion is
+				 * done. */
+#define T0_TEXKILL   (0x18<<24)	/* Does not perform a sampling
+				 * operation.  Simply kills the pixel
+				 * if any channel of the address
+				 * register is < 0.0. */
+#define T0_DEST_TYPE_SHIFT                19
+/* Allow: R, OC, OD, U */
+/* Note: U (unpreserved) regs do not retain their values between
+ * phases (cannot be used for feedback)
+ *
+ * Note: oC and OD registers can only be used as the destination of a
+ * texture instruction once per phase (this is an implementation
+ * restriction).
+ */
+#define T0_DEST_NR_SHIFT                 14
+/* Allow R: 0..15, OC,OD: 0..0, U: 0..2 */
+#define T0_SAMPLER_NR_SHIFT              0 /* This field ignored for TEXKILL */
+#define T0_SAMPLER_NR_MASK               (0xf<<0)
+
+#define T1_ADDRESS_REG_TYPE_SHIFT        24 /* Reg to use as texture coord */
+/* Allow R, T, OC, OD -- R, OC, OD are 'dependent' reads, new program phase */
+#define T1_ADDRESS_REG_NR_SHIFT          17
+#define T2_MBZ                           0
+
+/* Declaration instructions */
+#define D0_DCL       (0x19<<24)	/* Declare a t (interpolated attrib)
+				 * register or an s (sampler)
+				 * register. */
+#define D0_SAMPLE_TYPE_SHIFT              22
+#define D0_SAMPLE_TYPE_2D                 (0x0<<22)
+#define D0_SAMPLE_TYPE_CUBE               (0x1<<22)
+#define D0_SAMPLE_TYPE_VOLUME             (0x2<<22)
+#define D0_SAMPLE_TYPE_MASK               (0x3<<22)
+
+#define D0_TYPE_SHIFT                19
+/* Allow: T, S */
+#define D0_NR_SHIFT                  14
+/* Allow T: 0..10, S: 0..15 */
+#define D0_CHANNEL_X                (1<<10)
+#define D0_CHANNEL_Y                (2<<10)
+#define D0_CHANNEL_Z                (4<<10)
+#define D0_CHANNEL_W                (8<<10)
+#define D0_CHANNEL_ALL              (0xf<<10)
+#define D0_CHANNEL_NONE             (0<<10)
+
+#define D0_CHANNEL_XY               (D0_CHANNEL_X|D0_CHANNEL_Y)
+#define D0_CHANNEL_XYZ              (D0_CHANNEL_XY|D0_CHANNEL_Z)
+
+/* I915 Errata: Do not allow (xz), (xw), (xzw) combinations for diffuse
+ * or specular declarations.
+ *
+ * For T dcls, only allow: (x), (xy), (xyz), (w), (xyzw)
+ *
+ * Must be zero for S (sampler) dcls
+ */
+#define D1_MBZ                          0
+#define D2_MBZ                          0
+
+
 /* MASK_* are the unshifted bitmasks of the destination mask in arithmetic
  * operations
  */
@@ -38,131 +242,101 @@
 #define MASK_SATURATE		0x10
 
 /* Temporary, undeclared regs. Preserved between phases */
-#define FS_R0			((REG_TYPE_R << 8) | 0)
-#define FS_R1			((REG_TYPE_R << 8) | 1)
-#define FS_R2			((REG_TYPE_R << 8) | 2)
-#define FS_R3			((REG_TYPE_R << 8) | 3)
+#define FS_R0			((REG_TYPE_R << REG_TYPE_SHIFT) | 0)
+#define FS_R1			((REG_TYPE_R << REG_TYPE_SHIFT) | 1)
+#define FS_R2			((REG_TYPE_R << REG_TYPE_SHIFT) | 2)
+#define FS_R3			((REG_TYPE_R << REG_TYPE_SHIFT) | 3)
 
 /* Texture coordinate regs.  Must be declared. */
-#define FS_T0			((REG_TYPE_T << 8) | 0)
-#define FS_T1			((REG_TYPE_T << 8) | 1)
-#define FS_T2			((REG_TYPE_T << 8) | 2)
-#define FS_T3			((REG_TYPE_T << 8) | 3)
-#define FS_T4			((REG_TYPE_T << 8) | 4)
-#define FS_T5			((REG_TYPE_T << 8) | 5)
-#define FS_T6			((REG_TYPE_T << 8) | 6)
-#define FS_T7			((REG_TYPE_T << 8) | 7)
-#define FS_T8			((REG_TYPE_T << 8) | 8)
-#define FS_T9			((REG_TYPE_T << 8) | 9)
-#define FS_T10			((REG_TYPE_T << 8) | 10)
+#define FS_T0			((REG_TYPE_T << REG_TYPE_SHIFT) | 0)
+#define FS_T1			((REG_TYPE_T << REG_TYPE_SHIFT) | 1)
+#define FS_T2			((REG_TYPE_T << REG_TYPE_SHIFT) | 2)
+#define FS_T3			((REG_TYPE_T << REG_TYPE_SHIFT) | 3)
+#define FS_T4			((REG_TYPE_T << REG_TYPE_SHIFT) | 4)
+#define FS_T5			((REG_TYPE_T << REG_TYPE_SHIFT) | 5)
+#define FS_T6			((REG_TYPE_T << REG_TYPE_SHIFT) | 6)
+#define FS_T7			((REG_TYPE_T << REG_TYPE_SHIFT) | 7)
+#define FS_T8			((REG_TYPE_T << REG_TYPE_SHIFT) | 8)
+#define FS_T9			((REG_TYPE_T << REG_TYPE_SHIFT) | 9)
+#define FS_T10			((REG_TYPE_T << REG_TYPE_SHIFT) | 10)
 
 /* Constant values */
-#define FS_C0			((REG_TYPE_CONST << 8) | 0)
-#define FS_C1			((REG_TYPE_CONST << 8) | 1)
-#define FS_C2			((REG_TYPE_CONST << 8) | 2)
-#define FS_C3			((REG_TYPE_CONST << 8) | 3)
-#define FS_C4			((REG_TYPE_CONST << 8) | 4)
-#define FS_C5			((REG_TYPE_CONST << 8) | 5)
-#define FS_C6			((REG_TYPE_CONST << 8) | 6)
-#define FS_C7			((REG_TYPE_CONST << 8) | 7)
+#define FS_C0			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 0)
+#define FS_C1			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 1)
+#define FS_C2			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 2)
+#define FS_C3			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 3)
+#define FS_C4			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 4)
+#define FS_C5			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 5)
+#define FS_C6			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 6)
+#define FS_C7			((REG_TYPE_CONST << REG_TYPE_SHIFT) | 7)
 
 /* Sampler regs */
-#define FS_S0			((REG_TYPE_S << 8) | 0)
-#define FS_S1			((REG_TYPE_S << 8) | 1)
-#define FS_S2			((REG_TYPE_S << 8) | 2)
-#define FS_S3			((REG_TYPE_S << 8) | 3)
+#define FS_S0			((REG_TYPE_S << REG_TYPE_SHIFT) | 0)
+#define FS_S1			((REG_TYPE_S << REG_TYPE_SHIFT) | 1)
+#define FS_S2			((REG_TYPE_S << REG_TYPE_SHIFT) | 2)
+#define FS_S3			((REG_TYPE_S << REG_TYPE_SHIFT) | 3)
 
 /* Output color */
-#define FS_OC			((REG_TYPE_OC << 8) | 0)
+#define FS_OC			((REG_TYPE_OC << REG_TYPE_SHIFT) | 0)
 
 /* Output depth */
-#define FS_OD			((REG_TYPE_OD << 8) | 0)
+#define FS_OD			((REG_TYPE_OD << REG_TYPE_SHIFT) | 0)
 
 /* Unpreserved temporary regs */
-#define FS_U0			((REG_TYPE_U << 8) | 0)
-#define FS_U1			((REG_TYPE_U << 8) | 1)
-#define FS_U2			((REG_TYPE_U << 8) | 2)
-#define FS_U3			((REG_TYPE_U << 8) | 3)
-
-#define REG_TYPE(reg)		((reg) >> 8)
-#define REG_NR(reg)		((reg) & 0xff)
-
-struct i915_fs_op {
-    uint32_t ui[3];
+#define FS_U0			((REG_TYPE_U << REG_TYPE_SHIFT) | 0)
+#define FS_U1			((REG_TYPE_U << REG_TYPE_SHIFT) | 1)
+#define FS_U2			((REG_TYPE_U << REG_TYPE_SHIFT) | 2)
+#define FS_U3			((REG_TYPE_U << REG_TYPE_SHIFT) | 3)
+
+#define X_CHANNEL_SHIFT (REG_TYPE_SHIFT + 3)
+#define Y_CHANNEL_SHIFT (X_CHANNEL_SHIFT + 4)
+#define Z_CHANNEL_SHIFT (Y_CHANNEL_SHIFT + 4)
+#define W_CHANNEL_SHIFT (Z_CHANNEL_SHIFT + 4)
+
+#define REG_CHANNEL_MASK 0xf
+
+#define REG_NR(reg)		((reg) & REG_NR_MASK)
+#define REG_TYPE(reg)		(((reg) >> REG_TYPE_SHIFT) & REG_TYPE_MASK)
+#define REG_X(reg)		(((reg) >> X_CHANNEL_SHIFT) & REG_CHANNEL_MASK)
+#define REG_Y(reg)		(((reg) >> Y_CHANNEL_SHIFT) & REG_CHANNEL_MASK)
+#define REG_Z(reg)		(((reg) >> Z_CHANNEL_SHIFT) & REG_CHANNEL_MASK)
+#define REG_W(reg)		(((reg) >> W_CHANNEL_SHIFT) & REG_CHANNEL_MASK)
+
+enum i915_fs_channel {
+	X_CHANNEL_VAL = 0,
+	Y_CHANNEL_VAL,
+	Z_CHANNEL_VAL,
+	W_CHANNEL_VAL,
+	ZERO_CHANNEL_VAL,
+	ONE_CHANNEL_VAL,
+
+	NEG_X_CHANNEL_VAL = X_CHANNEL_VAL | 0x8,
+	NEG_Y_CHANNEL_VAL = Y_CHANNEL_VAL | 0x8,
+	NEG_Z_CHANNEL_VAL = Z_CHANNEL_VAL | 0x8,
+	NEG_W_CHANNEL_VAL = W_CHANNEL_VAL | 0x8,
+	NEG_ONE_CHANNEL_VAL = ONE_CHANNEL_VAL | 0x8
 };
 
-#define X_CHANNEL_VAL		1
-#define Y_CHANNEL_VAL		2
-#define Z_CHANNEL_VAL		3
-#define W_CHANNEL_VAL		4
-#define ZERO_CHANNEL_VAL	5
-#define ONE_CHANNEL_VAL		6
+#define i915_fs_operand(reg, x, y, z, w) \
+	(reg) | \
+(x##_CHANNEL_VAL << X_CHANNEL_SHIFT) | \
+(y##_CHANNEL_VAL << Y_CHANNEL_SHIFT) | \
+(z##_CHANNEL_VAL << Z_CHANNEL_SHIFT) | \
+(w##_CHANNEL_VAL << W_CHANNEL_SHIFT)
 
 /**
- * This structure represents the contents of an operand to an i915 fragment
- * shader.
- *
- * It is not a hardware representation, though closely related.
- */
-struct i915_fs_operand {
-    /**< REG_TYPE_* register type */
-    int reg;
-    /**< *_CHANNEL_VAL swizzle value, with optional negation */
-    int x;
-    /**< *_CHANNEL_VAL swizzle value, with optional negation */
-    int y;
-    /**< *_CHANNEL_VAL swizzle value, with optional negation */
-    int z;
-    /**< *_CHANNEL_VAL swizzle value, with optional negation */
-    int w;
-};
-
-/**
- * Construct an operand description for the fragment shader.
- *
- * \param regtype FS_* register used as the source value for X/Y/Z/W sources.
- * \param x *_CHANNEL_VAL swizzle value prefix for operand X channel, with
- *          optional negation.
- * \param y *_CHANNEL_VAL swizzle value prefix for operand Y channel, with
- *          optional negation.
- * \param z *_CHANNEL_VAL swizzle value prefix for operand Z channel, with
- *          optional negation.
- * \param w *_CHANNEL_VAL swizzle value prefix for operand W channel, with
- *          optional negation.
- */
-#define i915_fs_operand(reg, x, y, z, w)				\
-    _i915_fs_operand(reg,						\
-		     x##_CHANNEL_VAL, y##_CHANNEL_VAL,			\
-		     z##_CHANNEL_VAL, w##_CHANNEL_VAL)
-
-/**
- * Construct an oeprand description for using a register with no swizzling
+ * Construct an operand description for using a register with no swizzling
  */
 #define i915_fs_operand_reg(reg)					\
-    i915_fs_operand(reg, X, Y, Z, W)
+	i915_fs_operand(reg, X, Y, Z, W)
 
-static inline struct i915_fs_operand
-_i915_fs_operand(int reg, int x, int y, int z, int w)
-{
-    struct i915_fs_operand operand;
-
-    operand.reg = reg;
-    operand.x = x;
-    operand.y = y;
-    operand.z = z;
-    operand.w = w;
-
-    return operand;
-}
+#define i915_fs_operand_reg_negate(reg)					\
+	i915_fs_operand(reg, NEG_X, NEG_Y, NEG_Z, NEG_W)
 
 /**
  * Returns an operand containing (0.0, 0.0, 0.0, 0.0).
  */
-static inline struct i915_fs_operand
-i915_fs_operand_zero(void)
-{
-    return i915_fs_operand(FS_R0, ZERO, ZERO, ZERO, ZERO);
-}
+#define i915_fs_operand_zero() i915_fs_operand(FS_R0, ZERO, ZERO, ZERO, ZERO)
 
 /**
  * Returns an unused operand
@@ -172,250 +346,256 @@ i915_fs_operand_zero(void)
 /**
  * Returns an operand containing (1.0, 1.0, 1.0, 1.0).
  */
-static inline struct i915_fs_operand
-i915_fs_operand_one(void)
-{
-    return i915_fs_operand(FS_R0, ONE, ONE, ONE, ONE);
-}
-
-static inline int
-i915_get_hardware_channel_val(int channel_val)
-{
-    if (channel_val < 0)
-	channel_val = -channel_val;
-
-    switch (channel_val) {
-    case X_CHANNEL_VAL:
-	return SRC_X;
-    case Y_CHANNEL_VAL:
-	return SRC_Y;
-    case Z_CHANNEL_VAL:
-	return SRC_Z;
-    case W_CHANNEL_VAL:
-	return SRC_W;
-    case ZERO_CHANNEL_VAL:
-	return SRC_ZERO;
-    case ONE_CHANNEL_VAL:
-	return SRC_ONE;
-    }
-    FatalError("Bad channel value %d\n", channel_val);
-}
+#define i915_fs_operand_one() i915_fs_operand(FS_R0, ONE, ONE, ONE, ONE)
+
+#define i915_get_hardware_channel_val(val, shift, negate) \
+	(((val & 0x7) << shift) | ((val & 0x8) ? negate : 0))
 
 /**
  * Outputs a fragment shader command to declare a sampler or texture register.
  */
 #define i915_fs_dcl(reg)						\
-do {									\
-    FS_OUT(_i915_fs_dcl(reg));						\
-} while (0)
+	do {									\
+		OUT_BATCH(D0_DCL | \
+			  (REG_TYPE(reg) << D0_TYPE_SHIFT) | \
+			  (REG_NR(reg) << D0_NR_SHIFT) | \
+			  ((REG_TYPE(reg) != REG_TYPE_S) ? D0_CHANNEL_ALL : 0)); \
+		OUT_BATCH(0); \
+		OUT_BATCH(0); \
+	} while (0)
 
-/**
- * Constructs a fragment shader command to declare a sampler or texture
- * register.
- */
-static inline struct i915_fs_op
-_i915_fs_dcl(int reg)
-{
-    struct i915_fs_op op;
-
-    op.ui[0] = D0_DCL | (REG_TYPE(reg) << D0_TYPE_SHIFT) |
-	(REG_NR(reg) << D0_NR_SHIFT);
-    op.ui[1] = 0;
-    op.ui[2] = 0;
-    if (REG_TYPE(reg) != REG_TYPE_S)
-	op.ui[0] |= D0_CHANNEL_ALL;
-
-    return op;
-}
-
-/**
- * Constructs a fragment shader command to load from a texture sampler.
- */
 #define i915_fs_texld(dest_reg, sampler_reg, address_reg)		\
-do {									\
-     FS_OUT(_i915_fs_texld(T0_TEXLD, dest_reg, sampler_reg, address_reg)); \
-} while (0)
+	do {									\
+		OUT_BATCH(T0_TEXLD | \
+			  (REG_TYPE(dest_reg) << T0_DEST_TYPE_SHIFT) | \
+			  (REG_NR(dest_reg) << T0_DEST_NR_SHIFT) | \
+			  (REG_NR(sampler_reg) << T0_SAMPLER_NR_SHIFT)); \
+		OUT_BATCH((REG_TYPE(address_reg) << T1_ADDRESS_REG_TYPE_SHIFT) | \
+			  (REG_NR(address_reg) << T1_ADDRESS_REG_NR_SHIFT)); \
+		OUT_BATCH(0); \
+	} while (0)
 
 #define i915_fs_texldp(dest_reg, sampler_reg, address_reg)		\
-do {									\
-     FS_OUT(_i915_fs_texld(T0_TEXLDP, dest_reg, sampler_reg, address_reg)); \
-} while (0)
+	do {									\
+		OUT_BATCH(T0_TEXLDP | \
+			  (REG_TYPE(dest_reg) << T0_DEST_TYPE_SHIFT) | \
+			  (REG_NR(dest_reg) << T0_DEST_NR_SHIFT) | \
+			  (REG_NR(sampler_reg) << T0_SAMPLER_NR_SHIFT)); \
+		OUT_BATCH((REG_TYPE(address_reg) << T1_ADDRESS_REG_TYPE_SHIFT) | \
+			  (REG_NR(address_reg) << T1_ADDRESS_REG_NR_SHIFT)); \
+		OUT_BATCH(0); \
+	} while (0)
 
-static inline struct i915_fs_op
-_i915_fs_texld(int load_op, int dest_reg, int sampler_reg, int address_reg)
-{
-    struct i915_fs_op op;
-
-    op.ui[0] = 0;
-    op.ui[1] = 0;
-    op.ui[2] = 0;
-
-    if (REG_TYPE(sampler_reg) != REG_TYPE_S)
-	FatalError("Bad sampler reg type\n");
-
-    op.ui[0] |= load_op;
-    op.ui[0] |= REG_TYPE(dest_reg) << T0_DEST_TYPE_SHIFT;
-    op.ui[0] |= REG_NR(dest_reg) << T0_DEST_NR_SHIFT;
-    op.ui[0] |= REG_NR(sampler_reg) << T0_SAMPLER_NR_SHIFT;
-    op.ui[1] |= REG_TYPE(address_reg) << T1_ADDRESS_REG_TYPE_SHIFT;
-    op.ui[1] |= REG_NR(address_reg) << T1_ADDRESS_REG_NR_SHIFT;
-
-    return op;
-}
+#define i915_fs_arith_masked(op, dest_reg, dest_mask, operand0, operand1, operand2)	\
+	_i915_fs_arith_masked(A0_##op, dest_reg, dest_mask, operand0, operand1, operand2)
 
 #define i915_fs_arith(op, dest_reg, operand0, operand1, operand2)	\
-    _i915_fs_arith(A0_##op, dest_reg, operand0, operand1, operand2)
-
-static inline struct i915_fs_op
-_i915_fs_arith(int cmd, int dest_reg,
-	       struct i915_fs_operand operand0,
-	       struct i915_fs_operand operand1,
-	       struct i915_fs_operand operand2)
-{
-    struct i915_fs_op op;
-
-    op.ui[0] = 0;
-    op.ui[1] = 0;
-    op.ui[2] = 0;
-
-    /* Set up destination register and write mask */
-    op.ui[0] |= cmd;
-    op.ui[0] |= REG_TYPE(dest_reg) << A0_DEST_TYPE_SHIFT;
-    op.ui[0] |= REG_NR(dest_reg) << A0_DEST_NR_SHIFT;
-    op.ui[0] |= A0_DEST_CHANNEL_ALL;
-
-    /* Set up operand 0 */
-    op.ui[0] |= REG_TYPE(operand0.reg) << A0_SRC0_TYPE_SHIFT;
-    op.ui[0] |= REG_NR(operand0.reg) << A0_SRC0_NR_SHIFT;
-
-    op.ui[1] |= i915_get_hardware_channel_val(operand0.x) <<
-	A1_SRC0_CHANNEL_X_SHIFT;
-    if (operand0.x < 0)
-	op.ui[1] |= A1_SRC0_CHANNEL_X_NEGATE;
-
-    op.ui[1] |= i915_get_hardware_channel_val(operand0.y) <<
-	A1_SRC0_CHANNEL_Y_SHIFT;
-    if (operand0.y < 0)
-	op.ui[1] |= A1_SRC0_CHANNEL_Y_NEGATE;
-
-    op.ui[1] |= i915_get_hardware_channel_val(operand0.z) <<
-	A1_SRC0_CHANNEL_Z_SHIFT;
-    if (operand0.z < 0)
-	op.ui[1] |= A1_SRC0_CHANNEL_Z_NEGATE;
-
-    op.ui[1] |= i915_get_hardware_channel_val(operand0.w) <<
-	A1_SRC0_CHANNEL_W_SHIFT;
-    if (operand0.w < 0)
-	op.ui[1] |= A1_SRC0_CHANNEL_W_NEGATE;
-
-    /* Set up operand 1 */
-    op.ui[1] |= REG_TYPE(operand1.reg) << A1_SRC1_TYPE_SHIFT;
-    op.ui[1] |= REG_NR(operand1.reg) << A1_SRC1_NR_SHIFT;
-
-    op.ui[1] |= i915_get_hardware_channel_val(operand1.x) <<
-	A1_SRC1_CHANNEL_X_SHIFT;
-    if (operand1.x < 0)
-	op.ui[1] |= A1_SRC1_CHANNEL_X_NEGATE;
-
-    op.ui[1] |= i915_get_hardware_channel_val(operand1.y) <<
-	A1_SRC1_CHANNEL_Y_SHIFT;
-    if (operand1.y < 0)
-	op.ui[1] |= A1_SRC1_CHANNEL_Y_NEGATE;
-
-    op.ui[2] |= i915_get_hardware_channel_val(operand1.z) <<
-	A2_SRC1_CHANNEL_Z_SHIFT;
-    if (operand1.z < 0)
-	op.ui[2] |= A2_SRC1_CHANNEL_Z_NEGATE;
-
-    op.ui[2] |= i915_get_hardware_channel_val(operand1.w) <<
-	A2_SRC1_CHANNEL_W_SHIFT;
-    if (operand1.w < 0)
-	op.ui[2] |= A2_SRC1_CHANNEL_W_NEGATE;
-
-    /* Set up operand 2 */
-    op.ui[2] |= REG_TYPE(operand2.reg) << A2_SRC2_TYPE_SHIFT;
-    op.ui[2] |= REG_NR(operand2.reg) << A2_SRC2_NR_SHIFT;
-
-    op.ui[2] |= i915_get_hardware_channel_val(operand2.x) <<
-	A2_SRC2_CHANNEL_X_SHIFT;
-    if (operand2.x < 0)
-	op.ui[2] |= A2_SRC2_CHANNEL_X_NEGATE;
-
-    op.ui[2] |= i915_get_hardware_channel_val(operand2.y) <<
-	A2_SRC2_CHANNEL_Y_SHIFT;
-    if (operand2.y < 0)
-	op.ui[2] |= A2_SRC2_CHANNEL_Y_NEGATE;
-
-    op.ui[2] |= i915_get_hardware_channel_val(operand2.z) <<
-	A2_SRC2_CHANNEL_Z_SHIFT;
-    if (operand2.z < 0)
-	op.ui[2] |= A2_SRC2_CHANNEL_Z_NEGATE;
-
-    op.ui[2] |= i915_get_hardware_channel_val(operand2.w) <<
-	A2_SRC2_CHANNEL_W_SHIFT;
-    if (operand2.w < 0)
-	op.ui[2] |= A2_SRC2_CHANNEL_W_NEGATE;
+	_i915_fs_arith(A0_##op, dest_reg, operand0, operand1, operand2)
 
-    return op;
-}
+#define _i915_fs_arith_masked(cmd, dest_reg, dest_mask, operand0, operand1, operand2) \
+	do { \
+		/* Set up destination register and write mask */ \
+		OUT_BATCH(cmd | \
+			  (REG_TYPE(dest_reg) << A0_DEST_TYPE_SHIFT) | \
+			  (REG_NR(dest_reg) << A0_DEST_NR_SHIFT) | \
+			  (((dest_mask) & ~MASK_SATURATE) << A0_DEST_CHANNEL_SHIFT) | \
+			  (((dest_mask) & MASK_SATURATE) ? A0_DEST_SATURATE : 0) | \
+			  /* Set up operand 0 */ \
+			  (REG_TYPE(operand0) << A0_SRC0_TYPE_SHIFT) | \
+			  (REG_NR(operand0) << A0_SRC0_NR_SHIFT)); \
+		OUT_BATCH(i915_get_hardware_channel_val(REG_X(operand0), \
+							A1_SRC0_CHANNEL_X_SHIFT, \
+							A1_SRC0_CHANNEL_X_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_Y(operand0), \
+							A1_SRC0_CHANNEL_Y_SHIFT, \
+							A1_SRC0_CHANNEL_Y_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_Z(operand0), \
+							A1_SRC0_CHANNEL_Z_SHIFT, \
+							A1_SRC0_CHANNEL_Z_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_W(operand0), \
+							A1_SRC0_CHANNEL_W_SHIFT, \
+							A1_SRC0_CHANNEL_W_NEGATE) | \
+			  /* Set up operand 1 */ \
+			  (REG_TYPE(operand1) << A1_SRC1_TYPE_SHIFT) | \
+			  (REG_NR(operand1) << A1_SRC1_NR_SHIFT) | \
+			  i915_get_hardware_channel_val(REG_X(operand1), \
+							A1_SRC1_CHANNEL_X_SHIFT, \
+							A1_SRC1_CHANNEL_X_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_Y(operand1), \
+							A1_SRC1_CHANNEL_Y_SHIFT, \
+							A1_SRC1_CHANNEL_Y_NEGATE)); \
+		OUT_BATCH(i915_get_hardware_channel_val(REG_Z(operand1), \
+							A2_SRC1_CHANNEL_Z_SHIFT, \
+							A2_SRC1_CHANNEL_Z_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_W(operand1), \
+							A2_SRC1_CHANNEL_W_SHIFT, \
+							A2_SRC1_CHANNEL_W_NEGATE) | \
+			  /* Set up operand 2 */ \
+			  (REG_TYPE(operand2) << A2_SRC2_TYPE_SHIFT) | \
+			  (REG_NR(operand2) << A2_SRC2_NR_SHIFT) | \
+			  i915_get_hardware_channel_val(REG_X(operand2), \
+							A2_SRC2_CHANNEL_X_SHIFT, \
+							A2_SRC2_CHANNEL_X_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_Y(operand2), \
+							A2_SRC2_CHANNEL_Y_SHIFT, \
+							A2_SRC2_CHANNEL_Y_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_Z(operand2), \
+							A2_SRC2_CHANNEL_Z_SHIFT, \
+							A2_SRC2_CHANNEL_Z_NEGATE) | \
+			  i915_get_hardware_channel_val(REG_W(operand2), \
+							A2_SRC2_CHANNEL_W_SHIFT, \
+							A2_SRC2_CHANNEL_W_NEGATE)); \
+	} while (0)
+
+#define _i915_fs_arith(cmd, dest_reg, operand0, operand1, operand2) do {\
+	/* Set up destination register and write mask */ \
+	OUT_BATCH(cmd | \
+		  (REG_TYPE(dest_reg) << A0_DEST_TYPE_SHIFT) | \
+		  (REG_NR(dest_reg) << A0_DEST_NR_SHIFT) | \
+		  (A0_DEST_CHANNEL_ALL) | \
+		  /* Set up operand 0 */ \
+		  (REG_TYPE(operand0) << A0_SRC0_TYPE_SHIFT) | \
+		  (REG_NR(operand0) << A0_SRC0_NR_SHIFT)); \
+	OUT_BATCH(i915_get_hardware_channel_val(REG_X(operand0), \
+						A1_SRC0_CHANNEL_X_SHIFT, \
+						A1_SRC0_CHANNEL_X_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_Y(operand0), \
+						A1_SRC0_CHANNEL_Y_SHIFT, \
+						A1_SRC0_CHANNEL_Y_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_Z(operand0), \
+						A1_SRC0_CHANNEL_Z_SHIFT, \
+						A1_SRC0_CHANNEL_Z_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_W(operand0), \
+						A1_SRC0_CHANNEL_W_SHIFT, \
+						A1_SRC0_CHANNEL_W_NEGATE) | \
+		  /* Set up operand 1 */ \
+		  (REG_TYPE(operand1) << A1_SRC1_TYPE_SHIFT) | \
+		  (REG_NR(operand1) << A1_SRC1_NR_SHIFT) | \
+		  i915_get_hardware_channel_val(REG_X(operand1), \
+						A1_SRC1_CHANNEL_X_SHIFT, \
+						A1_SRC1_CHANNEL_X_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_Y(operand1), \
+						A1_SRC1_CHANNEL_Y_SHIFT, \
+						A1_SRC1_CHANNEL_Y_NEGATE)); \
+	OUT_BATCH(i915_get_hardware_channel_val(REG_Z(operand1), \
+						A2_SRC1_CHANNEL_Z_SHIFT, \
+						A2_SRC1_CHANNEL_Z_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_W(operand1), \
+						A2_SRC1_CHANNEL_W_SHIFT, \
+						A2_SRC1_CHANNEL_W_NEGATE) | \
+		  /* Set up operand 2 */ \
+		  (REG_TYPE(operand2) << A2_SRC2_TYPE_SHIFT) | \
+		  (REG_NR(operand2) << A2_SRC2_NR_SHIFT) | \
+		  i915_get_hardware_channel_val(REG_X(operand2), \
+						A2_SRC2_CHANNEL_X_SHIFT, \
+						A2_SRC2_CHANNEL_X_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_Y(operand2), \
+						A2_SRC2_CHANNEL_Y_SHIFT, \
+						A2_SRC2_CHANNEL_Y_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_Z(operand2), \
+						A2_SRC2_CHANNEL_Z_SHIFT, \
+						A2_SRC2_CHANNEL_Z_NEGATE) | \
+		  i915_get_hardware_channel_val(REG_W(operand2), \
+						A2_SRC2_CHANNEL_W_SHIFT, \
+						A2_SRC2_CHANNEL_W_NEGATE)); \
+} while (0)
 
-/** Move operand0 to dest_reg */
 #define i915_fs_mov(dest_reg, operand0)					\
-do {									\
-    FS_OUT(i915_fs_arith(MOV, dest_reg, operand0,			\
-			 i915_fs_operand_none(),			\
-			 i915_fs_operand_none()));			\
-} while (0)
+	i915_fs_arith(MOV, dest_reg, \
+		      operand0,			\
+		      i915_fs_operand_none(),			\
+		      i915_fs_operand_none())
 
-/**
- * Move the value in operand0 to the dest reg with the masking/saturation
- * specified.
- */
 #define i915_fs_mov_masked(dest_reg, dest_mask, operand0)		\
-do {									\
-    struct i915_fs_op op;						\
-									\
-    op = i915_fs_arith(MOV, dest_reg, operand0, i915_fs_operand_none(),	\
-		       i915_fs_operand_none());				\
-    op.ui[0] &= ~A0_DEST_CHANNEL_ALL;					\
-    op.ui[0] |= ((dest_mask) & ~MASK_SATURATE) << A0_DEST_CHANNEL_SHIFT; \
-    if ((dest_mask) & MASK_SATURATE)					\
-	op.ui[0] |= A0_DEST_SATURATE;					\
-									\
-    FS_OUT(op);								\
-} while (0)
+	i915_fs_arith_masked (MOV, dest_reg, dest_mask, \
+			      operand0, \
+			      i915_fs_operand_none(), \
+			      i915_fs_operand_none())
+
+
+#define i915_fs_frc(dest_reg, operand0)					\
+	i915_fs_arith (FRC, dest_reg, \
+		       operand0,			\
+		       i915_fs_operand_none(),			\
+		       i915_fs_operand_none())
 
 /** Add operand0 and operand1 and put the result in dest_reg */
 #define i915_fs_add(dest_reg, operand0, operand1)			\
-do {									\
-    FS_OUT(i915_fs_arith(ADD, dest_reg, operand0, operand1,		\
-			 i915_fs_operand_none()));			\
-} while (0)
+	i915_fs_arith (ADD, dest_reg, \
+		       operand0, operand1,	\
+		       i915_fs_operand_none())
 
-/** Add operand0 and operand1 and put the result in dest_reg */
+/** Multiply operand0 and operand1 and put the result in dest_reg */
 #define i915_fs_mul(dest_reg, operand0, operand1)			\
-do {									\
-    FS_OUT(i915_fs_arith(MUL, dest_reg, operand0, operand1,		\
-			 i915_fs_operand_none()));			\
-} while (0)
+	i915_fs_arith (MUL, dest_reg, \
+		       operand0, operand1,	\
+		       i915_fs_operand_none())
+
+/** Computes 1/sqrt(operand0.replicate_swizzle) puts the result in dest_reg */
+#define i915_fs_rsq(dest_reg, dest_mask, operand0)		\
+	do {									\
+		if (dest_mask) {							\
+			i915_fs_arith_masked (RSQ, dest_reg, dest_mask, \
+					      operand0,			\
+					      i915_fs_operand_none (),			\
+					      i915_fs_operand_none ());			\
+		} else { \
+			i915_fs_arith (RSQ, dest_reg, \
+				       operand0, \
+				       i915_fs_operand_none (), \
+				       i915_fs_operand_none ()); \
+		} \
+	} while (0)
+
+/** Puts the minimum of operand0 and operand1 in dest_reg */
+#define i915_fs_min(dest_reg, operand0, operand1)			\
+	i915_fs_arith (MIN, dest_reg, \
+		       operand0, operand1, \
+		       i915_fs_operand_none())
+
+/** Puts the maximum of operand0 and operand1 in dest_reg */
+#define i915_fs_max(dest_reg, operand0, operand1)			\
+	i915_fs_arith (MAX, dest_reg, \
+		       operand0, operand1, \
+		       i915_fs_operand_none())
+
+#define i915_fs_cmp(dest_reg, operand0, operand1, operand2)		\
+	i915_fs_arith (CMP, dest_reg, operand0, operand1, operand2)
+
+/** Perform operand0 * operand1 + operand2 and put the result in dest_reg */
+#define i915_fs_mad(dest_reg, dest_mask, op0, op1, op2)	\
+	do {									\
+		if (dest_mask) {							\
+			i915_fs_arith_masked (MAD, dest_reg, dest_mask, op0, op1, op2); \
+		} else { \
+			i915_fs_arith (MAD, dest_reg, op0, op1, op2); \
+		} \
+	} while (0)
+
+#define i915_fs_dp2add(dest_reg, dest_mask, op0, op1, op2)	\
+	do {									\
+		if (dest_mask) {							\
+			i915_fs_arith_masked (DP2ADD, dest_reg, dest_mask, op0, op1, op2); \
+		} else { \
+			i915_fs_arith (DP2ADD, dest_reg, op0, op1, op2); \
+		} \
+	} while (0)
 
 /**
  * Perform a 3-component dot-product of operand0 and operand1 and put the
  * resulting scalar in the channels of dest_reg specified by the dest_mask.
  */
-#define i915_fs_dp3_masked(dest_reg, dest_mask, operand0, operand1)	\
-do {									\
-    struct i915_fs_op op;						\
-									\
-    op = i915_fs_arith(DP3, dest_reg, operand0, operand1,		\
-		       i915_fs_operand_none());				\
-    op.ui[0] &= ~A0_DEST_CHANNEL_ALL;					\
-    op.ui[0] |= ((dest_mask) & ~MASK_SATURATE) << A0_DEST_CHANNEL_SHIFT; \
-    if ((dest_mask) & MASK_SATURATE)					\
-	op.ui[0] |= A0_DEST_SATURATE;					\
-									\
-    FS_OUT(op);								\
-} while (0)
+#define i915_fs_dp3(dest_reg, dest_mask, op0, op1)	\
+	do {									\
+		if (dest_mask) {							\
+			i915_fs_arith_masked (DP3, dest_reg, dest_mask, \
+					      op0, op1,\
+					      i915_fs_operand_none());			\
+		} else { \
+			i915_fs_arith (DP3, dest_reg, op0, op1,\
+				       i915_fs_operand_none());			\
+		} \
+	} while (0)
 
 /**
  * Sets up local state for accumulating a fragment shader buffer.
@@ -423,35 +603,17 @@ do {									\
  * \param x maximum number of shader commands that may be used between
  *        a FS_START and FS_END
  */
-#define FS_LOCALS(x)							\
-    uint32_t _shader_buf[(x) * 3];					\
-    int _max_shader_commands = x;					\
-    int _cur_shader_commands
+#define FS_LOCALS()							\
+	uint32_t _shader_offset
 
 #define FS_BEGIN()							\
-do {									\
-    _cur_shader_commands = 0;						\
-} while (0)
-
-#define FS_OUT(_shaderop)						\
-do {									\
-    _shader_buf[_cur_shader_commands * 3 + 0] = _shaderop.ui[0];	\
-    _shader_buf[_cur_shader_commands * 3 + 1] = _shaderop.ui[1];	\
-    _shader_buf[_cur_shader_commands * 3 + 2] = _shaderop.ui[2];	\
-    if (++_cur_shader_commands > _max_shader_commands)			\
-	 FatalError("fragment shader command buffer exceeded (%d)\n",	\
-		    _cur_shader_commands);				\
-} while (0)
+	do {									\
+		_shader_offset = intel->batch_used++;				\
+	} while (0)
 
 #define FS_END()							\
-do {									\
-    int _i, _pad = (_cur_shader_commands & 0x1) ? 0 : 1;		\
-    BEGIN_BATCH(_cur_shader_commands * 3 + 1 + _pad);			\
-    OUT_BATCH(_3DSTATE_PIXEL_SHADER_PROGRAM |				\
-	     (_cur_shader_commands * 3 - 1));				\
-    for (_i = 0; _i < _cur_shader_commands * 3; _i++)			\
-	OUT_BATCH(_shader_buf[_i]);					\
-    if (_pad != 0)							\
-	OUT_BATCH(MI_NOOP);						\
-    ADVANCE_BATCH();							\
-} while (0);
+	do {									\
+		intel->batch_ptr[_shader_offset] =					\
+		_3DSTATE_PIXEL_SHADER_PROGRAM |					\
+		(intel->batch_used - _shader_offset - 2);			\
+	} while (0);
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i915_reg.h new/xsrc/external/mit/xf86-video-intel/dist/src/i915_reg.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i915_reg.h	2008-08-02 07:12:42.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i915_reg.h	2011-02-08 11:14:00.000000000 +0100
@@ -25,7 +25,6 @@
  * 
  **************************************************************************/
 
-
 #ifndef _I915_REG_H_
 #define _I915_REG_H_
 
@@ -33,19 +32,20 @@
 
 #define CMD_3D (0x3<<29)
 
-#define PRIM3D_INLINE		(CMD_3D | (0x1f<<24))
-#define PRIM3D_TRILIST		(0x0<<18)
-#define PRIM3D_TRISTRIP 	(0x1<<18)
-#define PRIM3D_TRISTRIP_RVRSE	(0x2<<18)
-#define PRIM3D_TRIFAN		(0x3<<18)
-#define PRIM3D_POLY		(0x4<<18)
-#define PRIM3D_LINELIST 	(0x5<<18)
-#define PRIM3D_LINESTRIP	(0x6<<18)
-#define PRIM3D_RECTLIST 	(0x7<<18)
-#define PRIM3D_POINTLIST	(0x8<<18)
-#define PRIM3D_DIB		(0x9<<18)
-#define PRIM3D_CLEAR_RECT	(0xa<<18)
-#define PRIM3D_ZONE_INIT	(0xd<<18)
+#define PRIM3D			(CMD_3D | (0x1f<<24))
+#define PRIM3D_INDIRECT_SEQUENTIAL      ((1<<23) | (0<<17))
+#define PRIM3D_TRILIST		(PRIM3D | (0x0<<18))
+#define PRIM3D_TRISTRIP 	(PRIM3D | (0x1<<18))
+#define PRIM3D_TRISTRIP_RVRSE	(PRIM3D | (0x2<<18))
+#define PRIM3D_TRIFAN		(PRIM3D | (0x3<<18))
+#define PRIM3D_POLY		(PRIM3D | (0x4<<18))
+#define PRIM3D_LINELIST 	(PRIM3D | (0x5<<18))
+#define PRIM3D_LINESTRIP	(PRIM3D | (0x6<<18))
+#define PRIM3D_RECTLIST 	(PRIM3D | (0x7<<18))
+#define PRIM3D_POINTLIST	(PRIM3D | (0x8<<18))
+#define PRIM3D_DIB		(PRIM3D | (0x9<<18))
+#define PRIM3D_CLEAR_RECT	(PRIM3D | (0xa<<18))
+#define PRIM3D_ZONE_INIT	(PRIM3D | (0xd<<18))
 #define PRIM3D_MASK		(0x1f<<18)
 
 /* p137 */
@@ -78,7 +78,6 @@
 #define BFO_ENABLE_STENCIL_TWO_SIDE     (1<<1)
 #define BFO_STENCIL_TWO_SIDE            (1<<0)
 
-
 /* 3DSTATE_BACKFACE_STENCIL_MASKS, p140 */
 #define _3DSTATE_BACKFACE_STENCIL_MASKS    (CMD_3D | (0x9<<24))
 #define BFM_ENABLE_STENCIL_TEST_MASK      (1<<17)
@@ -88,8 +87,6 @@
 #define BFM_STENCIL_WRITE_MASK_SHIFT      0
 #define BFM_STENCIL_WRITE_MASK_MASK       (0xff<<0)
 
-
-
 /* 3DSTATE_BIN_CONTROL p141 */
 
 /* p143 */
@@ -105,7 +102,6 @@
 /* Dword 2 */
 #define BUF_3D_ADDR(x)		((x) & ~0x3)
 
-
 /* 3DSTATE_CHROMA_KEY */
 
 /* 3DSTATE_CLEAR_PARAMETERS, p150 */
@@ -120,8 +116,6 @@
 /* 3DSTATE_CONSTANT_BLEND_COLOR, p153 */
 #define _3DSTATE_CONST_BLEND_COLOR_CMD	(CMD_3D | (0x1d<<24) | (0x88<<16))
 
-
-
 /* 3DSTATE_COORD_SET_BINDINGS, p154 */
 #define _3DSTATE_COORD_SET_BINDINGS      (CMD_3D | (0x16<<24))
 #define CSB_TCB(iunit, eunit)           ((eunit)<<(iunit*3))
@@ -135,7 +129,6 @@
 /* p158 */
 #define _3DSTATE_DFLT_Z_CMD		(CMD_3D | (0x1d<<24) | (0x98<<16))
 
-
 /* 3DSTATE_DEPTH_OFFSET_SCALE, p159 */
 #define _3DSTATE_DEPTH_OFFSET_SCALE       (CMD_3D | (0x1d<<24) | (0x97<<16))
 /* scale in dword 1 */
@@ -195,12 +188,10 @@
 #define DRAW_YORG(x)			((x)<<16)
 #define DRAW_XORG(x)			(x)
 
-
 /* 3DSTATE_FILTER_COEFFICIENTS_4X4, p170 */
 
 /* 3DSTATE_FILTER_COEFFICIENTS_6X5, p172 */
 
-
 /* _3DSTATE_FOG_COLOR, p173 */
 #define _3DSTATE_FOG_COLOR_CMD		(CMD_3D|(0x15<<24))
 #define FOG_COLOR_RED(x)		((x)<<16)
@@ -228,8 +219,6 @@
 /* Dword 3 */
 #define FMC3_D_ONE      		(1<<16)
 
-
-
 /* _3DSTATE_INDEPENDENT_ALPHA_BLEND, p177 */
 #define _3DSTATE_INDEPENDENT_ALPHA_BLEND_CMD	(CMD_3D|(0x0b<<24))
 #define IAB_MODIFY_ENABLE	        (1<<23)
@@ -306,10 +295,6 @@
 #define PSC0_BUFFER_VALID               (1<<0)
 #define PSC1_BUFFER_LENGTH(x)           ((x)&0xff)
 
-
-
-
-
 /* _3DSTATE_RASTERIZATION_RULES */
 #define _3DSTATE_RASTER_RULES_CMD	(CMD_3D|(0x07<<24))
 #define ENABLE_POINT_RASTER_RULE	(1<<15)
@@ -409,7 +394,6 @@
 		      S4_VFMT_XYZW_MASK     |	\
 		      S4_VFMT_FOG_PARAM)
 
-
 #define S5_WRITEDISABLE_ALPHA          (1<<31)
 #define S5_WRITEDISABLE_RED            (1<<30)
 #define S5_WRITEDISABLE_GREEN          (1<<29)
@@ -434,7 +418,6 @@
 #define S5_COLOR_DITHER_ENABLE         (1<<1)
 #define S5_LOGICOP_ENABLE              (1<<0)
 
-
 #define S6_ALPHA_TEST_ENABLE           (1<<31)
 #define S6_ALPHA_TEST_FUNC_SHIFT       28
 #define S6_ALPHA_TEST_FUNC_MASK        (0x7<<28)
@@ -460,7 +443,6 @@
 /* 3DSTATE_MAP_DEINTERLACER_PARAMETERS */
 /* 3DSTATE_MAP_PALETTE_LOAD_32, p206 */
 
-
 /* _3DSTATE_MODES_4, p218 */
 #define _3DSTATE_MODES_4_CMD		(CMD_3D|(0x0d<<24))
 #define ENABLE_LOGIC_OP_FUNC		(1<<23)
@@ -479,7 +461,6 @@
 #define PIPELINE_FLUSH_RENDER_CACHE	(1<<18)
 #define PIPELINE_FLUSH_TEXTURE_CACHE	(1<<16)
 
-
 /* p221 */
 #define _3DSTATE_PIXEL_SHADER_CONSTANTS  (CMD_3D|(0x1d<<24)|(0x6<<16))
 #define PS1_REG(n)                      (1<<(n))
@@ -490,51 +471,48 @@
 
 /* p222 */
 
-
 #define I915_MAX_TEX_INDIRECT 4
-#define I915_MAX_TEX_INSN     32     
+#define I915_MAX_TEX_INSN     32
 #define I915_MAX_ALU_INSN     64
 #define I915_MAX_DECL_INSN    27
 #define I915_MAX_TEMPORARY    16
 
-
 /* Each instruction is 3 dwords long, though most don't require all
  * this space.  Maximum of 123 instructions.  Smaller maxes per insn
  * type.
  */
 #define _3DSTATE_PIXEL_SHADER_PROGRAM    (CMD_3D|(0x1d<<24)|(0x5<<16))
 
-#define REG_TYPE_R                 0 /* temporary regs, no need to
-				      * dcl, must be written before
-				      * read -- Preserved between
-				      * phases. 
-				      */
-#define REG_TYPE_T                 1 /* Interpolated values, must be
-				      * dcl'ed before use.
-				      *
-				      * 0..7: texture coord,
-				      * 8: diffuse spec,
-				      * 9: specular color,
-				      * 10: fog parameter in w.
-				      */
-#define REG_TYPE_CONST             2 /* Restriction: only one const
-				      * can be referenced per
-				      * instruction, though it may be
-				      * selected for multiple inputs.
-				      * Constants not initialized
-				      * default to zero.
-				      */
-#define REG_TYPE_S                 3 /* sampler */
-#define REG_TYPE_OC                4 /* output color (rgba) */
-#define REG_TYPE_OD                5 /* output depth (w), xyz are
-				      * temporaries.  If not written,
-				      * interpolated depth is used?
-				      */
-#define REG_TYPE_U                 6 /* unpreserved temporaries */
+#define REG_TYPE_R                 0	/* temporary regs, no need to
+					 * dcl, must be written before
+					 * read -- Preserved between
+					 * phases.
+					 */
+#define REG_TYPE_T                 1	/* Interpolated values, must be
+					 * dcl'ed before use.
+					 *
+					 * 0..7: texture coord,
+					 * 8: diffuse spec,
+					 * 9: specular color,
+					 * 10: fog parameter in w.
+					 */
+#define REG_TYPE_CONST             2	/* Restriction: only one const
+					 * can be referenced per
+					 * instruction, though it may be
+					 * selected for multiple inputs.
+					 * Constants not initialized
+					 * default to zero.
+					 */
+#define REG_TYPE_S                 3	/* sampler */
+#define REG_TYPE_OC                4	/* output color (rgba) */
+#define REG_TYPE_OD                5	/* output depth (w), xyz are
+					 * temporaries.  If not written,
+					 * interpolated depth is used?
+					 */
+#define REG_TYPE_U                 6	/* unpreserved temporaries */
 #define REG_TYPE_MASK              0x7
 #define REG_NR_MASK                0xf
 
-
 /* REG_TYPE_T:
  */
 #define T_TEX0     0
@@ -552,29 +530,29 @@
 /* Arithmetic instructions */
 
 /* .replicate_swizzle == selection and replication of a particular
- * scalar channel, ie., .xxxx, .yyyy, .zzzz or .wwww 
+ * scalar channel, ie., .xxxx, .yyyy, .zzzz or .wwww
  */
-#define A0_NOP    (0x0<<24)		/* no operation */
-#define A0_ADD    (0x1<<24)		/* dst = src0 + src1 */
-#define A0_MOV    (0x2<<24)		/* dst = src0 */
-#define A0_MUL    (0x3<<24)		/* dst = src0 * src1 */
-#define A0_MAD    (0x4<<24)		/* dst = src0 * src1 + src2 */
-#define A0_DP2ADD (0x5<<24)		/* dst.xyzw = src0.xy dot src1.xy + src2.replicate_swizzle */
-#define A0_DP3    (0x6<<24)		/* dst.xyzw = src0.xyz dot src1.xyz */
-#define A0_DP4    (0x7<<24)		/* dst.xyzw = src0.xyzw dot src1.xyzw */
-#define A0_FRC    (0x8<<24)		/* dst = src0 - floor(src0) */
-#define A0_RCP    (0x9<<24)		/* dst.xyzw = 1/(src0.replicate_swizzle) */
-#define A0_RSQ    (0xa<<24)		/* dst.xyzw = 1/(sqrt(abs(src0.replicate_swizzle))) */
-#define A0_EXP    (0xb<<24)		/* dst.xyzw = exp2(src0.replicate_swizzle) */
-#define A0_LOG    (0xc<<24)		/* dst.xyzw = log2(abs(src0.replicate_swizzle)) */
-#define A0_CMP    (0xd<<24)		/* dst = (src0 >= 0.0) ? src1 : src2 */
-#define A0_MIN    (0xe<<24)		/* dst = (src0 < src1) ? src0 : src1 */
-#define A0_MAX    (0xf<<24)		/* dst = (src0 >= src1) ? src0 : src1 */
-#define A0_FLR    (0x10<<24)		/* dst = floor(src0) */
-#define A0_MOD    (0x11<<24)		/* dst = src0 fmod 1.0 */
-#define A0_TRC    (0x12<<24)		/* dst = int(src0) */
-#define A0_SGE    (0x13<<24)		/* dst = src0 >= src1 ? 1.0 : 0.0 */
-#define A0_SLT    (0x14<<24)		/* dst = src0 < src1 ? 1.0 : 0.0 */
+#define A0_NOP    (0x0<<24)	/* no operation */
+#define A0_ADD    (0x1<<24)	/* dst = src0 + src1 */
+#define A0_MOV    (0x2<<24)	/* dst = src0 */
+#define A0_MUL    (0x3<<24)	/* dst = src0 * src1 */
+#define A0_MAD    (0x4<<24)	/* dst = src0 * src1 + src2 */
+#define A0_DP2ADD (0x5<<24)	/* dst.xyzw = src0.xy dot src1.xy + src2.replicate_swizzle */
+#define A0_DP3    (0x6<<24)	/* dst.xyzw = src0.xyz dot src1.xyz */
+#define A0_DP4    (0x7<<24)	/* dst.xyzw = src0.xyzw dot src1.xyzw */
+#define A0_FRC    (0x8<<24)	/* dst = src0 - floor(src0) */
+#define A0_RCP    (0x9<<24)	/* dst.xyzw = 1/(src0.replicate_swizzle) */
+#define A0_RSQ    (0xa<<24)	/* dst.xyzw = 1/(sqrt(abs(src0.replicate_swizzle))) */
+#define A0_EXP    (0xb<<24)	/* dst.xyzw = exp2(src0.replicate_swizzle) */
+#define A0_LOG    (0xc<<24)	/* dst.xyzw = log2(abs(src0.replicate_swizzle)) */
+#define A0_CMP    (0xd<<24)	/* dst = (src0 >= 0.0) ? src1 : src2 */
+#define A0_MIN    (0xe<<24)	/* dst = (src0 < src1) ? src0 : src1 */
+#define A0_MAX    (0xf<<24)	/* dst = (src0 >= src1) ? src0 : src1 */
+#define A0_FLR    (0x10<<24)	/* dst = floor(src0) */
+#define A0_MOD    (0x11<<24)	/* dst = src0 fmod 1.0 */
+#define A0_TRC    (0x12<<24)	/* dst = int(src0) */
+#define A0_SGE    (0x13<<24)	/* dst = src0 >= src1 ? 1.0 : 0.0 */
+#define A0_SLT    (0x14<<24)	/* dst = src0 < src1 ? 1.0 : 0.0 */
 #define A0_DEST_SATURATE                 (1<<22)
 #define A0_DEST_TYPE_SHIFT                19
 /* Allow: R, OC, OD, U */
@@ -592,7 +570,6 @@
 #define A0_DEST_CHANNEL_XY              (A0_DEST_CHANNEL_X|A0_DEST_CHANNEL_Y)
 #define A0_DEST_CHANNEL_XYZ             (A0_DEST_CHANNEL_XY|A0_DEST_CHANNEL_Z)
 
-
 #define SRC_X        0
 #define SRC_Y        1
 #define SRC_Z        2
@@ -630,8 +607,6 @@
 #define A2_SRC2_CHANNEL_W_NEGATE         (1<<3)
 #define A2_SRC2_CHANNEL_W_SHIFT          0
 
-
-
 /* Texture instructions */
 #define T0_TEXLD     (0x15<<24)	/* Sample texture using predeclared
 				 * sampler and address, and output
@@ -653,18 +628,18 @@
 #define T0_DEST_TYPE_SHIFT                19
 /* Allow: R, OC, OD, U */
 /* Note: U (unpreserved) regs do not retain their values between
- * phases (cannot be used for feedback) 
+ * phases (cannot be used for feedback)
  *
  * Note: oC and OD registers can only be used as the destination of a
  * texture instruction once per phase (this is an implementation
- * restriction). 
+ * restriction).
  */
 #define T0_DEST_NR_SHIFT                 14
 /* Allow R: 0..15, OC,OD: 0..0, U: 0..2 */
-#define T0_SAMPLER_NR_SHIFT              0 /* This field ignored for TEXKILL */
+#define T0_SAMPLER_NR_SHIFT              0	/* This field ignored for TEXKILL */
 #define T0_SAMPLER_NR_MASK               (0xf<<0)
 
-#define T1_ADDRESS_REG_TYPE_SHIFT        24 /* Reg to use as texture coord */
+#define T1_ADDRESS_REG_TYPE_SHIFT        24	/* Reg to use as texture coord */
 /* Allow R, T, OC, OD -- R, OC, OD are 'dependent' reads, new program phase */
 #define T1_ADDRESS_REG_NR_SHIFT          17
 #define T2_MBZ                           0
@@ -694,17 +669,15 @@
 #define D0_CHANNEL_XYZ              (D0_CHANNEL_XY|D0_CHANNEL_Z)
 
 /* I915 Errata: Do not allow (xz), (xw), (xzw) combinations for diffuse
- * or specular declarations. 
+ * or specular declarations.
  *
- * For T dcls, only allow: (x), (xy), (xyz), (w), (xyzw) 
+ * For T dcls, only allow: (x), (xy), (xyz), (w), (xyzw)
  *
  * Must be zero for S (sampler) dcls
  */
 #define D1_MBZ                          0
 #define D2_MBZ                          0
 
-
-
 /* p207.
  * The DWORD count is 3 times the number of bits set in MS1_MAPMASK_MASK
  */
@@ -731,12 +704,12 @@
 #define    MAPSURF_4BIT_INDEXED		   (7<<7)
 #define MS3_MT_FORMAT_MASK         (0x7 << 3)
 #define MS3_MT_FORMAT_SHIFT        3
-#define    MT_4BIT_IDX_ARGB8888	           (7<<3) /* SURFACE_4BIT_INDEXED */
-#define    MT_8BIT_I8		           (0<<3) /* SURFACE_8BIT */
+#define    MT_4BIT_IDX_ARGB8888	           (7<<3)	/* SURFACE_4BIT_INDEXED */
+#define    MT_8BIT_I8		           (0<<3)	/* SURFACE_8BIT */
 #define    MT_8BIT_L8		           (1<<3)
 #define    MT_8BIT_A8		           (4<<3)
 #define    MT_8BIT_MONO8	           (5<<3)
-#define    MT_16BIT_RGB565 		   (0<<3) /* SURFACE_16BIT */
+#define    MT_16BIT_RGB565 		   (0<<3)	/* SURFACE_16BIT */
 #define    MT_16BIT_ARGB1555		   (1<<3)
 #define    MT_16BIT_ARGB4444		   (2<<3)
 #define    MT_16BIT_AY88		   (3<<3)
@@ -745,7 +718,7 @@
 #define    MT_16BIT_I16	                   (7<<3)
 #define    MT_16BIT_L16	                   (8<<3)
 #define    MT_16BIT_A16	                   (9<<3)
-#define    MT_32BIT_ARGB8888		   (0<<3) /* SURFACE_32BIT */
+#define    MT_32BIT_ARGB8888		   (0<<3)	/* SURFACE_32BIT */
 #define    MT_32BIT_ABGR8888		   (1<<3)
 #define    MT_32BIT_XRGB8888		   (2<<3)
 #define    MT_32BIT_XBGR8888		   (3<<3)
@@ -761,11 +734,11 @@
 #define    MT_32BIT_xI824	           (0xD<<3)
 #define    MT_32BIT_xA824	           (0xE<<3)
 #define    MT_32BIT_xL824	           (0xF<<3)
-#define    MT_422_YCRCB_SWAPY	           (0<<3) /* SURFACE_422 */
+#define    MT_422_YCRCB_SWAPY	           (0<<3)	/* SURFACE_422 */
 #define    MT_422_YCRCB_NORMAL	           (1<<3)
 #define    MT_422_YCRCB_SWAPUV	           (2<<3)
 #define    MT_422_YCRCB_SWAPUVY	           (3<<3)
-#define    MT_COMPRESS_DXT1		   (0<<3) /* SURFACE_COMPRESSED */
+#define    MT_COMPRESS_DXT1		   (0<<3)	/* SURFACE_COMPRESSED */
 #define    MT_COMPRESS_DXT2_3	           (1<<3)
 #define    MT_COMPRESS_DXT4_5	           (2<<3)
 #define    MT_COMPRESS_FXT1		   (3<<3)
@@ -788,7 +761,7 @@
 #define MS4_MIP_LAYOUT_LEGACY           (0<<8)
 #define MS4_MIP_LAYOUT_BELOW_LPT        (0<<8)
 #define MS4_MIP_LAYOUT_RIGHT_LPT        (1<<8)
-#define MS4_VOLUME_DEPTH_SHIFT          0    
+#define MS4_VOLUME_DEPTH_SHIFT          0
 #define MS4_VOLUME_DEPTH_MASK           (0xff<<0)
 
 /* p244.
@@ -818,7 +791,7 @@
 #define   FILTER_4X4_1    	3
 #define   FILTER_4X4_2    	4
 #define   FILTER_4X4_FLAT 	5
-#define   FILTER_6X5_MONO   	6 /* XXX - check */
+#define   FILTER_6X5_MONO   	6	/* XXX - check */
 #define SS2_MIN_FILTER_SHIFT          14
 #define SS2_MIN_FILTER_MASK           (0x7<<14)
 #define SS2_LOD_BIAS_SHIFT            5
@@ -865,9 +838,7 @@
 #define ST1_ENABLE               (1<<16)
 #define ST1_MASK                 (0xffff)
 
-
 #define FLUSH_MAP_CACHE    (1<<0)
 #define FLUSH_RENDER_CACHE (1<<1)
 
-
 #endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c new/xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c	2011-01-21 10:46:19.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c	2011-02-08 11:14:00.000000000 +0100
@@ -36,538 +36,1164 @@
 #include "i915_3d.h"
 
 struct formatinfo {
-    int fmt;
-    uint32_t card_fmt;
+	int fmt;
+	uint32_t card_fmt;
 };
 
 struct blendinfo {
-    Bool dst_alpha;
-    Bool src_alpha;
-    uint32_t src_blend;
-    uint32_t dst_blend;
+	Bool dst_alpha;
+	Bool src_alpha;
+	uint32_t src_blend;
+	uint32_t dst_blend;
 };
 
 static struct blendinfo i915_blend_op[] = {
-    /* Clear */
-    {0, 0, BLENDFACT_ZERO,          BLENDFACT_ZERO},
-    /* Src */
-    {0, 0, BLENDFACT_ONE,           BLENDFACT_ZERO},
-    /* Dst */
-    {0, 0, BLENDFACT_ZERO,          BLENDFACT_ONE},
-    /* Over */
-    {0, 1, BLENDFACT_ONE,           BLENDFACT_INV_SRC_ALPHA},
-    /* OverReverse */
-    {1, 0, BLENDFACT_INV_DST_ALPHA, BLENDFACT_ONE},
-    /* In */
-    {1, 0, BLENDFACT_DST_ALPHA,     BLENDFACT_ZERO},
-    /* InReverse */
-    {0, 1, BLENDFACT_ZERO,          BLENDFACT_SRC_ALPHA},
-    /* Out */
-    {1, 0, BLENDFACT_INV_DST_ALPHA, BLENDFACT_ZERO},
-    /* OutReverse */
-    {0, 1, BLENDFACT_ZERO,          BLENDFACT_INV_SRC_ALPHA},
-    /* Atop */
-    {1, 1, BLENDFACT_DST_ALPHA,     BLENDFACT_INV_SRC_ALPHA},
-    /* AtopReverse */
-    {1, 1, BLENDFACT_INV_DST_ALPHA, BLENDFACT_SRC_ALPHA},
-    /* Xor */
-    {1, 1, BLENDFACT_INV_DST_ALPHA, BLENDFACT_INV_SRC_ALPHA},
-    /* Add */
-    {0, 0, BLENDFACT_ONE,           BLENDFACT_ONE},
+	/* Clear */
+	{0, 0, BLENDFACT_ZERO, BLENDFACT_ZERO},
+	/* Src */
+	{0, 0, BLENDFACT_ONE, BLENDFACT_ZERO},
+	/* Dst */
+	{0, 0, BLENDFACT_ZERO, BLENDFACT_ONE},
+	/* Over */
+	{0, 1, BLENDFACT_ONE, BLENDFACT_INV_SRC_ALPHA},
+	/* OverReverse */
+	{1, 0, BLENDFACT_INV_DST_ALPHA, BLENDFACT_ONE},
+	/* In */
+	{1, 0, BLENDFACT_DST_ALPHA, BLENDFACT_ZERO},
+	/* InReverse */
+	{0, 1, BLENDFACT_ZERO, BLENDFACT_SRC_ALPHA},
+	/* Out */
+	{1, 0, BLENDFACT_INV_DST_ALPHA, BLENDFACT_ZERO},
+	/* OutReverse */
+	{0, 1, BLENDFACT_ZERO, BLENDFACT_INV_SRC_ALPHA},
+	/* Atop */
+	{1, 1, BLENDFACT_DST_ALPHA, BLENDFACT_INV_SRC_ALPHA},
+	/* AtopReverse */
+	{1, 1, BLENDFACT_INV_DST_ALPHA, BLENDFACT_SRC_ALPHA},
+	/* Xor */
+	{1, 1, BLENDFACT_INV_DST_ALPHA, BLENDFACT_INV_SRC_ALPHA},
+	/* Add */
+	{0, 0, BLENDFACT_ONE, BLENDFACT_ONE},
 };
 
 static struct formatinfo i915_tex_formats[] = {
-    {PICT_a8r8g8b8, MAPSURF_32BIT | MT_32BIT_ARGB8888 },
-    {PICT_x8r8g8b8, MAPSURF_32BIT | MT_32BIT_XRGB8888 },
-    {PICT_a8b8g8r8, MAPSURF_32BIT | MT_32BIT_ABGR8888 },
-    {PICT_x8b8g8r8, MAPSURF_32BIT | MT_32BIT_XBGR8888 },
-    {PICT_r5g6b5,   MAPSURF_16BIT | MT_16BIT_RGB565   },
-    {PICT_a1r5g5b5, MAPSURF_16BIT | MT_16BIT_ARGB1555 },
-    {PICT_x1r5g5b5, MAPSURF_16BIT | MT_16BIT_ARGB1555 },
-    {PICT_a4r4g4b4, MAPSURF_16BIT | MT_16BIT_ARGB4444 },
-    {PICT_x4r4g4b4, MAPSURF_16BIT | MT_16BIT_ARGB4444 },
-    {PICT_a8,       MAPSURF_8BIT | MT_8BIT_A8 	  },
+	{PICT_a8r8g8b8, MAPSURF_32BIT | MT_32BIT_ARGB8888},
+	{PICT_x8r8g8b8, MAPSURF_32BIT | MT_32BIT_XRGB8888},
+	{PICT_a8b8g8r8, MAPSURF_32BIT | MT_32BIT_ABGR8888},
+	{PICT_x8b8g8r8, MAPSURF_32BIT | MT_32BIT_XBGR8888},
+	{PICT_r5g6b5, MAPSURF_16BIT | MT_16BIT_RGB565},
+	{PICT_a1r5g5b5, MAPSURF_16BIT | MT_16BIT_ARGB1555},
+	{PICT_x1r5g5b5, MAPSURF_16BIT | MT_16BIT_ARGB1555},
+	{PICT_a4r4g4b4, MAPSURF_16BIT | MT_16BIT_ARGB4444},
+	{PICT_x4r4g4b4, MAPSURF_16BIT | MT_16BIT_ARGB4444},
+	{PICT_a8, MAPSURF_8BIT | MT_8BIT_A8},
 };
 
-static uint32_t i915_get_blend_cntl(int op, PicturePtr pMask,
+static uint32_t i915_get_blend_cntl(int op, PicturePtr mask,
 				    uint32_t dst_format)
 {
-    uint32_t sblend, dblend;
+	uint32_t sblend, dblend;
 
-    sblend = i915_blend_op[op].src_blend;
-    dblend = i915_blend_op[op].dst_blend;
+	sblend = i915_blend_op[op].src_blend;
+	dblend = i915_blend_op[op].dst_blend;
 
-    /* If there's no dst alpha channel, adjust the blend op so that we'll treat
-     * it as always 1.
-     */
-    if (PICT_FORMAT_A(dst_format) == 0 && i915_blend_op[op].dst_alpha) {
-        if (sblend == BLENDFACT_DST_ALPHA)
-            sblend = BLENDFACT_ONE;
-        else if (sblend == BLENDFACT_INV_DST_ALPHA)
-            sblend = BLENDFACT_ZERO;
-    }
-
-    /* i915 engine reads 8bit color buffer into green channel in cases
-       like color buffer blending .etc, and also writes back green channel.
-       So with dst_alpha blend we should use color factor. See spec on
-       "8-bit rendering" */
-    if ((dst_format == PICT_a8) && i915_blend_op[op].dst_alpha) {
-        if (sblend == BLENDFACT_DST_ALPHA)
-            sblend = BLENDFACT_DST_COLR;
-        else if (sblend == BLENDFACT_INV_DST_ALPHA)
-            sblend = BLENDFACT_INV_DST_COLR;
-    }
-
-    /* If the source alpha is being used, then we should only be in a case
-     * where the source blend factor is 0, and the source blend value is the
-     * mask channels multiplied by the source picture's alpha.
-     */
-    if (pMask && pMask->componentAlpha && PICT_FORMAT_RGB(pMask->format) &&
-	i915_blend_op[op].src_alpha)
-    {
-        if (dblend == BLENDFACT_SRC_ALPHA) {
-	    dblend = BLENDFACT_SRC_COLR;
-        } else if (dblend == BLENDFACT_INV_SRC_ALPHA) {
-	    dblend = BLENDFACT_INV_SRC_COLR;
-        }
-    }
-
-    return (sblend << S6_CBUF_SRC_BLEND_FACT_SHIFT) |
-	(dblend << S6_CBUF_DST_BLEND_FACT_SHIFT);
-}
-
-static Bool i915_get_dest_format(PicturePtr pDstPicture, uint32_t *dst_format)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
-
-    switch (pDstPicture->format) {
-    case PICT_a8r8g8b8:
-    case PICT_x8r8g8b8:
-        *dst_format = COLR_BUF_ARGB8888;
-        break;
-    case PICT_r5g6b5:
-        *dst_format = COLR_BUF_RGB565;
-        break;
-    case PICT_a1r5g5b5:
-    case PICT_x1r5g5b5:
-        *dst_format = COLR_BUF_ARGB1555;
-        break;
-    case PICT_a8:
-        *dst_format = COLR_BUF_8BIT;
-        break;
-    case PICT_a4r4g4b4:
-    case PICT_x4r4g4b4:
-	*dst_format = COLR_BUF_ARGB4444;
-	break;
-    default:
-        I830FALLBACK("Unsupported dest format 0x%x\n",
-		     (int)pDstPicture->format);
-    }
+	/* If there's no dst alpha channel, adjust the blend op so that we'll
+	 * treat it as always 1.
+	 */
+	if (PICT_FORMAT_A(dst_format) == 0 && i915_blend_op[op].dst_alpha) {
+		if (sblend == BLENDFACT_DST_ALPHA)
+			sblend = BLENDFACT_ONE;
+		else if (sblend == BLENDFACT_INV_DST_ALPHA)
+			sblend = BLENDFACT_ZERO;
+	}
+
+	/* i915 engine reads 8bit color buffer into green channel in cases
+	   like color buffer blending .etc, and also writes back green channel.
+	   So with dst_alpha blend we should use color factor. See spec on
+	   "8-bit rendering" */
+	if ((dst_format == PICT_a8) && i915_blend_op[op].dst_alpha) {
+		if (sblend == BLENDFACT_DST_ALPHA)
+			sblend = BLENDFACT_DST_COLR;
+		else if (sblend == BLENDFACT_INV_DST_ALPHA)
+			sblend = BLENDFACT_INV_DST_COLR;
+	}
+
+	/* If the source alpha is being used, then we should only be in a case
+	 * where the source blend factor is 0, and the source blend value is the
+	 * mask channels multiplied by the source picture's alpha.
+	 */
+	if (mask && mask->componentAlpha && PICT_FORMAT_RGB(mask->format) &&
+	    i915_blend_op[op].src_alpha) {
+		if (dblend == BLENDFACT_SRC_ALPHA) {
+			dblend = BLENDFACT_SRC_COLR;
+		} else if (dblend == BLENDFACT_INV_SRC_ALPHA) {
+			dblend = BLENDFACT_INV_SRC_COLR;
+		}
+	}
 
-    return TRUE;
+	return S6_CBUF_BLEND_ENABLE | S6_COLOR_WRITE_ENABLE |
+		(BLENDFUNC_ADD << S6_CBUF_BLEND_FUNC_SHIFT) |
+		(sblend << S6_CBUF_SRC_BLEND_FACT_SHIFT) |
+		(dblend << S6_CBUF_DST_BLEND_FACT_SHIFT);
 }
 
-static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
-{
-    if (pPict->pDrawable == NULL)
-	return FALSE;
+#define DSTORG_HORT_BIAS(x)             ((x)<<20)
+#define DSTORG_VERT_BIAS(x)             ((x)<<16)
 
-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-    int w = pPict->pDrawable->width;
-    int h = pPict->pDrawable->height;
-    int i;
-
-    if ((w > 2048) || (h > 2048))
-        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-
-    for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
-	 i++)
-    {
-        if (i915_tex_formats[i].fmt == pPict->format)
-            break;
-    }
-    if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
-        I830FALLBACK("Unsupported picture format 0x%x\n",
-		     (int)pPict->format);
-
-    if (pPict->repeatType > RepeatReflect)
-        I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
-
-    if (pPict->filter != PictFilterNearest &&
-        pPict->filter != PictFilterBilinear)
-        I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+static Bool i915_get_dest_format(PicturePtr dest_picture, uint32_t * dst_format)
+{
+	ScrnInfoPtr scrn;
 
-    return TRUE;
+	switch (dest_picture->format) {
+	case PICT_a8r8g8b8:
+	case PICT_x8r8g8b8:
+		*dst_format = COLR_BUF_ARGB8888;
+		break;
+	case PICT_r5g6b5:
+		*dst_format = COLR_BUF_RGB565;
+		break;
+	case PICT_a1r5g5b5:
+	case PICT_x1r5g5b5:
+		*dst_format = COLR_BUF_ARGB1555;
+		break;
+	case PICT_a8:
+		*dst_format = COLR_BUF_8BIT;
+		break;
+	case PICT_a4r4g4b4:
+	case PICT_x4r4g4b4:
+		*dst_format = COLR_BUF_ARGB4444;
+		break;
+	default:
+		scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+		intel_debug_fallback(scrn,
+				     "Unsupported dest format 0x%x\n",
+				     (int)dest_picture->format);
+		return FALSE;
+	}
+	*dst_format |= DSTORG_HORT_BIAS(0x8) | DSTORG_VERT_BIAS(0x8);
+	return TRUE;
 }
 
 Bool
-i915_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
-		     PicturePtr pDstPicture)
+i915_check_composite(int op,
+		     PicturePtr source_picture,
+		     PicturePtr mask_picture,
+		     PicturePtr dest_picture,
+		     int width, int height)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
-    uint32_t tmp1;
+	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+	uint32_t tmp1;
 
-    /* Check for unsupported compositing operations. */
-    if (op >= sizeof(i915_blend_op) / sizeof(i915_blend_op[0]))
-        I830FALLBACK("Unsupported Composite op 0x%x\n", op);
-    if (pMaskPicture != NULL && pMaskPicture->componentAlpha &&
-	PICT_FORMAT_RGB(pMaskPicture->format))
-    {
-        /* Check if it's component alpha that relies on a source alpha and on
-         * the source value.  We can only get one of those into the single
-         * source value that we get to blend with.
-         */
-        if (i915_blend_op[op].src_alpha &&
-            (i915_blend_op[op].src_blend != BLENDFACT_ZERO))
-            	I830FALLBACK("Component alpha not supported with source "
-			     "alpha and source value blending.\n");
-    }
-
-    if (!i915_check_composite_texture(pSrcPicture, 0))
-        I830FALLBACK("Check Src picture texture\n");
-    if (pMaskPicture != NULL && !i915_check_composite_texture(pMaskPicture, 1))
-        I830FALLBACK("Check Mask picture texture\n");
-
-    if (!i915_get_dest_format(pDstPicture, &tmp1))
-	I830FALLBACK("Get Color buffer format\n");
-
-    return TRUE;
-}
-
-static Bool
-i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t format, pitch, filter;
-    int w, h, i;
-    uint32_t wrap_mode;
-
-    pitch = intel_get_pixmap_pitch(pPix);
-    w = pPict->pDrawable->width;
-    h = pPict->pDrawable->height;
-    pI830->scale_units[unit][0] = pPix->drawable.width;
-    pI830->scale_units[unit][1] = pPix->drawable.height;
-
-    for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
-	 i++)
-    {
-        if (i915_tex_formats[i].fmt == pPict->format)
-	    break;
-    }
-    if (i == sizeof(i915_tex_formats)/ sizeof(i915_tex_formats[0]))
-	I830FALLBACK("unknown texture format\n");
-    format = i915_tex_formats[i].card_fmt;
-
-    switch (pPict->repeatType) {
-    case RepeatNone:
-	wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
-	break;
-    case RepeatNormal:
-	wrap_mode = TEXCOORDMODE_WRAP;
-	break;
-    case RepeatPad:
-	wrap_mode = TEXCOORDMODE_CLAMP_EDGE;
-	break;
-    case RepeatReflect:
-	wrap_mode = TEXCOORDMODE_MIRROR;
-	break;
-    default:
-	FatalError("Unkown repeat type %d\n", pPict->repeatType);
-    }
-
-    switch (pPict->filter) {
-    case PictFilterNearest:
-        filter = (FILTER_NEAREST << SS2_MAG_FILTER_SHIFT) |
-	    (FILTER_NEAREST << SS2_MIN_FILTER_SHIFT);
-        break;
-    case PictFilterBilinear:
-        filter = (FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
-	    (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT);
-        break;
-    default:
-	filter = 0;
-        I830FALLBACK("Bad filter 0x%x\n", pPict->filter);
-    }
-
-    pI830->mapstate[unit * 3 + 0] = 0; /* offset filled in at emit time */
-    pI830->mapstate[unit * 3 + 1] = format |
-	MS3_USE_FENCE_REGS |
-	((pPix->drawable.height - 1) << MS3_HEIGHT_SHIFT) |
-	((pPix->drawable.width - 1) << MS3_WIDTH_SHIFT);
-    pI830->mapstate[unit * 3 + 2] = ((pitch / 4) - 1) << MS4_PITCH_SHIFT;
-
-    pI830->samplerstate[unit * 3 + 0] = (MIPFILTER_NONE <<
-					 SS2_MIP_FILTER_SHIFT);
-    pI830->samplerstate[unit * 3 + 0] |= filter;
-    pI830->samplerstate[unit * 3 + 1] = SS3_NORMALIZED_COORDS;
-    pI830->samplerstate[unit * 3 + 1] |= wrap_mode << SS3_TCX_ADDR_MODE_SHIFT;
-    pI830->samplerstate[unit * 3 + 1] |= wrap_mode << SS3_TCY_ADDR_MODE_SHIFT;
-    pI830->samplerstate[unit * 3 + 1] |= unit << SS3_TEXTUREMAP_INDEX_SHIFT;
-    pI830->samplerstate[unit * 3 + 2] = 0x00000000; /* border color */
+	/* Check for unsupported compositing operations. */
+	if (op >= sizeof(i915_blend_op) / sizeof(i915_blend_op[0])) {
+		intel_debug_fallback(scrn, "Unsupported Composite op 0x%x\n",
+				     op);
+		return FALSE;
+	}
+	if (mask_picture != NULL && mask_picture->componentAlpha &&
+	    PICT_FORMAT_RGB(mask_picture->format)) {
+		/* Check if it's component alpha that relies on a source alpha
+		 * and on the source value.  We can only get one of those
+		 * into the single source value that we get to blend with.
+		 */
+		if (i915_blend_op[op].src_alpha &&
+		    (i915_blend_op[op].src_blend != BLENDFACT_ZERO)) {
+			if (op != PictOpOver) {
+				intel_debug_fallback(scrn,
+						     "Component alpha not supported "
+						     "with source alpha and source "
+						     "value blending.\n");
+				return FALSE;
+			}
+		}
+	}
+
+	if (!i915_get_dest_format(dest_picture, &tmp1)) {
+		intel_debug_fallback(scrn, "Get Color buffer format\n");
+		return FALSE;
+	}
 
-    pI830->transform[unit] = pPict->transform;
+	if (width > 2048 || height > 2048)
+		return FALSE;
 
-    return TRUE;
+	return TRUE;
 }
 
 Bool
-i915_prepare_composite(int op, PicturePtr pSrcPicture,
-		       PicturePtr pMaskPicture, PicturePtr pDstPicture,
-		       PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    drm_intel_bo *bo_table[] = {
-	NULL, /* batch_bo */
-	i830_get_pixmap_bo(pSrc),
-	pMask ? i830_get_pixmap_bo(pMask) : NULL,
-	i830_get_pixmap_bo(pDst),
-    };
-
-    i830_exa_check_pitch_3d(pSrc);
-    if (pMask)
-	i830_exa_check_pitch_3d(pMask);
-    i830_exa_check_pitch_3d(pDst);
+i915_check_composite_target(PixmapPtr pixmap)
+{
+	if (pixmap->drawable.width > 2048 || pixmap->drawable.height > 2048)
+		return FALSE;
 
-    if (!i915_get_dest_format(pDstPicture,
-			      &pI830->i915_render_state.dst_format))
-	return FALSE;
+	if(!intel_check_pitch_3d(pixmap))
+		return FALSE;
+
+	return TRUE;
+}
+
+Bool
+i915_check_composite_texture(ScreenPtr screen, PicturePtr picture)
+{
+	if (picture->repeatType > RepeatReflect) {
+		ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+		intel_debug_fallback(scrn, "Unsupported picture repeat %d\n",
+			     picture->repeatType);
+		return FALSE;
+	}
+
+	if (picture->filter != PictFilterNearest &&
+	    picture->filter != PictFilterBilinear) {
+		ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+		intel_debug_fallback(scrn, "Unsupported filter 0x%x\n",
+				     picture->filter);
+		return FALSE;
+	}
+
+	if (picture->pSourcePict) {
+		SourcePict *source = picture->pSourcePict;
+		if (source->type == SourcePictTypeSolidFill)
+			return TRUE;
+	}
+
+	if (picture->pDrawable) {
+		int w, h, i;
+
+		w = picture->pDrawable->width;
+		h = picture->pDrawable->height;
+		if ((w > 2048) || (h > 2048)) {
+			ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+			intel_debug_fallback(scrn,
+					     "Picture w/h too large (%dx%d)\n",
+					     w, h);
+			return FALSE;
+		}
+
+		for (i = 0;
+		     i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
+		     i++) {
+			if (i915_tex_formats[i].fmt == picture->format)
+				break;
+		}
+		if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
+		{
+			ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+			intel_debug_fallback(scrn, "Unsupported picture format "
+					     "0x%x\n",
+					     (int)picture->format);
+			return FALSE;
+		}
+
+		return TRUE;
+	}
 
-    if (!i830_get_aperture_space(pScrn, bo_table, ARRAY_SIZE(bo_table)))
 	return FALSE;
+}
+
+static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit)
+{
+	ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint32_t format, pitch, filter;
+	int w, h, i;
+	uint32_t wrap_mode, tiling_bits;
+
+	pitch = intel_get_pixmap_pitch(pixmap);
+	w = picture->pDrawable->width;
+	h = picture->pDrawable->height;
+	intel->scale_units[unit][0] = 1. / pixmap->drawable.width;
+	intel->scale_units[unit][1] = 1. / pixmap->drawable.height;
+
+	for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
+	     i++) {
+		if (i915_tex_formats[i].fmt == picture->format)
+			break;
+	}
+	if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0])) {
+		intel_debug_fallback(scrn, "unknown texture format\n");
+		return FALSE;
+	}
+	format = i915_tex_formats[i].card_fmt;
+
+	switch (picture->repeatType) {
+	case RepeatNone:
+		wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
+		break;
+	case RepeatNormal:
+		wrap_mode = TEXCOORDMODE_WRAP;
+		break;
+	case RepeatPad:
+		wrap_mode = TEXCOORDMODE_CLAMP_EDGE;
+		break;
+	case RepeatReflect:
+		wrap_mode = TEXCOORDMODE_MIRROR;
+		break;
+	default:
+		FatalError("Unknown repeat type %d\n", picture->repeatType);
+	}
+
+	switch (picture->filter) {
+	case PictFilterNearest:
+		filter = (FILTER_NEAREST << SS2_MAG_FILTER_SHIFT) |
+		    (FILTER_NEAREST << SS2_MIN_FILTER_SHIFT);
+		break;
+	case PictFilterBilinear:
+		filter = (FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
+		    (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT);
+		break;
+	default:
+		filter = 0;
+		intel_debug_fallback(scrn, "Bad filter 0x%x\n",
+				     picture->filter);
+		return FALSE;
+	}
 
-    pI830->i915_render_state.is_nearest = FALSE;
-    if (!i915_texture_setup(pSrcPicture, pSrc, 0))
-	I830FALLBACK("fail to setup src texture\n");
-    if (pSrcPicture->filter == PictFilterNearest)
-	pI830->i915_render_state.is_nearest = TRUE;
-    if (pMask != NULL) {
-	if (!i915_texture_setup(pMaskPicture, pMask, 1))
-	    I830FALLBACK("fail to setup mask texture\n");
-	if (pMaskPicture->filter == PictFilterNearest)
-	    pI830->i915_render_state.is_nearest = TRUE;
-    } else {
-	pI830->transform[1] = NULL;
-	pI830->scale_units[1][0] = -1;
-	pI830->scale_units[1][1] = -1;
-    }
-
-    pI830->i915_render_state.op = op;
-    pI830->i915_render_state.pSrcPicture = pSrcPicture;
-    pI830->i915_render_state.pMaskPicture = pMaskPicture;
-    pI830->i915_render_state.pDstPicture = pDstPicture;
-    pI830->i915_render_state.pSrc = pSrc;
-    pI830->i915_render_state.pMask = pMask;
-    pI830->i915_render_state.pDst = pDst;
-    pI830->i915_render_state.needs_emit = TRUE;
+	/* offset filled in at emit time */
+	if (i830_pixmap_tiled(pixmap)) {
+		tiling_bits = MS3_TILED_SURFACE;
+		if (i830_get_pixmap_intel(pixmap)->tiling
+				== I915_TILING_Y)
+			tiling_bits |= MS3_TILE_WALK;
+	} else
+		tiling_bits = 0;
+
+	intel->texture[unit] = pixmap;
+	intel->mapstate[unit * 3 + 0] = 0;
+	intel->mapstate[unit * 3 + 1] = format |
+	    tiling_bits |
+	    ((pixmap->drawable.height - 1) << MS3_HEIGHT_SHIFT) |
+	    ((pixmap->drawable.width - 1) << MS3_WIDTH_SHIFT);
+	intel->mapstate[unit * 3 + 2] = ((pitch / 4) - 1) << MS4_PITCH_SHIFT;
+
+	intel->samplerstate[unit * 3 + 0] = (MIPFILTER_NONE <<
+					     SS2_MIP_FILTER_SHIFT);
+	intel->samplerstate[unit * 3 + 0] |= filter;
+	intel->samplerstate[unit * 3 + 1] = SS3_NORMALIZED_COORDS;
+	intel->samplerstate[unit * 3 + 1] |=
+	    wrap_mode << SS3_TCX_ADDR_MODE_SHIFT;
+	intel->samplerstate[unit * 3 + 1] |=
+	    wrap_mode << SS3_TCY_ADDR_MODE_SHIFT;
+	intel->samplerstate[unit * 3 + 1] |= unit << SS3_TEXTUREMAP_INDEX_SHIFT;
+	intel->samplerstate[unit * 3 + 2] = 0x00000000;	/* border color */
 
-    return TRUE;
+	intel->transform[unit] = picture->transform;
+
+	return TRUE;
 }
 
 static void
-i915_emit_composite_setup(ScrnInfoPtr pScrn)
+i915_emit_composite_primitive_constant(PixmapPtr dest,
+				       int srcX, int srcY,
+				       int maskX, int maskY,
+				       int dstX, int dstY,
+				       int w, int h)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int op = pI830->i915_render_state.op;
-    PicturePtr pSrcPicture = pI830->i915_render_state.pSrcPicture;
-    PicturePtr pMaskPicture = pI830->i915_render_state.pMaskPicture;
-    PicturePtr pDstPicture = pI830->i915_render_state.pDstPicture;
-    PixmapPtr pSrc = pI830->i915_render_state.pSrc;
-    PixmapPtr pMask = pI830->i915_render_state.pMask;
-    PixmapPtr pDst = pI830->i915_render_state.pDst;
-    uint32_t dst_format = pI830->i915_render_state.dst_format, dst_pitch;
-    uint32_t blendctl;
-    int out_reg = FS_OC;
-    FS_LOCALS(20);
-    Bool is_affine_src, is_affine_mask;
-    Bool is_nearest = pI830->i915_render_state.is_nearest;
-
-    pI830->i915_render_state.needs_emit = FALSE;
-
-    IntelEmitInvarientState(pScrn);
-    pI830->last_3d = LAST_3D_RENDER;
-
-    dst_pitch = intel_get_pixmap_pitch(pDst);
-
-    is_affine_src = i830_transform_is_affine (pI830->transform[0]);
-    is_affine_mask = i830_transform_is_affine (pI830->transform[1]);
-
-    if (is_nearest)
-	pI830->coord_adjust = -0.125;
-    else
-	pI830->coord_adjust = 0;
-
-    if (pMask == NULL) {
-	BEGIN_BATCH(10);
-	OUT_BATCH(_3DSTATE_MAP_STATE | 3);
-	OUT_BATCH(0x00000001); /* map 0 */
-	OUT_RELOC_PIXMAP(pSrc, I915_GEM_DOMAIN_SAMPLER, 0, 0);
-	OUT_BATCH(pI830->mapstate[1]);
-	OUT_BATCH(pI830->mapstate[2]);
-
-	OUT_BATCH(_3DSTATE_SAMPLER_STATE | 3);
-	OUT_BATCH(0x00000001); /* sampler 0 */
-	OUT_BATCH(pI830->samplerstate[0]);
-	OUT_BATCH(pI830->samplerstate[1]);
-	OUT_BATCH(pI830->samplerstate[2]);
-	ADVANCE_BATCH();
-    } else {
-	BEGIN_BATCH(16);
-	OUT_BATCH(_3DSTATE_MAP_STATE | 6);
-	OUT_BATCH(0x00000003); /* map 0,1 */
-	OUT_RELOC_PIXMAP(pSrc, I915_GEM_DOMAIN_SAMPLER, 0, 0);
-	OUT_BATCH(pI830->mapstate[1]);
-	OUT_BATCH(pI830->mapstate[2]);
-	OUT_RELOC_PIXMAP(pMask, I915_GEM_DOMAIN_SAMPLER, 0, 0);
-	OUT_BATCH(pI830->mapstate[4]);
-	OUT_BATCH(pI830->mapstate[5]);
-
-	OUT_BATCH(_3DSTATE_SAMPLER_STATE | 6);
-	OUT_BATCH(0x00000003); /* sampler 0,1 */
-	OUT_BATCH(pI830->samplerstate[0]);
-	OUT_BATCH(pI830->samplerstate[1]);
-	OUT_BATCH(pI830->samplerstate[2]);
-	OUT_BATCH(pI830->samplerstate[3]);
-	OUT_BATCH(pI830->samplerstate[4]);
-	OUT_BATCH(pI830->samplerstate[5]);
-	ADVANCE_BATCH();
-    }
-    {
-	uint32_t ss2;
-
-	BEGIN_BATCH(16);
-	OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
-	OUT_BATCH(BUF_3D_ID_COLOR_BACK| BUF_3D_USE_FENCE|
-		  BUF_3D_PITCH(dst_pitch));
-	OUT_RELOC_PIXMAP(pDst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
-
-	OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
-	OUT_BATCH(dst_format);
-
-	OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) |
-		  I1_LOAD_S(4) | I1_LOAD_S(5) | I1_LOAD_S(6) | 3);
-	ss2 = S2_TEXCOORD_FMT(0, is_affine_src ? TEXCOORDFMT_2D : TEXCOORDFMT_4D);
-	if (pMask)
-		ss2 |= S2_TEXCOORD_FMT(1, is_affine_mask ? TEXCOORDFMT_2D : TEXCOORDFMT_4D);
-	else
-		ss2 |= S2_TEXCOORD_FMT(1, TEXCOORDFMT_NOT_PRESENT);
-	ss2 |= S2_TEXCOORD_FMT(2, TEXCOORDFMT_NOT_PRESENT);
-	ss2 |= S2_TEXCOORD_FMT(3, TEXCOORDFMT_NOT_PRESENT);
-	ss2 |= S2_TEXCOORD_FMT(4, TEXCOORDFMT_NOT_PRESENT);
-	ss2 |= S2_TEXCOORD_FMT(5, TEXCOORDFMT_NOT_PRESENT);
-	ss2 |= S2_TEXCOORD_FMT(6, TEXCOORDFMT_NOT_PRESENT);
-	ss2 |= S2_TEXCOORD_FMT(7, TEXCOORDFMT_NOT_PRESENT);
-	OUT_BATCH(ss2);
-	OUT_BATCH((1 << S4_POINT_WIDTH_SHIFT) | S4_LINE_WIDTH_ONE |
-		  S4_CULLMODE_NONE| S4_VFMT_XY);
-	blendctl = i915_get_blend_cntl(op, pMaskPicture, pDstPicture->format);
-	OUT_BATCH(0x00000000); /* Disable stencil buffer */
-	OUT_BATCH(S6_CBUF_BLEND_ENABLE | S6_COLOR_WRITE_ENABLE |
-		  (BLENDFUNC_ADD << S6_CBUF_BLEND_FUNC_SHIFT) | blendctl);
-
-	/* draw rect is unconditional */
-	OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
-	OUT_BATCH(0x00000000);
-	OUT_BATCH(0x00000000);  /* ymin, xmin*/
-	OUT_BATCH(DRAW_YMAX(pDst->drawable.height - 1) |
-		  DRAW_XMAX(pDst->drawable.width - 1));
-	OUT_BATCH(0x00000000);  /* yorig, xorig (relate to color buffer?)*/
-	OUT_BATCH(MI_NOOP);
-	ADVANCE_BATCH();
-    }
-
-    if (dst_format == COLR_BUF_8BIT)
-	out_reg = FS_U0;
-
-    FS_BEGIN();
-
-    /* Declare the registers necessary for our program.  I don't think the
-     * S then T ordering is necessary.
-     */
-    i915_fs_dcl(FS_S0);
-    if (pMask)
-	i915_fs_dcl(FS_S1);
-    i915_fs_dcl(FS_T0);
-    if (pMask)
-	i915_fs_dcl(FS_T1);
-
-    /* Load the pSrcPicture texel */
-    if (is_affine_src) {
-	i915_fs_texld(FS_R0, FS_S0, FS_T0);
-    } else {
-	i915_fs_texldp(FS_R0, FS_S0, FS_T0);
-    }
-
-    /* If the texture lacks an alpha channel, force the alpha to 1. */
-    if (PICT_FORMAT_A(pSrcPicture->format) == 0)
-	i915_fs_mov_masked(FS_R0, MASK_W, i915_fs_operand_one());
-
-    if (!pMask) {
-	/* No mask, so move to output color */
-	i915_fs_mov(out_reg, i915_fs_operand_reg(FS_R0));
-    } else {
-	/* Load the pMaskPicture texel */
-	if (is_affine_mask) {
-	    i915_fs_texld(FS_R1, FS_S1, FS_T1);
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	OUT_VERTEX(dstX + w);
+	OUT_VERTEX(dstY + h);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY + h);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY);
+}
+
+static void
+i915_emit_composite_primitive_identity_source(PixmapPtr dest,
+					      int srcX, int srcY,
+					      int maskX, int maskY,
+					      int dstX, int dstY,
+					      int w, int h)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	OUT_VERTEX(dstX + w);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX((srcX + w) * intel->scale_units[0][0]);
+	OUT_VERTEX((srcY + h) * intel->scale_units[0][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX(srcX * intel->scale_units[0][0]);
+	OUT_VERTEX((srcY + h) * intel->scale_units[0][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY);
+	OUT_VERTEX(srcX * intel->scale_units[0][0]);
+	OUT_VERTEX(srcY * intel->scale_units[0][1]);
+}
+
+static void
+i915_emit_composite_primitive_affine_source(PixmapPtr dest,
+					    int srcX, int srcY,
+					    int maskX, int maskY,
+					    int dstX, int dstY,
+					    int w, int h)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	float src_x[3], src_y[3];
+
+	if (!i830_get_transformed_coordinates(srcX, srcY,
+					      intel->transform[0],
+					      &src_x[0],
+					      &src_y[0]))
+		return;
+
+	if (!i830_get_transformed_coordinates(srcX, srcY + h,
+					      intel->transform[0],
+					      &src_x[1],
+					      &src_y[1]))
+		return;
+
+	if (!i830_get_transformed_coordinates(srcX + w, srcY + h,
+					      intel->transform[0],
+					      &src_x[2],
+					      &src_y[2]))
+		return;
+
+	OUT_VERTEX(dstX + w);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX(src_x[2] * intel->scale_units[0][0]);
+	OUT_VERTEX(src_y[2] * intel->scale_units[0][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX(src_x[1] * intel->scale_units[0][0]);
+	OUT_VERTEX(src_y[1] * intel->scale_units[0][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY);
+	OUT_VERTEX(src_x[0] * intel->scale_units[0][0]);
+	OUT_VERTEX(src_y[0] * intel->scale_units[0][1]);
+}
+
+static void
+i915_emit_composite_primitive_constant_identity_mask(PixmapPtr dest,
+						     int srcX, int srcY,
+						     int maskX, int maskY,
+						     int dstX, int dstY,
+						     int w, int h)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	OUT_VERTEX(dstX + w);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX((maskX + w) * intel->scale_units[0][0]);
+	OUT_VERTEX((maskY + h) * intel->scale_units[0][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX(maskX * intel->scale_units[0][0]);
+	OUT_VERTEX((maskY + h) * intel->scale_units[0][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY);
+	OUT_VERTEX(maskX * intel->scale_units[0][0]);
+	OUT_VERTEX(maskY * intel->scale_units[0][1]);
+}
+
+static void
+i915_emit_composite_primitive_identity_source_mask(PixmapPtr dest,
+						   int srcX, int srcY,
+						   int maskX, int maskY,
+						   int dstX, int dstY,
+						   int w, int h)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	OUT_VERTEX(dstX + w);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX((srcX + w) * intel->scale_units[0][0]);
+	OUT_VERTEX((srcY + h) * intel->scale_units[0][1]);
+	OUT_VERTEX((maskX + w) * intel->scale_units[1][0]);
+	OUT_VERTEX((maskY + h) * intel->scale_units[1][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY + h);
+	OUT_VERTEX(srcX * intel->scale_units[0][0]);
+	OUT_VERTEX((srcY + h) * intel->scale_units[0][1]);
+	OUT_VERTEX(maskX * intel->scale_units[1][0]);
+	OUT_VERTEX((maskY + h) * intel->scale_units[1][1]);
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY);
+	OUT_VERTEX(srcX * intel->scale_units[0][0]);
+	OUT_VERTEX(srcY * intel->scale_units[0][1]);
+	OUT_VERTEX(maskX * intel->scale_units[1][0]);
+	OUT_VERTEX(maskY * intel->scale_units[1][1]);
+}
+
+static void
+i915_emit_composite_primitive(PixmapPtr dest,
+			      int srcX, int srcY,
+			      int maskX, int maskY,
+			      int dstX, int dstY,
+			      int w, int h)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	Bool is_affine_src, is_affine_mask = TRUE;
+	int per_vertex, num_floats;
+	int tex_unit = 0;
+	int src_unit = -1, mask_unit = -1;
+	float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
+
+	per_vertex = 2;		/* dest x/y */
+
+	if (! intel->render_source_is_solid) {
+		src_unit = tex_unit++;
+
+		is_affine_src = i830_transform_is_affine(intel->transform[src_unit]);
+		if (is_affine_src) {
+			if (!i830_get_transformed_coordinates(srcX, srcY,
+							      intel->
+							      transform[src_unit],
+							      &src_x[0],
+							      &src_y[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates(srcX, srcY + h,
+							      intel->
+							      transform[src_unit],
+							      &src_x[1],
+							      &src_y[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates(srcX + w, srcY + h,
+							      intel->
+							      transform[src_unit],
+							      &src_x[2],
+							      &src_y[2]))
+				return;
+
+			per_vertex += 2;	/* src x/y */
+		} else {
+			if (!i830_get_transformed_coordinates_3d(srcX, srcY,
+								 intel->
+								 transform[src_unit],
+								 &src_x[0],
+								 &src_y[0],
+								 &src_w[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(srcX, srcY + h,
+								 intel->
+								 transform[src_unit],
+								 &src_x[1],
+								 &src_y[1],
+								 &src_w[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(srcX + w, srcY + h,
+								 intel->
+								 transform[src_unit],
+								 &src_x[2],
+								 &src_y[2],
+								 &src_w[2]))
+				return;
+
+			per_vertex += 4;	/* src x/y/z/w */
+		}
+	}
+
+	if (intel->render_mask && ! intel->render_mask_is_solid) {
+		mask_unit = tex_unit++;
+
+		is_affine_mask = i830_transform_is_affine(intel->transform[mask_unit]);
+		if (is_affine_mask) {
+			if (!i830_get_transformed_coordinates(maskX, maskY,
+							      intel->
+							      transform[mask_unit],
+							      &mask_x[0],
+							      &mask_y[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates(maskX, maskY + h,
+							      intel->
+							      transform[mask_unit],
+							      &mask_x[1],
+							      &mask_y[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates(maskX + w, maskY + h,
+							      intel->
+							      transform[mask_unit],
+							      &mask_x[2],
+							      &mask_y[2]))
+				return;
+
+			per_vertex += 2;	/* mask x/y */
+		} else {
+			if (!i830_get_transformed_coordinates_3d(maskX, maskY,
+								 intel->
+								 transform[mask_unit],
+								 &mask_x[0],
+								 &mask_y[0],
+								 &mask_w[0]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(maskX, maskY + h,
+								 intel->
+								 transform[mask_unit],
+								 &mask_x[1],
+								 &mask_y[1],
+								 &mask_w[1]))
+				return;
+
+			if (!i830_get_transformed_coordinates_3d(maskX + w, maskY + h,
+								 intel->
+								 transform[mask_unit],
+								 &mask_x[2],
+								 &mask_y[2],
+								 &mask_w[2]))
+				return;
+
+			per_vertex += 4;	/* mask x/y/z/w */
+		}
+	}
+
+	num_floats = 3 * per_vertex;
+
+	OUT_VERTEX(dstX + w);
+	OUT_VERTEX(dstY + h);
+	if (! intel->render_source_is_solid) {
+	    OUT_VERTEX(src_x[2] * intel->scale_units[src_unit][0]);
+	    OUT_VERTEX(src_y[2] * intel->scale_units[src_unit][1]);
+	    if (!is_affine_src) {
+		OUT_VERTEX(0.0);
+		OUT_VERTEX(src_w[2]);
+	    }
+	}
+	if (intel->render_mask && ! intel->render_mask_is_solid) {
+		OUT_VERTEX(mask_x[2] * intel->scale_units[mask_unit][0]);
+		OUT_VERTEX(mask_y[2] * intel->scale_units[mask_unit][1]);
+		if (!is_affine_mask) {
+			OUT_VERTEX(0.0);
+			OUT_VERTEX(mask_w[2]);
+		}
+	}
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY + h);
+	if (! intel->render_source_is_solid) {
+	    OUT_VERTEX(src_x[1] * intel->scale_units[src_unit][0]);
+	    OUT_VERTEX(src_y[1] * intel->scale_units[src_unit][1]);
+	    if (!is_affine_src) {
+		OUT_VERTEX(0.0);
+		OUT_VERTEX(src_w[1]);
+	    }
+	}
+	if (intel->render_mask && ! intel->render_mask_is_solid) {
+		OUT_VERTEX(mask_x[1] * intel->scale_units[mask_unit][0]);
+		OUT_VERTEX(mask_y[1] * intel->scale_units[mask_unit][1]);
+		if (!is_affine_mask) {
+			OUT_VERTEX(0.0);
+			OUT_VERTEX(mask_w[1]);
+		}
+	}
+
+	OUT_VERTEX(dstX);
+	OUT_VERTEX(dstY);
+	if (! intel->render_source_is_solid) {
+	    OUT_VERTEX(src_x[0] * intel->scale_units[src_unit][0]);
+	    OUT_VERTEX(src_y[0] * intel->scale_units[src_unit][1]);
+	    if (!is_affine_src) {
+		OUT_VERTEX(0.0);
+		OUT_VERTEX(src_w[0]);
+	    }
+	}
+	if (intel->render_mask && ! intel->render_mask_is_solid) {
+		OUT_VERTEX(mask_x[0] * intel->scale_units[mask_unit][0]);
+		OUT_VERTEX(mask_y[0] * intel->scale_units[mask_unit][1]);
+		if (!is_affine_mask) {
+			OUT_VERTEX(0.0);
+			OUT_VERTEX(mask_w[0]);
+		}
+	}
+}
+
+Bool
+i915_prepare_composite(int op, PicturePtr source_picture,
+		       PicturePtr mask_picture, PicturePtr dest_picture,
+		       PixmapPtr source, PixmapPtr mask, PixmapPtr dest)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *bo_table[] = {
+		NULL,		/* batch_bo */
+		i830_get_pixmap_bo(dest),
+		source ? i830_get_pixmap_bo(source) : NULL,
+		mask ? i830_get_pixmap_bo(mask) : NULL,
+	};
+	int tex_unit = 0;
+	int floats_per_vertex;
+
+	intel->render_source_picture = source_picture;
+	intel->render_source = source;
+	intel->render_mask_picture = mask_picture;
+	intel->render_mask = mask;
+	intel->render_dest_picture = dest_picture;
+	intel->render_dest = dest;
+
+	intel->render_source_is_solid = FALSE;
+	if (source_picture->pSourcePict) {
+		SourcePict *source = source_picture->pSourcePict;
+		if (source->type == SourcePictTypeSolidFill) {
+			intel->render_source_is_solid = TRUE;
+			intel->render_source_solid = source->solidFill.color;
+		}
+	}
+	if (!intel->render_source_is_solid && !intel_check_pitch_3d(source))
+		return FALSE;
+
+	intel->render_mask_is_solid = FALSE;
+	if (mask) {
+		if (mask_picture->pSourcePict) {
+			SourcePict *source = mask_picture->pSourcePict;
+			if (source->type == SourcePictTypeSolidFill) {
+				intel->render_mask_is_solid = TRUE;
+				intel->render_mask_solid = source->solidFill.color;
+			}
+		}
+		if (!intel->render_mask_is_solid && !intel_check_pitch_3d(mask))
+			return FALSE;
+	}
+
+	if (!intel_check_pitch_3d(dest))
+		return FALSE;
+
+	if (!i915_get_dest_format(dest_picture,
+				  &intel->i915_render_state.dst_format))
+		return FALSE;
+
+	if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
+		return FALSE;
+
+	intel->needs_render_ca_pass = FALSE;
+	if (mask_picture != NULL && mask_picture->componentAlpha &&
+	    PICT_FORMAT_RGB(mask_picture->format)) {
+		/* Check if it's component alpha that relies on a source alpha
+		 * and on the source value.  We can only get one of those
+		 * into the single source value that we get to blend with.
+		 */
+		if (i915_blend_op[op].src_alpha &&
+		    (i915_blend_op[op].src_blend != BLENDFACT_ZERO)) {
+			if (op != PictOpOver)
+				return FALSE;
+
+			intel->needs_render_ca_pass = TRUE;
+		}
+	}
+
+	intel->transform[0] = NULL;
+	intel->scale_units[0][0] = -1;
+	intel->scale_units[0][1] = -1;
+	intel->transform[1] = NULL;
+	intel->scale_units[1][0] = -1;
+	intel->scale_units[1][1] = -1;
+
+	floats_per_vertex = 2;		/* dest x/y */
+	if (! intel->render_source_is_solid) {
+		if (!i915_texture_setup(source_picture, source, tex_unit++)) {
+			intel_debug_fallback(scrn, "fail to setup src texture\n");
+			return FALSE;
+		}
+
+		if (i830_transform_is_affine(source_picture->transform))
+			floats_per_vertex += 2;	/* src x/y */
+		else
+			floats_per_vertex += 4;	/* src x/y/z/w */
+	}
+
+	if (mask != NULL) {
+		if (! intel->render_mask_is_solid) {
+			if (!i915_texture_setup(mask_picture, mask, tex_unit++)) {
+				intel_debug_fallback(scrn,
+						"fail to setup mask texture\n");
+				return FALSE;
+			}
+
+			if (i830_transform_is_affine(mask_picture->transform))
+				floats_per_vertex += 2;	/* mask x/y */
+			else
+				floats_per_vertex += 4;	/* mask x/y/z/w */
+		}
+	}
+
+	intel->i915_render_state.op = op;
+
+	/* BUF_INFO is an implicit flush */
+	if (dest != intel->render_current_dest)
+		intel_batch_do_flush(scrn);
+	else if((source && i830_uxa_pixmap_is_dirty(source)) ||
+		(mask && i830_uxa_pixmap_is_dirty(mask)))
+		intel_batch_emit_flush(scrn);
+
+	intel->needs_render_state_emit = TRUE;
+
+	intel->prim_emit = i915_emit_composite_primitive;
+	if (!mask) {
+		if (intel->render_source_is_solid)
+			intel->prim_emit = i915_emit_composite_primitive_constant;
+		else if (intel->transform[0] == NULL)
+			intel->prim_emit = i915_emit_composite_primitive_identity_source;
+		else if (i830_transform_is_affine(intel->transform[0]))
+			intel->prim_emit = i915_emit_composite_primitive_affine_source;
 	} else {
-	    i915_fs_texldp(FS_R1, FS_S1, FS_T1);
+		if (intel->transform[0] == NULL) {
+			if (intel->render_source_is_solid)
+				intel->prim_emit = i915_emit_composite_primitive_constant_identity_mask;
+			else if (intel->transform[1] == NULL)
+				intel->prim_emit = i915_emit_composite_primitive_identity_source_mask;
+		}
+	}
+
+	if (floats_per_vertex != intel->floats_per_vertex) {
+		intel->floats_per_vertex = floats_per_vertex;
+		intel->needs_render_vertex_emit = TRUE;
 	}
-	/* If the texture lacks an alpha channel, force the alpha to 1. */
-	if (PICT_FORMAT_A(pMaskPicture->format) == 0)
-	    i915_fs_mov_masked(FS_R1, MASK_W, i915_fs_operand_one());
-
-	/* If component alpha is active in the mask and the blend operation
-	 * uses the source alpha, then we know we don't need the source
-	 * value (otherwise we would have hit a fallback earlier), so we
-	 * provide the source alpha (src.A * mask.X) as output color.
-	 * Conversely, if CA is set and we don't need the source alpha, then
-	 * we produce the source value (src.X * mask.X) and the source alpha
-	 * is unused..  Otherwise, we provide the non-CA source value
-	 * (src.X * mask.A).
+
+	return TRUE;
+}
+
+static void
+i915_composite_emit_shader(intel_screen_private *intel, CARD8 op)
+{
+	PicturePtr mask_picture = intel->render_mask_picture;
+	PixmapPtr mask = intel->render_mask;
+	int src_reg, mask_reg;
+	Bool is_solid_src, is_solid_mask;
+	Bool dest_is_alpha = PIXMAN_FORMAT_RGB(intel->render_dest_picture->format) == 0;
+	int tex_unit, t;
+	FS_LOCALS();
+
+	is_solid_src = intel->render_source_is_solid;
+	is_solid_mask = intel->render_mask_is_solid;
+
+	FS_BEGIN();
+
+	/* Declare the registers necessary for our program.  */
+	t = 0;
+	if (is_solid_src) {
+		i915_fs_dcl(FS_T8);
+		src_reg = FS_T8;
+	} else {
+		i915_fs_dcl(FS_T0);
+		i915_fs_dcl(FS_S0);
+		t++;
+	}
+	if (!mask) {
+		/* No mask, so load directly to output color */
+		if (! is_solid_src) {
+			if (dest_is_alpha)
+				src_reg = FS_R0;
+			else
+				src_reg = FS_OC;
+
+			if (i830_transform_is_affine(intel->transform[0]))
+				i915_fs_texld(src_reg, FS_S0, FS_T0);
+			else
+				i915_fs_texldp(src_reg, FS_S0, FS_T0);
+		}
+
+		if (src_reg != FS_OC) {
+			if (dest_is_alpha)
+				i915_fs_mov(FS_OC, i915_fs_operand(src_reg, W, W, W, W));
+			else
+				i915_fs_mov(FS_OC, i915_fs_operand_reg(src_reg));
+		}
+	} else {
+		if (is_solid_mask) {
+			i915_fs_dcl(FS_T9);
+			mask_reg = FS_T9;
+		} else {
+			i915_fs_dcl(FS_T0 + t);
+			i915_fs_dcl(FS_S0 + t);
+		}
+
+		tex_unit = 0;
+		if (! is_solid_src) {
+			/* Load the source_picture texel */
+			if (i830_transform_is_affine(intel->transform[tex_unit]))
+				i915_fs_texld(FS_R0, FS_S0, FS_T0);
+			else
+				i915_fs_texldp(FS_R0, FS_S0, FS_T0);
+
+			src_reg = FS_R0;
+			tex_unit++;
+		}
+
+		if (! is_solid_mask) {
+			/* Load the mask_picture texel */
+			if (i830_transform_is_affine(intel->transform[tex_unit]))
+				i915_fs_texld(FS_R1, FS_S0 + t, FS_T0 + t);
+			else
+				i915_fs_texldp(FS_R1, FS_S0 + t, FS_T0 + t);
+
+			mask_reg = FS_R1;
+		}
+
+		if (dest_is_alpha) {
+			i915_fs_mul(FS_OC,
+				    i915_fs_operand(src_reg, W, W, W, W),
+				    i915_fs_operand(mask_reg, W, W, W, W));
+		} else {
+			/* If component alpha is active in the mask and the blend
+			 * operation uses the source alpha, then we know we don't
+			 * need the source value (otherwise we would have hit a
+			 * fallback earlier), so we provide the source alpha (src.A *
+			 * mask.X) as output color.
+			 * Conversely, if CA is set and we don't need the source alpha,
+			 * then we produce the source value (src.X * mask.X) and the
+			 * source alpha is unused.  Otherwise, we provide the non-CA
+			 * source value (src.X * mask.A).
+			 */
+			if (mask_picture->componentAlpha &&
+			    PICT_FORMAT_RGB(mask_picture->format)) {
+				if (i915_blend_op[op].src_alpha) {
+					i915_fs_mul(FS_OC,
+						    i915_fs_operand(src_reg, W, W, W, W),
+						    i915_fs_operand_reg(mask_reg));
+				} else {
+					i915_fs_mul(FS_OC,
+						    i915_fs_operand_reg(src_reg),
+						    i915_fs_operand_reg(mask_reg));
+				}
+			} else {
+				i915_fs_mul(FS_OC,
+					    i915_fs_operand_reg(src_reg),
+					    i915_fs_operand(mask_reg, W, W, W, W));
+			}
+		}
+	}
+
+	FS_END();
+}
+
+static void i915_emit_composite_setup(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int op = intel->i915_render_state.op;
+	PicturePtr mask_picture = intel->render_mask_picture;
+	PicturePtr dest_picture = intel->render_dest_picture;
+	PixmapPtr mask = intel->render_mask;
+	PixmapPtr dest = intel->render_dest;
+	Bool is_solid_src, is_solid_mask;
+	int tex_count, t;
+
+	intel->needs_render_state_emit = FALSE;
+
+	IntelEmitInvarientState(scrn);
+	intel->last_3d = LAST_3D_RENDER;
+
+	is_solid_src = intel->render_source_is_solid;
+	is_solid_mask = intel->render_mask_is_solid;
+
+	tex_count = 0;
+	tex_count += ! is_solid_src;
+	tex_count += mask && ! is_solid_mask;
+
+	assert(intel->in_batch_atomic);
+
+	if (tex_count != 0) {
+	    OUT_BATCH(_3DSTATE_MAP_STATE | (3 * tex_count));
+	    OUT_BATCH((1 << tex_count) - 1);
+	    for (t = 0; t < tex_count; t++) {
+		OUT_RELOC_PIXMAP(intel->texture[t], I915_GEM_DOMAIN_SAMPLER, 0, 0);
+		OUT_BATCH(intel->mapstate[3*t + 1]);
+		OUT_BATCH(intel->mapstate[3*t + 2]);
+	    }
+
+	    OUT_BATCH(_3DSTATE_SAMPLER_STATE | (3 * tex_count));
+	    OUT_BATCH((1 << tex_count) - 1);
+	    for (t = 0; t < tex_count; t++) {
+		OUT_BATCH(intel->samplerstate[3*t + 0]);
+		OUT_BATCH(intel->samplerstate[3*t + 1]);
+		OUT_BATCH(intel->samplerstate[3*t + 2]);
+	    }
+	}
+
+	if (is_solid_src) {
+	    OUT_BATCH (_3DSTATE_DFLT_DIFFUSE_CMD);
+	    OUT_BATCH (intel->render_source_solid);
+	}
+	if (mask && is_solid_mask) {
+	    OUT_BATCH (_3DSTATE_DFLT_SPEC_CMD);
+	    OUT_BATCH (intel->render_mask_solid);
+	}
+
+	/* BUF_INFO is an implicit flush, so avoid if the target has not changed.
+	 * XXX However for reasons unfathomed, correct rendering in KDE requires
+	 * at least a MI_FLUSH | INHIBIT_RENDER_CACHE_FLUSH here.
 	 */
-	if (pMaskPicture->componentAlpha &&
-	    PICT_FORMAT_RGB(pMaskPicture->format))
+	if (1 || dest != intel->render_current_dest) {
+		uint32_t tiling_bits;
+
+		intel_batch_do_flush(scrn);
+
+		if (i830_pixmap_tiled(dest)) {
+			tiling_bits = BUF_3D_TILED_SURFACE;
+			if (i830_get_pixmap_intel(dest)->tiling
+			    == I915_TILING_Y)
+				tiling_bits |= BUF_3D_TILE_WALK_Y;
+		} else
+			tiling_bits = 0;
+
+		OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
+		OUT_BATCH(BUF_3D_ID_COLOR_BACK | tiling_bits |
+			  BUF_3D_PITCH(intel_get_pixmap_pitch(dest)));
+		OUT_RELOC_PIXMAP(dest, I915_GEM_DOMAIN_RENDER,
+				 I915_GEM_DOMAIN_RENDER, 0);
+
+		OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
+		OUT_BATCH(intel->i915_render_state.dst_format);
+
+		/* draw rect is unconditional */
+		OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
+		OUT_BATCH(0x00000000);
+		OUT_BATCH(0x00000000);	/* ymin, xmin */
+		OUT_BATCH(DRAW_YMAX(dest->drawable.height - 1) |
+			  DRAW_XMAX(dest->drawable.width - 1));
+		/* yorig, xorig (relate to color buffer?) */
+		OUT_BATCH(0x00000000);
+
+		intel->render_current_dest = dest;
+	}
+
 	{
-	    if (i915_blend_op[op].src_alpha) {
-		i915_fs_mul(out_reg, i915_fs_operand(FS_R0, W, W, W, W),
-			    i915_fs_operand_reg(FS_R1));
-	    } else {
-		i915_fs_mul(out_reg, i915_fs_operand_reg(FS_R0),
-			    i915_fs_operand_reg(FS_R1));
-	    }
-	} else {
-	    i915_fs_mul(out_reg, i915_fs_operand_reg(FS_R0),
-			i915_fs_operand(FS_R1, W, W, W, W));
+		uint32_t ss2;
+
+		ss2 = ~0;
+		t = 0;
+		if (! is_solid_src) {
+		    ss2 &= ~S2_TEXCOORD_FMT(t, TEXCOORDFMT_NOT_PRESENT);
+		    ss2 |= S2_TEXCOORD_FMT(t,
+					   i830_transform_is_affine(intel->transform[t]) ?
+					   TEXCOORDFMT_2D : TEXCOORDFMT_4D);
+		    t++;
+		}
+		if (mask && ! is_solid_mask) {
+		    ss2 &= ~S2_TEXCOORD_FMT(t, TEXCOORDFMT_NOT_PRESENT);
+		    ss2 |= S2_TEXCOORD_FMT(t,
+					   i830_transform_is_affine(intel->transform[t]) ?
+					   TEXCOORDFMT_2D : TEXCOORDFMT_4D);
+		    t++;
+		}
+
+		if (intel->needs_render_ca_pass) {
+			OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) | 0);
+			OUT_BATCH(ss2);
+		} else {
+			OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) | I1_LOAD_S(6) | 1);
+			OUT_BATCH(ss2);
+			OUT_BATCH(i915_get_blend_cntl(op, mask_picture, dest_picture->format));
+		}
 	}
-    }
-    if (dst_format == COLR_BUF_8BIT)
-	i915_fs_mov(FS_OC, i915_fs_operand(out_reg, W, W, W, W));
 
-    FS_END();
+	if (! intel->needs_render_ca_pass)
+		i915_composite_emit_shader(intel, op);
 }
 
 void
-i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
+i915_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
 	       int dstX, int dstY, int w, int h)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+
+	/* 28 + 16 + 10 + 20 + 32 + 16 */
+	intel_batch_start_atomic(scrn, 150);
+
+	if (intel->needs_render_state_emit)
+		i915_emit_composite_setup(scrn);
+
+	if (intel->needs_render_vertex_emit ||
+	    intel_vertex_space(intel) < 3*4*intel->floats_per_vertex) {
+		i915_vertex_flush(intel);
+
+		if (intel_vertex_space(intel) < 256) {
+			intel_next_vertex(intel);
+
+			OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
+				  I1_LOAD_S(0) | I1_LOAD_S(1) | 1);
+			OUT_RELOC(intel->vertex_bo, I915_GEM_DOMAIN_VERTEX, 0, 0);
+			OUT_BATCH((intel->floats_per_vertex << S1_VERTEX_WIDTH_SHIFT) |
+				  (intel->floats_per_vertex << S1_VERTEX_PITCH_SHIFT));
+			intel->vertex_index = 0;
+		} else if (intel->floats_per_vertex != intel->last_floats_per_vertex){
+			OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
+				  I1_LOAD_S(1) | 0);
+			OUT_BATCH((intel->floats_per_vertex << S1_VERTEX_WIDTH_SHIFT) |
+				  (intel->floats_per_vertex << S1_VERTEX_PITCH_SHIFT));
+
+			intel->vertex_index =
+				(intel->vertex_used + intel->floats_per_vertex - 1) /  intel->floats_per_vertex;
+			intel->vertex_used = intel->vertex_index * intel->floats_per_vertex;
+		}
+
+		intel->last_floats_per_vertex = intel->floats_per_vertex;
+		intel->needs_render_vertex_emit = FALSE;
+	}
 
-    intel_batch_start_atomic(pScrn, 150);
+	if (intel->prim_offset == 0) {
+		if (intel->needs_render_ca_pass) {
+			OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(6) | 0);
+			OUT_BATCH(i915_get_blend_cntl(PictOpOutReverse,
+						      intel->render_mask_picture,
+						      intel->render_dest_picture->format));
+			i915_composite_emit_shader(intel, PictOpOutReverse);
+		}
+
+		intel->prim_offset = intel->batch_used;
+		OUT_BATCH(PRIM3D_RECTLIST | PRIM3D_INDIRECT_SEQUENTIAL);
+		OUT_BATCH(intel->vertex_index);
+	}
+	intel->vertex_count += 3;
 
-    if (pI830->i915_render_state.needs_emit)
-	i915_emit_composite_setup(pScrn);
+	intel->prim_emit(dest,
+			 srcX, srcY,
+			 maskX, maskY,
+			 dstX, dstY,
+			 w, h);
 
-    i830_composite(pDst, srcX, srcY, maskX, maskY, dstX, dstY, w, h);
+	intel_batch_end_atomic(scrn);
+}
+
+void
+i915_vertex_flush(intel_screen_private *intel)
+{
+	if (intel->prim_offset == 0)
+		return;
+
+	intel->batch_ptr[intel->prim_offset] |= intel->vertex_count;
+	intel->prim_offset = 0;
+
+	if (intel->needs_render_ca_pass) {
+		OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(6) | 0);
+		OUT_BATCH(i915_get_blend_cntl(PictOpAdd,
+					      intel->render_mask_picture,
+					      intel->render_dest_picture->format));
+		i915_composite_emit_shader(intel, PictOpAdd);
+		OUT_BATCH(PRIM3D_RECTLIST | PRIM3D_INDIRECT_SEQUENTIAL | intel->vertex_count);
+		OUT_BATCH(intel->vertex_index);
+	}
 
-    intel_batch_end_atomic(pScrn);
+	intel->vertex_index += intel->vertex_count;
+	intel->vertex_count = 0;
 }
 
 void
-i915_batch_flush_notify(ScrnInfoPtr pScrn)
+i915_batch_flush_notify(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    pI830->i915_render_state.needs_emit = TRUE;
+	intel->needs_render_state_emit = TRUE;
+	intel->render_current_dest = NULL;
+	intel->last_floats_per_vertex = 0;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i915_video.c new/xsrc/external/mit/xf86-video-intel/dist/src/i915_video.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i915_video.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i915_video.c	2011-02-08 11:14:00.000000000 +0100
@@ -40,394 +40,442 @@
 #include "i915_3d.h"
 
 void
-I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
+I915DisplayVideoTextured(ScrnInfoPtr scrn,
+			 intel_adaptor_private *adaptor_priv, int id,
 			 RegionPtr dstRegion,
-			 short width, short height, int video_pitch, int video_pitch2,
-			 int x1, int y1, int x2, int y2,
+			 short width, short height, int video_pitch,
+			 int video_pitch2,
 			 short src_w, short src_h, short drw_w, short drw_h,
-			 PixmapPtr pPixmap)
+			 PixmapPtr pixmap)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-   uint32_t format, ms3, s5;
-   BoxPtr pbox = REGION_RECTS(dstRegion);
-   int nbox_total = REGION_NUM_RECTS(dstRegion);
-   int nbox_this_time;
-   int dxo, dyo, pix_xoff, pix_yoff;
-   Bool planar;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	uint32_t format, ms3, s5, tiling;
+	BoxPtr pbox = REGION_RECTS(dstRegion);
+	int nbox_total = REGION_NUM_RECTS(dstRegion);
+	int nbox_this_time;
+	int dxo, dyo, pix_xoff, pix_yoff;
+	PixmapPtr target;
 
 #if 0
-   ErrorF("I915DisplayVideo: %dx%d (pitch %d)\n", width, height,
-	  video_pitch);
+	ErrorF("I915DisplayVideo: %dx%d (pitch %d)\n", width, height,
+	       video_pitch);
 #endif
 
-   switch (id) {
-   case FOURCC_UYVY:
-   case FOURCC_YUY2:
-      planar = FALSE;
-      break;
-   case FOURCC_YV12:
-   case FOURCC_I420:
-      planar = TRUE;
-      break;
-   default:
-      ErrorF("Unknown format 0x%x\n", id);
-      return;
-   }
+	dxo = dstRegion->extents.x1;
+	dyo = dstRegion->extents.y1;
 
-#define BYTES_FOR_BOXES(n)	((200 + (n) * 20) * 4)
-#define BOXES_IN_BYTES(s)	((((s)/4) - 200) / 20)
-#define BATCH_BYTES(p)		((p)->batch_bo->size - 16)
-
-   while (nbox_total) {
-	nbox_this_time = nbox_total;
-	if (BYTES_FOR_BOXES(nbox_this_time) > BATCH_BYTES(pI830))
-		nbox_this_time = BOXES_IN_BYTES(BATCH_BYTES(pI830));
-	nbox_total -= nbox_this_time;
-
-   intel_batch_start_atomic(pScrn, 200 + 20 * nbox_this_time);
-
-   IntelEmitInvarientState(pScrn);
-   pI830->last_3d = LAST_3D_VIDEO;
-
-   BEGIN_BATCH(20);
-
-   /* flush map & render cache */
-   OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE);
-   OUT_BATCH(0x00000000);
-
-   /* draw rect -- just clipping */
-   OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
-   OUT_BATCH(DRAW_DITHER_OFS_X(pPixmap->drawable.x & 3) |
-	     DRAW_DITHER_OFS_Y(pPixmap->drawable.y & 3));
-   OUT_BATCH(0x00000000);	/* ymin, xmin */
-   OUT_BATCH((pPixmap->drawable.width - 1) |
-	     (pPixmap->drawable.height - 1) << 16); /* ymax, xmax */
-   OUT_BATCH(0x00000000);	/* yorigin, xorigin */
-   OUT_BATCH(MI_NOOP);
-
-   OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) |
-	     I1_LOAD_S(4) | I1_LOAD_S(5) | I1_LOAD_S(6) | 3);
-   OUT_BATCH(S2_TEXCOORD_FMT(0, TEXCOORDFMT_2D) |
-	     S2_TEXCOORD_FMT(1, TEXCOORDFMT_NOT_PRESENT) |
-	     S2_TEXCOORD_FMT(2, TEXCOORDFMT_NOT_PRESENT) |
-	     S2_TEXCOORD_FMT(3, TEXCOORDFMT_NOT_PRESENT) |
-	     S2_TEXCOORD_FMT(4, TEXCOORDFMT_NOT_PRESENT) |
-	     S2_TEXCOORD_FMT(5, TEXCOORDFMT_NOT_PRESENT) |
-	     S2_TEXCOORD_FMT(6, TEXCOORDFMT_NOT_PRESENT) |
-	     S2_TEXCOORD_FMT(7, TEXCOORDFMT_NOT_PRESENT));
-   OUT_BATCH((1 << S4_POINT_WIDTH_SHIFT) | S4_LINE_WIDTH_ONE |
-	     S4_CULLMODE_NONE | S4_VFMT_XY);
-   s5 = 0x0;
-   if (pI830->cpp == 2)
-      s5 |= S5_COLOR_DITHER_ENABLE;
-   OUT_BATCH(s5); /* S5 - enable bits */
-   OUT_BATCH((2 << S6_DEPTH_TEST_FUNC_SHIFT) |
-	     (2 << S6_CBUF_SRC_BLEND_FACT_SHIFT) |
-	     (1 << S6_CBUF_DST_BLEND_FACT_SHIFT) | S6_COLOR_WRITE_ENABLE |
-	     (2 << S6_TRISTRIP_PV_SHIFT));
-
-   OUT_BATCH(_3DSTATE_CONST_BLEND_COLOR_CMD);
-   OUT_BATCH(0x00000000);
-
-   OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
-   if (pI830->cpp == 2)
-      format = COLR_BUF_RGB565;
-   else
-      format = COLR_BUF_ARGB8888 | DEPTH_FRMT_24_FIXED_8_OTHER;
-
-   OUT_BATCH(LOD_PRECLAMP_OGL |
-	     DSTORG_HORT_BIAS(0x80) |
-	     DSTORG_VERT_BIAS(0x80) |
-	     format);
-
-   /* front buffer, pitch, offset */
-   OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
-   OUT_BATCH(BUF_3D_ID_COLOR_BACK | BUF_3D_USE_FENCE |
-	     BUF_3D_PITCH(intel_get_pixmap_pitch(pPixmap)));
-   OUT_RELOC_PIXMAP(pPixmap, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
-   ADVANCE_BATCH();
-
-   if (!planar) {
-      FS_LOCALS(10);
-
-      BEGIN_BATCH(16);
-      OUT_BATCH(_3DSTATE_PIXEL_SHADER_CONSTANTS | 4);
-      OUT_BATCH(0x0000001);	/* constant 0 */
-      /* constant 0: brightness/contrast */
-      OUT_BATCH_F(pPriv->brightness / 128.0);
-      OUT_BATCH_F(pPriv->contrast / 255.0);
-      OUT_BATCH_F(0.0);
-      OUT_BATCH_F(0.0);
-
-      OUT_BATCH(_3DSTATE_SAMPLER_STATE | 3);
-      OUT_BATCH(0x00000001);
-      OUT_BATCH(SS2_COLORSPACE_CONVERSION |
-		(FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
-		(FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
-      OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) |
-		(TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT) |
-		(0 << SS3_TEXTUREMAP_INDEX_SHIFT) |
-		SS3_NORMALIZED_COORDS);
-      OUT_BATCH(0x00000000);
-
-      OUT_BATCH(_3DSTATE_MAP_STATE | 3);
-      OUT_BATCH(0x00000001);	/* texture map #1 */
-      OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBuf0offset);
-
-      ms3 = MAPSURF_422 | MS3_USE_FENCE_REGS;
-      switch (id) {
-      case FOURCC_YUY2:
-	 ms3 |= MT_422_YCRCB_NORMAL;
-	 break;
-      case FOURCC_UYVY:
-	 ms3 |= MT_422_YCRCB_SWAPY;
-	 break;
-      }
-      ms3 |= (height - 1) << MS3_HEIGHT_SHIFT;
-      ms3 |= (width - 1) << MS3_WIDTH_SHIFT;
-      OUT_BATCH(ms3);
-      OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT);
-
-      ADVANCE_BATCH();
-
-      FS_BEGIN();
-      i915_fs_dcl(FS_S0);
-      i915_fs_dcl(FS_T0);
-      i915_fs_texld(FS_OC, FS_S0, FS_T0);
-      if (pPriv->brightness != 0) {
-	  i915_fs_add(FS_OC,
-		      i915_fs_operand_reg(FS_OC),
-		      i915_fs_operand(FS_C0, X, X, X, ZERO));
-      }
-      FS_END();
-   } else {
-      FS_LOCALS(16);
-
-      BEGIN_BATCH(22 + 11 + 11);
-      /* For the planar formats, we set up three samplers -- one for each plane,
-       * in a Y8 format.  Because I couldn't get the special PLANAR_TO_PACKED
-       * shader setup to work, I did the manual pixel shader:
-       *
-       * y' = y - .0625
-       * u' = u - .5
-       * v' = v - .5;
-       *
-       * r = 1.1643 * y' + 0.0     * u' + 1.5958  * v'
-       * g = 1.1643 * y' - 0.39173 * u' - 0.81290 * v'
-       * b = 1.1643 * y' + 2.017   * u' + 0.0     * v'
-       *
-       * register assignment:
-       * r0 = (y',u',v',0)
-       * r1 = (y,y,y,y)
-       * r2 = (u,u,u,u)
-       * r3 = (v,v,v,v)
-       * OC = (r,g,b,1)
-       */
-      OUT_BATCH(_3DSTATE_PIXEL_SHADER_CONSTANTS | (22 - 2));
-      OUT_BATCH(0x000001f);	/* constants 0-4 */
-      /* constant 0: normalization offsets */
-      OUT_BATCH_F(-0.0625);
-      OUT_BATCH_F(-0.5);
-      OUT_BATCH_F(-0.5);
-      OUT_BATCH_F(0.0);
-      /* constant 1: r coefficients*/
-      OUT_BATCH_F(1.1643);
-      OUT_BATCH_F(0.0);
-      OUT_BATCH_F(1.5958);
-      OUT_BATCH_F(0.0);
-      /* constant 2: g coefficients */
-      OUT_BATCH_F(1.1643);
-      OUT_BATCH_F(-0.39173);
-      OUT_BATCH_F(-0.81290);
-      OUT_BATCH_F(0.0);
-      /* constant 3: b coefficients */
-      OUT_BATCH_F(1.1643);
-      OUT_BATCH_F(2.017);
-      OUT_BATCH_F(0.0);
-      OUT_BATCH_F(0.0);
-      /* constant 4: brightness/contrast */
-      OUT_BATCH_F(pPriv->brightness / 128.0);
-      OUT_BATCH_F(pPriv->contrast / 255.0);
-      OUT_BATCH_F(0.0);
-      OUT_BATCH_F(0.0);
-
-      OUT_BATCH(_3DSTATE_SAMPLER_STATE | 9);
-      OUT_BATCH(0x00000007);
-      /* sampler 0 */
-      OUT_BATCH((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
-	       (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
-      OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) |
-	       (TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT) |
-	       (0 << SS3_TEXTUREMAP_INDEX_SHIFT) |
-	       SS3_NORMALIZED_COORDS);
-      OUT_BATCH(0x00000000);
-      /* sampler 1 */
-      OUT_BATCH((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
-	       (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
-      OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) |
-	       (TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT) |
-	       (1 << SS3_TEXTUREMAP_INDEX_SHIFT) |
-	       SS3_NORMALIZED_COORDS);
-      OUT_BATCH(0x00000000);
-      /* sampler 2 */
-      OUT_BATCH((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
-		(FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
-      OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) |
-		(TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT) |
-		(2 << SS3_TEXTUREMAP_INDEX_SHIFT) |
-		SS3_NORMALIZED_COORDS);
-      OUT_BATCH(0x00000000);
-
-      OUT_BATCH(_3DSTATE_MAP_STATE | 9);
-      OUT_BATCH(0x00000007);
-
-      OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBuf0offset);
-      ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS;
-      ms3 |= (height - 1) << MS3_HEIGHT_SHIFT;
-      ms3 |= (width - 1) << MS3_WIDTH_SHIFT;
-      OUT_BATCH(ms3);
-      /* check to see if Y has special pitch than normal double u/v pitch,
-       * e.g i915 XvMC hw requires at least 1K alignment, so Y pitch might
-       * be same as U/V's.*/
-      if (video_pitch2)
-	  OUT_BATCH(((video_pitch2 / 4) - 1) << MS4_PITCH_SHIFT);
-      else
-	  OUT_BATCH(((video_pitch * 2 / 4) - 1) << MS4_PITCH_SHIFT);
-
-      OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->UBuf0offset);
-      ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS;
-      ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT;
-      ms3 |= (width / 2 - 1) << MS3_WIDTH_SHIFT;
-      OUT_BATCH(ms3);
-      OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT);
-
-      OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->VBuf0offset);
-      ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS;
-      ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT;
-      ms3 |= (width / 2 - 1) << MS3_WIDTH_SHIFT;
-      OUT_BATCH(ms3);
-      OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT);
-      ADVANCE_BATCH();
-
-      FS_BEGIN();
-      /* Declare samplers */
-      i915_fs_dcl(FS_S0); /* Y */
-      i915_fs_dcl(FS_S1); /* U */
-      i915_fs_dcl(FS_S2); /* V */
-      i915_fs_dcl(FS_T0); /* normalized coords */
-
-      /* Load samplers to temporaries. */
-      i915_fs_texld(FS_R1, FS_S0, FS_T0);
-      i915_fs_texld(FS_R2, FS_S1, FS_T0);
-      i915_fs_texld(FS_R3, FS_S2, FS_T0);
-
-      /* Move the sampled YUV data in R[123] to the first 3 channels of R0. */
-      i915_fs_mov_masked(FS_R0, MASK_X, i915_fs_operand_reg(FS_R1));
-      i915_fs_mov_masked(FS_R0, MASK_Y, i915_fs_operand_reg(FS_R2));
-      i915_fs_mov_masked(FS_R0, MASK_Z, i915_fs_operand_reg(FS_R3));
-
-      /* Normalize the YUV data */
-      i915_fs_add(FS_R0, i915_fs_operand_reg(FS_R0),
-                 i915_fs_operand_reg(FS_C0));
-      /* dot-product the YUV data in R0 by the vectors of coefficients for
-       * calculating R, G, and B, storing the results in the R, G, or B
-       * channels of the output color.  The OC results are implicitly clamped
-       * at the end of the program.
-       */
-      i915_fs_dp3_masked(FS_OC, MASK_X,
-                        i915_fs_operand_reg(FS_R0),
-                        i915_fs_operand_reg(FS_C1));
-      i915_fs_dp3_masked(FS_OC, MASK_Y,
-                        i915_fs_operand_reg(FS_R0),
-                        i915_fs_operand_reg(FS_C2));
-      i915_fs_dp3_masked(FS_OC, MASK_Z,
-                        i915_fs_operand_reg(FS_R0),
-                        i915_fs_operand_reg(FS_C3));
-      /* Set alpha of the output to 1.0, by wiring W to 1 and not actually using
-       * the source.
-       */
-      i915_fs_mov_masked(FS_OC, MASK_W, i915_fs_operand_one());
-
-      if (pPriv->brightness != 0) {
-	  i915_fs_add(FS_OC,
-		      i915_fs_operand_reg(FS_OC),
-		      i915_fs_operand(FS_C4, X, X, X, ZERO));
-      }
-      FS_END();
-   }
-   
-   {
-      BEGIN_BATCH(2);
-      OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE);
-      OUT_BATCH(0x00000000);
-      ADVANCE_BATCH();
-   }
-
-   /* Set up the offset for translating from the given region (in screen
-    * coordinates) to the backing pixmap.
-    */
+	if (pixmap->drawable.width > 2048 || pixmap->drawable.height > 2048 ||
+	    !intel_check_pitch_3d(pixmap)) {
+		ScreenPtr screen = pixmap->drawable.pScreen;
+
+		target = screen->CreatePixmap(screen,
+					      drw_w, drw_h,
+					      pixmap->drawable.depth,
+					      CREATE_PIXMAP_USAGE_SCRATCH);
+
+		pix_xoff = -dxo;
+		pix_yoff = -dyo;
+	} else {
+		target = pixmap;
+
+		/* Set up the offset for translating from the given region
+		 * (in screen coordinates) to the backing pixmap.
+		 */
 #ifdef COMPOSITE
-   pix_xoff = -pPixmap->screen_x + pPixmap->drawable.x;
-   pix_yoff = -pPixmap->screen_y + pPixmap->drawable.y;
+		pix_xoff = -target->screen_x + target->drawable.x;
+		pix_yoff = -target->screen_y + target->drawable.y;
 #else
-   pix_xoff = 0;
-   pix_yoff = 0;
+		pix_xoff = 0;
+		pix_yoff = 0;
 #endif
+	}
 
-   dxo = dstRegion->extents.x1;
-   dyo = dstRegion->extents.y1;
-
-   while (nbox_this_time--)
-   {
-      int box_x1 = pbox->x1;
-      int box_y1 = pbox->y1;
-      int box_x2 = pbox->x2;
-      int box_y2 = pbox->y2;
-      float src_scale_x, src_scale_y;
-
-      pbox++;
-
-      src_scale_x = ((float)src_w / width) / drw_w;
-      src_scale_y  = ((float)src_h / height) / drw_h;
-
-      BEGIN_BATCH(8 + 12);
-      OUT_BATCH(MI_NOOP);
-      OUT_BATCH(MI_NOOP);
-      OUT_BATCH(MI_NOOP);
-      OUT_BATCH(MI_NOOP);
-      OUT_BATCH(MI_NOOP);
-      OUT_BATCH(MI_NOOP);
-      OUT_BATCH(MI_NOOP);
-
-      /* vertex data - rect list consists of bottom right, bottom left, and top
-       * left vertices.
-       */
-      OUT_BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST | (12 - 1));
-
-      /* bottom right */
-      OUT_BATCH_F(box_x2 + pix_xoff);
-      OUT_BATCH_F(box_y2 + pix_yoff);
-      OUT_BATCH_F((box_x2 - dxo) * src_scale_x);
-      OUT_BATCH_F((box_y2 - dyo) * src_scale_y);
-
-      /* bottom left */
-      OUT_BATCH_F(box_x1 + pix_xoff);
-      OUT_BATCH_F(box_y2 + pix_yoff);
-      OUT_BATCH_F((box_x1 - dxo) * src_scale_x);
-      OUT_BATCH_F((box_y2 - dyo) * src_scale_y);
-
-      /* top left */
-      OUT_BATCH_F(box_x1 + pix_xoff);
-      OUT_BATCH_F(box_y1 + pix_yoff);
-      OUT_BATCH_F((box_x1 - dxo) * src_scale_x);
-      OUT_BATCH_F((box_y1 - dyo) * src_scale_y);
+#define BYTES_FOR_BOXES(n)	((200 + (n) * 20) * 4)
+#define BOXES_IN_BYTES(s)	((((s)/4) - 200) / 20)
+#define BATCH_BYTES(p)		((p)->batch_bo->size - 16)
 
-      ADVANCE_BATCH();
-   }
+	while (nbox_total) {
+		nbox_this_time = nbox_total;
+		if (BYTES_FOR_BOXES(nbox_this_time) > BATCH_BYTES(intel))
+			nbox_this_time = BOXES_IN_BYTES(BATCH_BYTES(intel));
+		nbox_total -= nbox_this_time;
+
+		intel_batch_start_atomic(scrn, 200 + 20 * nbox_this_time);
+
+		IntelEmitInvarientState(scrn);
+		intel->last_3d = LAST_3D_VIDEO;
+
+		/* draw rect -- just clipping */
+		OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
+		OUT_BATCH(DRAW_DITHER_OFS_X(pixmap->drawable.x & 3) |
+			  DRAW_DITHER_OFS_Y(pixmap->drawable.y & 3));
+		OUT_BATCH(0x00000000);	/* ymin, xmin */
+		/* ymax, xmax */
+		OUT_BATCH((target->drawable.width - 1) |
+			  (target->drawable.height - 1) << 16);
+		OUT_BATCH(0x00000000);	/* yorigin, xorigin */
+
+		OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) |
+			  I1_LOAD_S(5) | I1_LOAD_S(6) | 2);
+		OUT_BATCH(S2_TEXCOORD_FMT(0, TEXCOORDFMT_2D) |
+			  S2_TEXCOORD_FMT(1, TEXCOORDFMT_NOT_PRESENT) |
+			  S2_TEXCOORD_FMT(2, TEXCOORDFMT_NOT_PRESENT) |
+			  S2_TEXCOORD_FMT(3, TEXCOORDFMT_NOT_PRESENT) |
+			  S2_TEXCOORD_FMT(4, TEXCOORDFMT_NOT_PRESENT) |
+			  S2_TEXCOORD_FMT(5, TEXCOORDFMT_NOT_PRESENT) |
+			  S2_TEXCOORD_FMT(6, TEXCOORDFMT_NOT_PRESENT) |
+			  S2_TEXCOORD_FMT(7, TEXCOORDFMT_NOT_PRESENT));
+		s5 = 0x0;
+		if (intel->cpp == 2)
+			s5 |= S5_COLOR_DITHER_ENABLE;
+		OUT_BATCH(s5);	/* S5 - enable bits */
+		OUT_BATCH((2 << S6_DEPTH_TEST_FUNC_SHIFT) |
+			  (2 << S6_CBUF_SRC_BLEND_FACT_SHIFT) |
+			  (1 << S6_CBUF_DST_BLEND_FACT_SHIFT) |
+			  S6_COLOR_WRITE_ENABLE | (2 << S6_TRISTRIP_PV_SHIFT));
+
+		OUT_BATCH(_3DSTATE_CONST_BLEND_COLOR_CMD);
+		OUT_BATCH(0x00000000);
+
+		OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
+		if (intel->cpp == 2)
+			format = COLR_BUF_RGB565;
+		else
+			format =
+			    COLR_BUF_ARGB8888 | DEPTH_FRMT_24_FIXED_8_OTHER;
+
+		OUT_BATCH(LOD_PRECLAMP_OGL |
+			  DSTORG_HORT_BIAS(0x8) |
+			  DSTORG_VERT_BIAS(0x8) | format);
+
+		/* front buffer, pitch, offset */
+		if (i830_pixmap_tiled(target)) {
+			tiling = BUF_3D_TILED_SURFACE;
+			if (i830_get_pixmap_intel(target)->tiling == I915_TILING_Y)
+				tiling |= BUF_3D_TILE_WALK_Y;
+		} else
+			tiling = 0;
+		OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
+		OUT_BATCH(BUF_3D_ID_COLOR_BACK | tiling |
+			  BUF_3D_PITCH(intel_get_pixmap_pitch(target)));
+		OUT_RELOC_PIXMAP(target, I915_GEM_DOMAIN_RENDER,
+				 I915_GEM_DOMAIN_RENDER, 0);
+
+		if (!is_planar_fourcc(id)) {
+			FS_LOCALS();
+
+			OUT_BATCH(_3DSTATE_PIXEL_SHADER_CONSTANTS | 4);
+			OUT_BATCH(0x0000001);	/* constant 0 */
+			/* constant 0: brightness/contrast */
+			OUT_BATCH_F(adaptor_priv->brightness / 128.0);
+			OUT_BATCH_F(adaptor_priv->contrast / 255.0);
+			OUT_BATCH_F(0.0);
+			OUT_BATCH_F(0.0);
+
+			OUT_BATCH(_3DSTATE_SAMPLER_STATE | 3);
+			OUT_BATCH(0x00000001);
+			OUT_BATCH(SS2_COLORSPACE_CONVERSION |
+				  (FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
+				  (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
+			OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCX_ADDR_MODE_SHIFT) |
+				  (TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCY_ADDR_MODE_SHIFT) |
+				  (0 << SS3_TEXTUREMAP_INDEX_SHIFT) |
+				  SS3_NORMALIZED_COORDS);
+			OUT_BATCH(0x00000000);
+
+			OUT_BATCH(_3DSTATE_MAP_STATE | 3);
+			OUT_BATCH(0x00000001);	/* texture map #1 */
+			if (adaptor_priv->buf)
+				OUT_RELOC(adaptor_priv->buf,
+					  I915_GEM_DOMAIN_SAMPLER, 0,
+					  adaptor_priv->YBufOffset);
+			else
+				OUT_BATCH(adaptor_priv->YBufOffset);
+
+			ms3 = MAPSURF_422;
+			switch (id) {
+			case FOURCC_YUY2:
+				ms3 |= MT_422_YCRCB_NORMAL;
+				break;
+			case FOURCC_UYVY:
+				ms3 |= MT_422_YCRCB_SWAPY;
+				break;
+			}
+			ms3 |= (height - 1) << MS3_HEIGHT_SHIFT;
+			ms3 |= (width - 1) << MS3_WIDTH_SHIFT;
+			OUT_BATCH(ms3);
+			OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT);
+
+			FS_BEGIN();
+			i915_fs_dcl(FS_S0);
+			i915_fs_dcl(FS_T0);
+			i915_fs_texld(FS_OC, FS_S0, FS_T0);
+			if (adaptor_priv->brightness != 0) {
+				i915_fs_add(FS_OC,
+					    i915_fs_operand_reg(FS_OC),
+					    i915_fs_operand(FS_C0, X, X, X,
+							    ZERO));
+			}
+			FS_END();
+		} else {
+			FS_LOCALS();
+
+			/* For the planar formats, we set up three samplers --
+			 * one for each plane, in a Y8 format.  Because I
+			 * couldn't get the special PLANAR_TO_PACKED
+			 * shader setup to work, I did the manual pixel shader:
+			 *
+			 * y' = y - .0625
+			 * u' = u - .5
+			 * v' = v - .5;
+			 *
+			 * r = 1.1643 * y' + 0.0     * u' + 1.5958  * v'
+			 * g = 1.1643 * y' - 0.39173 * u' - 0.81290 * v'
+			 * b = 1.1643 * y' + 2.017   * u' + 0.0     * v'
+			 *
+			 * register assignment:
+			 * r0 = (y',u',v',0)
+			 * r1 = (y,y,y,y)
+			 * r2 = (u,u,u,u)
+			 * r3 = (v,v,v,v)
+			 * OC = (r,g,b,1)
+			 */
+			OUT_BATCH(_3DSTATE_PIXEL_SHADER_CONSTANTS | (22 - 2));
+			OUT_BATCH(0x000001f);	/* constants 0-4 */
+			/* constant 0: normalization offsets */
+			OUT_BATCH_F(-0.0625);
+			OUT_BATCH_F(-0.5);
+			OUT_BATCH_F(-0.5);
+			OUT_BATCH_F(0.0);
+			/* constant 1: r coefficients */
+			OUT_BATCH_F(1.1643);
+			OUT_BATCH_F(0.0);
+			OUT_BATCH_F(1.5958);
+			OUT_BATCH_F(0.0);
+			/* constant 2: g coefficients */
+			OUT_BATCH_F(1.1643);
+			OUT_BATCH_F(-0.39173);
+			OUT_BATCH_F(-0.81290);
+			OUT_BATCH_F(0.0);
+			/* constant 3: b coefficients */
+			OUT_BATCH_F(1.1643);
+			OUT_BATCH_F(2.017);
+			OUT_BATCH_F(0.0);
+			OUT_BATCH_F(0.0);
+			/* constant 4: brightness/contrast */
+			OUT_BATCH_F(adaptor_priv->brightness / 128.0);
+			OUT_BATCH_F(adaptor_priv->contrast / 255.0);
+			OUT_BATCH_F(0.0);
+			OUT_BATCH_F(0.0);
+
+			OUT_BATCH(_3DSTATE_SAMPLER_STATE | 9);
+			OUT_BATCH(0x00000007);
+			/* sampler 0 */
+			OUT_BATCH((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
+				  (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
+			OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCX_ADDR_MODE_SHIFT) |
+				  (TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCY_ADDR_MODE_SHIFT) |
+				  (0 << SS3_TEXTUREMAP_INDEX_SHIFT) |
+				  SS3_NORMALIZED_COORDS);
+			OUT_BATCH(0x00000000);
+			/* sampler 1 */
+			OUT_BATCH((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
+				  (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
+			OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCX_ADDR_MODE_SHIFT) |
+				  (TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCY_ADDR_MODE_SHIFT) |
+				  (1 << SS3_TEXTUREMAP_INDEX_SHIFT) |
+				  SS3_NORMALIZED_COORDS);
+			OUT_BATCH(0x00000000);
+			/* sampler 2 */
+			OUT_BATCH((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) |
+				  (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT));
+			OUT_BATCH((TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCX_ADDR_MODE_SHIFT) |
+				  (TEXCOORDMODE_CLAMP_EDGE <<
+				   SS3_TCY_ADDR_MODE_SHIFT) |
+				  (2 << SS3_TEXTUREMAP_INDEX_SHIFT) |
+				  SS3_NORMALIZED_COORDS);
+			OUT_BATCH(0x00000000);
+
+			OUT_BATCH(_3DSTATE_MAP_STATE | 9);
+			OUT_BATCH(0x00000007);
+
+			if (adaptor_priv->buf)
+				OUT_RELOC(adaptor_priv->buf,
+					  I915_GEM_DOMAIN_SAMPLER, 0,
+					  adaptor_priv->YBufOffset);
+			else
+				OUT_BATCH(adaptor_priv->YBufOffset);
+
+			ms3 = MAPSURF_8BIT | MT_8BIT_I8;
+			ms3 |= (height - 1) << MS3_HEIGHT_SHIFT;
+			ms3 |= (width - 1) << MS3_WIDTH_SHIFT;
+			OUT_BATCH(ms3);
+			/* check to see if Y has special pitch than normal
+			 * double u/v pitch, e.g i915 XvMC hw requires at
+			 * least 1K alignment, so Y pitch might
+			 * be same as U/V's.*/
+			if (video_pitch2)
+				OUT_BATCH(((video_pitch2 / 4) -
+					   1) << MS4_PITCH_SHIFT);
+			else
+				OUT_BATCH(((video_pitch * 2 / 4) -
+					   1) << MS4_PITCH_SHIFT);
+
+			if (adaptor_priv->buf)
+				OUT_RELOC(adaptor_priv->buf,
+					  I915_GEM_DOMAIN_SAMPLER, 0,
+					  adaptor_priv->UBufOffset);
+			else
+				OUT_BATCH(adaptor_priv->UBufOffset);
+
+			ms3 = MAPSURF_8BIT | MT_8BIT_I8;
+			ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT;
+			ms3 |= (width / 2 - 1) << MS3_WIDTH_SHIFT;
+			OUT_BATCH(ms3);
+			OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT);
+
+			if (adaptor_priv->buf)
+				OUT_RELOC(adaptor_priv->buf,
+					  I915_GEM_DOMAIN_SAMPLER, 0,
+					  adaptor_priv->VBufOffset);
+			else
+				OUT_BATCH(adaptor_priv->VBufOffset);
+
+			ms3 = MAPSURF_8BIT | MT_8BIT_I8;
+			ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT;
+			ms3 |= (width / 2 - 1) << MS3_WIDTH_SHIFT;
+			OUT_BATCH(ms3);
+			OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT);
+
+			FS_BEGIN();
+			/* Declare samplers */
+			i915_fs_dcl(FS_S0);	/* Y */
+			i915_fs_dcl(FS_S1);	/* U */
+			i915_fs_dcl(FS_S2);	/* V */
+			i915_fs_dcl(FS_T0);	/* normalized coords */
+
+			/* Load samplers to temporaries. */
+			i915_fs_texld(FS_R1, FS_S0, FS_T0);
+			i915_fs_texld(FS_R2, FS_S1, FS_T0);
+			i915_fs_texld(FS_R3, FS_S2, FS_T0);
+
+			/* Move the sampled YUV data in R[123] to the first
+			 * 3 channels of R0.
+			 */
+			i915_fs_mov_masked(FS_R0, MASK_X,
+					   i915_fs_operand_reg(FS_R1));
+			i915_fs_mov_masked(FS_R0, MASK_Y,
+					   i915_fs_operand_reg(FS_R2));
+			i915_fs_mov_masked(FS_R0, MASK_Z,
+					   i915_fs_operand_reg(FS_R3));
+
+			/* Normalize the YUV data */
+			i915_fs_add(FS_R0, i915_fs_operand_reg(FS_R0),
+				    i915_fs_operand_reg(FS_C0));
+			/* dot-product the YUV data in R0 by the vectors of
+			 * coefficients for calculating R, G, and B, storing
+			 * the results in the R, G, or B channels of the output
+			 * color.  The OC results are implicitly clamped
+			 * at the end of the program.
+			 */
+			i915_fs_dp3(FS_OC, MASK_X,
+				    i915_fs_operand_reg(FS_R0),
+				    i915_fs_operand_reg(FS_C1));
+			i915_fs_dp3(FS_OC, MASK_Y,
+				    i915_fs_operand_reg(FS_R0),
+				    i915_fs_operand_reg(FS_C2));
+			i915_fs_dp3(FS_OC, MASK_Z,
+				    i915_fs_operand_reg(FS_R0),
+				    i915_fs_operand_reg(FS_C3));
+			/* Set alpha of the output to 1.0, by wiring W to 1
+			 * and not actually using the source.
+			 */
+			i915_fs_mov_masked(FS_OC, MASK_W,
+					   i915_fs_operand_one());
+
+			if (adaptor_priv->brightness != 0) {
+				i915_fs_add(FS_OC,
+					    i915_fs_operand_reg(FS_OC),
+					    i915_fs_operand(FS_C4, X, X, X,
+							    ZERO));
+			}
+			FS_END();
+		}
+
+		OUT_BATCH(PRIM3D_RECTLIST | (12 * nbox_this_time - 1));
+		while (nbox_this_time--) {
+			int box_x1 = pbox->x1;
+			int box_y1 = pbox->y1;
+			int box_x2 = pbox->x2;
+			int box_y2 = pbox->y2;
+			float src_scale_x, src_scale_y;
+
+			pbox++;
+
+			src_scale_x = ((float)src_w / width) / drw_w;
+			src_scale_y = ((float)src_h / height) / drw_h;
+
+			/* vertex data - rect list consists of bottom right,
+			 * bottom left, and top left vertices.
+			 */
+
+			/* bottom right */
+			OUT_BATCH_F(box_x2 + pix_xoff);
+			OUT_BATCH_F(box_y2 + pix_yoff);
+			OUT_BATCH_F((box_x2 - dxo) * src_scale_x);
+			OUT_BATCH_F((box_y2 - dyo) * src_scale_y);
+
+			/* bottom left */
+			OUT_BATCH_F(box_x1 + pix_xoff);
+			OUT_BATCH_F(box_y2 + pix_yoff);
+			OUT_BATCH_F((box_x1 - dxo) * src_scale_x);
+			OUT_BATCH_F((box_y2 - dyo) * src_scale_y);
+
+			/* top left */
+			OUT_BATCH_F(box_x1 + pix_xoff);
+			OUT_BATCH_F(box_y1 + pix_yoff);
+			OUT_BATCH_F((box_x1 - dxo) * src_scale_x);
+			OUT_BATCH_F((box_y1 - dyo) * src_scale_y);
+		}
+
+		intel_batch_end_atomic(scrn);
+	}
+
+	if (target != pixmap) {
+		GCPtr gc;
+
+		gc = GetScratchGC(pixmap->drawable.depth,
+				  pixmap->drawable.pScreen);
+		if (gc) {
+			RegionPtr tmp;
+
+			ValidateGC(&pixmap->drawable, gc);
+
+			if (REGION_NUM_RECTS(dstRegion) > 1) {
+				tmp = REGION_CREATE(pixmap->drawable.pScreen, NULL, 0);
+				if (tmp) {
+					REGION_COPY(pixmap->drawable.pScreen, tmp, dstRegion);
+					gc->funcs->ChangeClip(gc, CT_REGION, tmp, 0);
+				}
+			}
+
+			gc->ops->CopyArea(&target->drawable, &pixmap->drawable, gc,
+					  0, 0,
+					  target->drawable.width,
+					  target->drawable.height,
+					  -pix_xoff, -pix_yoff);
+			FreeScratchGC(gc);
+		}
 
-   intel_batch_end_atomic(pScrn);
-   }
+		target->drawable.pScreen->DestroyPixmap(target);
+	}
 
-   i830MarkSync(pScrn);
+	i830_debug_flush(scrn);
 }
-
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c new/xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c	2010-12-27 16:40:21.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c	2011-02-08 11:14:00.000000000 +0100
@@ -52,48 +52,49 @@
 #define VERTEX_BUFFER_SIZE		(256 * VERTEX_FLOATS_PER_COMPOSITE)
 
 struct blendinfo {
-    Bool dst_alpha;
-    Bool src_alpha;
-    uint32_t src_blend;
-    uint32_t dst_blend;
+	Bool dst_alpha;
+	Bool src_alpha;
+	uint32_t src_blend;
+	uint32_t dst_blend;
 };
 
 struct formatinfo {
-    int fmt;
-    uint32_t card_fmt;
+	int fmt;
+	uint32_t card_fmt;
 };
 
 // refer vol2, 3d rasterization 3.8.1
 
 /* defined in brw_defines.h */
 static struct blendinfo i965_blend_op[] = {
-    /* Clear */
-    {0, 0, BRW_BLENDFACTOR_ZERO,          BRW_BLENDFACTOR_ZERO},
-    /* Src */
-    {0, 0, BRW_BLENDFACTOR_ONE,           BRW_BLENDFACTOR_ZERO},
-    /* Dst */
-    {0, 0, BRW_BLENDFACTOR_ZERO,          BRW_BLENDFACTOR_ONE},
-    /* Over */
-    {0, 1, BRW_BLENDFACTOR_ONE,           BRW_BLENDFACTOR_INV_SRC_ALPHA},
-    /* OverReverse */
-    {1, 0, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_ONE},
-    /* In */
-    {1, 0, BRW_BLENDFACTOR_DST_ALPHA,     BRW_BLENDFACTOR_ZERO},
-    /* InReverse */
-    {0, 1, BRW_BLENDFACTOR_ZERO,          BRW_BLENDFACTOR_SRC_ALPHA},
-    /* Out */
-    {1, 0, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_ZERO},
-    /* OutReverse */
-    {0, 1, BRW_BLENDFACTOR_ZERO,          BRW_BLENDFACTOR_INV_SRC_ALPHA},
-    /* Atop */
-    {1, 1, BRW_BLENDFACTOR_DST_ALPHA,     BRW_BLENDFACTOR_INV_SRC_ALPHA},
-    /* AtopReverse */
-    {1, 1, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_SRC_ALPHA},
-    /* Xor */
-    {1, 1, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_INV_SRC_ALPHA},
-    /* Add */
-    {0, 0, BRW_BLENDFACTOR_ONE,           BRW_BLENDFACTOR_ONE},
+	/* Clear */
+	{0, 0, BRW_BLENDFACTOR_ZERO, BRW_BLENDFACTOR_ZERO},
+	/* Src */
+	{0, 0, BRW_BLENDFACTOR_ONE, BRW_BLENDFACTOR_ZERO},
+	/* Dst */
+	{0, 0, BRW_BLENDFACTOR_ZERO, BRW_BLENDFACTOR_ONE},
+	/* Over */
+	{0, 1, BRW_BLENDFACTOR_ONE, BRW_BLENDFACTOR_INV_SRC_ALPHA},
+	/* OverReverse */
+	{1, 0, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_ONE},
+	/* In */
+	{1, 0, BRW_BLENDFACTOR_DST_ALPHA, BRW_BLENDFACTOR_ZERO},
+	/* InReverse */
+	{0, 1, BRW_BLENDFACTOR_ZERO, BRW_BLENDFACTOR_SRC_ALPHA},
+	/* Out */
+	{1, 0, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_ZERO},
+	/* OutReverse */
+	{0, 1, BRW_BLENDFACTOR_ZERO, BRW_BLENDFACTOR_INV_SRC_ALPHA},
+	/* Atop */
+	{1, 1, BRW_BLENDFACTOR_DST_ALPHA, BRW_BLENDFACTOR_INV_SRC_ALPHA},
+	/* AtopReverse */
+	{1, 1, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_SRC_ALPHA},
+	/* Xor */
+	{1, 1, BRW_BLENDFACTOR_INV_DST_ALPHA, BRW_BLENDFACTOR_INV_SRC_ALPHA},
+	/* Add */
+	{0, 0, BRW_BLENDFACTOR_ONE, BRW_BLENDFACTOR_ONE},
 };
+
 /**
  * Highest-valued BLENDFACTOR used in i965_blend_op.
  *
@@ -107,154 +108,177 @@ static struct blendinfo i965_blend_op[]
  * 1.7.2
  */
 static struct formatinfo i965_tex_formats[] = {
-    {PICT_a8r8g8b8, BRW_SURFACEFORMAT_B8G8R8A8_UNORM },
-    {PICT_x8r8g8b8, BRW_SURFACEFORMAT_B8G8R8X8_UNORM },
-    {PICT_a8b8g8r8, BRW_SURFACEFORMAT_R8G8B8A8_UNORM },
-    {PICT_x8b8g8r8, BRW_SURFACEFORMAT_R8G8B8X8_UNORM },
-    {PICT_r5g6b5,   BRW_SURFACEFORMAT_B5G6R5_UNORM   },
-    {PICT_a1r5g5b5, BRW_SURFACEFORMAT_B5G5R5A1_UNORM },
-    {PICT_a8,       BRW_SURFACEFORMAT_A8_UNORM	 },
-};
-
-static void i965_get_blend_cntl(int op, PicturePtr pMask, uint32_t dst_format,
-				uint32_t *sblend, uint32_t *dblend)
-{
-
-    *sblend = i965_blend_op[op].src_blend;
-    *dblend = i965_blend_op[op].dst_blend;
-
-    /* If there's no dst alpha channel, adjust the blend op so that we'll treat
-     * it as always 1.
-     */
-    if (PICT_FORMAT_A(dst_format) == 0 && i965_blend_op[op].dst_alpha) {
-        if (*sblend == BRW_BLENDFACTOR_DST_ALPHA)
-            *sblend = BRW_BLENDFACTOR_ONE;
-        else if (*sblend == BRW_BLENDFACTOR_INV_DST_ALPHA)
-            *sblend = BRW_BLENDFACTOR_ZERO;
-    }
-
-    /* If the source alpha is being used, then we should only be in a case where
-     * the source blend factor is 0, and the source blend value is the mask
-     * channels multiplied by the source picture's alpha.
-     */
-    if (pMask && pMask->componentAlpha && PICT_FORMAT_RGB(pMask->format)
-            && i965_blend_op[op].src_alpha) {
-        if (*dblend == BRW_BLENDFACTOR_SRC_ALPHA) {
-	    *dblend = BRW_BLENDFACTOR_SRC_COLOR;
-        } else if (*dblend == BRW_BLENDFACTOR_INV_SRC_ALPHA) {
-	    *dblend = BRW_BLENDFACTOR_INV_SRC_COLOR;
-        }
-    }
-
-}
-
-static Bool i965_get_dest_format(PicturePtr pDstPicture, uint32_t *dst_format)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
-
-    switch (pDstPicture->format) {
-    case PICT_a8r8g8b8:
-    case PICT_x8r8g8b8:
-        *dst_format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
-        break;
-    case PICT_r5g6b5:
-        *dst_format = BRW_SURFACEFORMAT_B5G6R5_UNORM;
-        break;
-    case PICT_a1r5g5b5:
-    	*dst_format = BRW_SURFACEFORMAT_B5G5R5A1_UNORM;
-	break;
-    case PICT_x1r5g5b5:
-        *dst_format = BRW_SURFACEFORMAT_B5G5R5X1_UNORM;
-        break;
-    case PICT_a8:
-        *dst_format = BRW_SURFACEFORMAT_A8_UNORM;
-        break;
-    case PICT_a4r4g4b4:
-    case PICT_x4r4g4b4:
-	*dst_format = BRW_SURFACEFORMAT_B4G4R4A4_UNORM;
-	break;
-    default:
-        I830FALLBACK("Unsupported dest format 0x%x\n",
-		     (int)pDstPicture->format);
-    }
+	{PICT_a8r8g8b8, BRW_SURFACEFORMAT_B8G8R8A8_UNORM},
+	{PICT_x8r8g8b8, BRW_SURFACEFORMAT_B8G8R8X8_UNORM},
+	{PICT_a8b8g8r8, BRW_SURFACEFORMAT_R8G8B8A8_UNORM},
+	{PICT_x8b8g8r8, BRW_SURFACEFORMAT_R8G8B8X8_UNORM},
+	{PICT_r5g6b5, BRW_SURFACEFORMAT_B5G6R5_UNORM},
+	{PICT_a1r5g5b5, BRW_SURFACEFORMAT_B5G5R5A1_UNORM},
+	{PICT_a8, BRW_SURFACEFORMAT_A8_UNORM},
+};
+
+static void i965_get_blend_cntl(int op, PicturePtr mask, uint32_t dst_format,
+				uint32_t * sblend, uint32_t * dblend)
+{
+
+	*sblend = i965_blend_op[op].src_blend;
+	*dblend = i965_blend_op[op].dst_blend;
+
+	/* If there's no dst alpha channel, adjust the blend op so that we'll treat
+	 * it as always 1.
+	 */
+	if (PICT_FORMAT_A(dst_format) == 0 && i965_blend_op[op].dst_alpha) {
+		if (*sblend == BRW_BLENDFACTOR_DST_ALPHA)
+			*sblend = BRW_BLENDFACTOR_ONE;
+		else if (*sblend == BRW_BLENDFACTOR_INV_DST_ALPHA)
+			*sblend = BRW_BLENDFACTOR_ZERO;
+	}
+
+	/* If the source alpha is being used, then we should only be in a case where
+	 * the source blend factor is 0, and the source blend value is the mask
+	 * channels multiplied by the source picture's alpha.
+	 */
+	if (mask && mask->componentAlpha && PICT_FORMAT_RGB(mask->format)
+	    && i965_blend_op[op].src_alpha) {
+		if (*dblend == BRW_BLENDFACTOR_SRC_ALPHA) {
+			*dblend = BRW_BLENDFACTOR_SRC_COLOR;
+		} else if (*dblend == BRW_BLENDFACTOR_INV_SRC_ALPHA) {
+			*dblend = BRW_BLENDFACTOR_INV_SRC_COLOR;
+		}
+	}
 
-    return TRUE;
 }
 
-static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
+static Bool i965_get_dest_format(PicturePtr dest_picture, uint32_t * dst_format)
 {
-    if (pPict->pDrawable == NULL)
-	return FALSE;
-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-    int w = pPict->pDrawable->width;
-    int h = pPict->pDrawable->height;
-    int i;
-
-    if ((w > 8192) || (h > 8192))
-        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-
-    for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
-	 i++)
-    {
-        if (i965_tex_formats[i].fmt == pPict->format)
-            break;
-    }
-    if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
-        I830FALLBACK("Unsupported picture format 0x%x\n",
-		     (int)pPict->format);
-
-    if (pPict->repeatType > RepeatReflect)
-	I830FALLBACK("extended repeat (%d) not supported\n",
-		     pPict->repeatType);
-
-    if (pPict->filter != PictFilterNearest &&
-        pPict->filter != PictFilterBilinear)
-    {
-        I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
-    }
+	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
 
-    return TRUE;
+	switch (dest_picture->format) {
+	case PICT_a8r8g8b8:
+	case PICT_x8r8g8b8:
+		*dst_format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
+		break;
+	case PICT_r5g6b5:
+		*dst_format = BRW_SURFACEFORMAT_B5G6R5_UNORM;
+		break;
+	case PICT_a1r5g5b5:
+		*dst_format = BRW_SURFACEFORMAT_B5G5R5A1_UNORM;
+		break;
+	case PICT_x1r5g5b5:
+		*dst_format = BRW_SURFACEFORMAT_B5G5R5X1_UNORM;
+		break;
+	case PICT_a8:
+		*dst_format = BRW_SURFACEFORMAT_A8_UNORM;
+		break;
+	case PICT_a4r4g4b4:
+	case PICT_x4r4g4b4:
+		*dst_format = BRW_SURFACEFORMAT_B4G4R4A4_UNORM;
+		break;
+	default:
+		intel_debug_fallback(scrn, "Unsupported dest format 0x%x\n",
+				     (int)dest_picture->format);
+		return FALSE;
+	}
+
+	return TRUE;
 }
 
 Bool
-i965_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
-		     PicturePtr pDstPicture)
+i965_check_composite(int op,
+		     PicturePtr source_picture,
+		     PicturePtr mask_picture,
+		     PicturePtr dest_picture,
+		     int width, int height)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+	uint32_t tmp1;
+
+	/* Check for unsupported compositing operations. */
+	if (op >= sizeof(i965_blend_op) / sizeof(i965_blend_op[0])) {
+		intel_debug_fallback(scrn,
+				     "Unsupported Composite op 0x%x\n", op);
+		return FALSE;
+	}
+
+	if (mask_picture && mask_picture->componentAlpha &&
+	    PICT_FORMAT_RGB(mask_picture->format)) {
+		/* Check if it's component alpha that relies on a source alpha and on
+		 * the source value.  We can only get one of those into the single
+		 * source value that we get to blend with.
+		 */
+		if (i965_blend_op[op].src_alpha &&
+		    (i965_blend_op[op].src_blend != BRW_BLENDFACTOR_ZERO)) {
+			intel_debug_fallback(scrn,
+					     "Component alpha not supported "
+					     "with source alpha and source "
+					     "value blending.\n");
+			return FALSE;
+		}
+	}
+
+	if (!i965_get_dest_format(dest_picture, &tmp1)) {
+		intel_debug_fallback(scrn, "Get Color buffer format\n");
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+Bool
+i965_check_composite_texture(ScreenPtr screen, PicturePtr picture)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
-    uint32_t tmp1;
+	if (picture->repeatType > RepeatReflect) {
+		ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+		intel_debug_fallback(scrn,
+				     "extended repeat (%d) not supported\n",
+				     picture->repeatType);
+		return FALSE;
+	}
 
-    /* Check for unsupported compositing operations. */
-    if (op >= sizeof(i965_blend_op) / sizeof(i965_blend_op[0]))
-        I830FALLBACK("Unsupported Composite op 0x%x\n", op);
-
-    if (pMaskPicture && pMaskPicture->componentAlpha &&
-            PICT_FORMAT_RGB(pMaskPicture->format)) {
-        /* Check if it's component alpha that relies on a source alpha and on
-         * the source value.  We can only get one of those into the single
-         * source value that we get to blend with.
-         */
-        if (i965_blend_op[op].src_alpha &&
-            (i965_blend_op[op].src_blend != BRW_BLENDFACTOR_ZERO))
-	{
-	    I830FALLBACK("Component alpha not supported with source "
-			 "alpha and source value blending.\n");
+	if (picture->filter != PictFilterNearest &&
+	    picture->filter != PictFilterBilinear) {
+		ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+		intel_debug_fallback(scrn, "Unsupported filter 0x%x\n",
+				     picture->filter);
+		return FALSE;
 	}
-    } 
 
-    if (!i965_check_composite_texture(pSrcPicture, 0))
-        I830FALLBACK("Check Src picture texture\n");
-    if (pMaskPicture != NULL && !i965_check_composite_texture(pMaskPicture, 1))
-        I830FALLBACK("Check Mask picture texture\n");
+	if (picture->pDrawable) {
+		int w, h, i;
 
-    if (!i965_get_dest_format(pDstPicture, &tmp1))
-	I830FALLBACK("Get Color buffer format\n");
+		w = picture->pDrawable->width;
+		h = picture->pDrawable->height;
+		if ((w > 8192) || (h > 8192)) {
+			ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+			intel_debug_fallback(scrn,
+					     "Picture w/h too large (%dx%d)\n",
+					     w, h);
+			return FALSE;
+		}
 
-    return TRUE;
+		for (i = 0;
+		     i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
+		     i++) {
+			if (i965_tex_formats[i].fmt == picture->format)
+				break;
+		}
+		if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
+		{
+			ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+			intel_debug_fallback(scrn,
+					     "Unsupported picture format "
+					     "0x%x\n",
+					     (int)picture->format);
+			return FALSE;
+		}
 
+		return TRUE;
+	}
+
+	return FALSE;
 }
 
-#define ALIGN(i,m)    (((i) + (m) - 1) & ~((m) - 1))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
 #define BRW_GRF_BLOCKS(nreg)    ((nreg + 15) / 16 - 1)
 
 /* Set up a default static partitioning of the URB, which is supposed to
@@ -263,8 +287,8 @@ i965_check_composite(int op, PicturePtr
 #define URB_CS_ENTRY_SIZE     0
 #define URB_CS_ENTRIES	      0
 
-#define URB_VS_ENTRY_SIZE     1	  // each 512-bit row
-#define URB_VS_ENTRIES	      8	  // we needs at least 8 entries
+#define URB_VS_ENTRY_SIZE     1	// each 512-bit row
+#define URB_VS_ENTRIES	      8	// we needs at least 8 entries
 
 #define URB_GS_ENTRY_SIZE     0
 #define URB_GS_ENTRIES	      0
@@ -277,25 +301,25 @@ i965_check_composite(int op, PicturePtr
 
 static const uint32_t sip_kernel_static[][4] = {
 /*    wait (1) a0<1>UW a145<0,1,0>UW { align1 +  } */
-    { 0x00000030, 0x20000108, 0x00001220, 0x00000000 },
+	{0x00000030, 0x20000108, 0x00001220, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 };
 
 /*
@@ -318,21 +342,21 @@ static const uint32_t sf_kernel_mask_sta
 #define PS_KERNEL_NUM_GRF   32
 #define PS_MAX_THREADS	    48
 
-static const uint32_t ps_kernel_nomask_affine_static [][4] = {
+static const uint32_t ps_kernel_nomask_affine_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_argb.g4b"
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_nomask_projective_static [][4] = {
+static const uint32_t ps_kernel_nomask_projective_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_projective.g4b"
 #include "exa_wm_src_sample_argb.g4b"
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_maskca_affine_static [][4] = {
+static const uint32_t ps_kernel_maskca_affine_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_argb.g4b"
@@ -342,7 +366,7 @@ static const uint32_t ps_kernel_maskca_a
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_maskca_projective_static [][4] = {
+static const uint32_t ps_kernel_maskca_projective_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_projective.g4b"
 #include "exa_wm_src_sample_argb.g4b"
@@ -352,7 +376,7 @@ static const uint32_t ps_kernel_maskca_p
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_maskca_srcalpha_affine_static [][4] = {
+static const uint32_t ps_kernel_maskca_srcalpha_affine_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_a.g4b"
@@ -362,7 +386,7 @@ static const uint32_t ps_kernel_maskca_s
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_maskca_srcalpha_projective_static [][4] = {
+static const uint32_t ps_kernel_maskca_srcalpha_projective_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_projective.g4b"
 #include "exa_wm_src_sample_a.g4b"
@@ -372,7 +396,7 @@ static const uint32_t ps_kernel_maskca_s
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_masknoca_affine_static [][4] = {
+static const uint32_t ps_kernel_masknoca_affine_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_argb.g4b"
@@ -382,7 +406,7 @@ static const uint32_t ps_kernel_masknoca
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_masknoca_projective_static [][4] = {
+static const uint32_t ps_kernel_masknoca_projective_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_projective.g4b"
 #include "exa_wm_src_sample_argb.g4b"
@@ -392,6 +416,89 @@ static const uint32_t ps_kernel_masknoca
 #include "exa_wm_write.g4b"
 };
 
+/* new programs for IGDNG */
+static const uint32_t sf_kernel_static_gen5[][4] = {
+#include "exa_sf.g4b.gen5"
+};
+
+static const uint32_t sf_kernel_mask_static_gen5[][4] = {
+#include "exa_sf_mask.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_nomask_affine_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_affine.g4b.gen5"
+#include "exa_wm_src_sample_argb.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_nomask_projective_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_projective.g4b.gen5"
+#include "exa_wm_src_sample_argb.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_maskca_affine_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_affine.g4b.gen5"
+#include "exa_wm_src_sample_argb.g4b.gen5"
+#include "exa_wm_mask_affine.g4b.gen5"
+#include "exa_wm_mask_sample_argb.g4b.gen5"
+#include "exa_wm_ca.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_maskca_projective_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_projective.g4b.gen5"
+#include "exa_wm_src_sample_argb.g4b.gen5"
+#include "exa_wm_mask_projective.g4b.gen5"
+#include "exa_wm_mask_sample_argb.g4b.gen5"
+#include "exa_wm_ca.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_maskca_srcalpha_affine_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_affine.g4b.gen5"
+#include "exa_wm_src_sample_a.g4b.gen5"
+#include "exa_wm_mask_affine.g4b.gen5"
+#include "exa_wm_mask_sample_argb.g4b.gen5"
+#include "exa_wm_ca_srcalpha.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_maskca_srcalpha_projective_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_projective.g4b.gen5"
+#include "exa_wm_src_sample_a.g4b.gen5"
+#include "exa_wm_mask_projective.g4b.gen5"
+#include "exa_wm_mask_sample_argb.g4b.gen5"
+#include "exa_wm_ca_srcalpha.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_masknoca_affine_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_affine.g4b.gen5"
+#include "exa_wm_src_sample_argb.g4b.gen5"
+#include "exa_wm_mask_affine.g4b.gen5"
+#include "exa_wm_mask_sample_a.g4b.gen5"
+#include "exa_wm_noca.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_masknoca_projective_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_projective.g4b.gen5"
+#include "exa_wm_src_sample_argb.g4b.gen5"
+#include "exa_wm_mask_projective.g4b.gen5"
+#include "exa_wm_mask_sample_a.g4b.gen5"
+#include "exa_wm_noca.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
 #define WM_STATE_DECL(kernel) \
     struct brw_wm_unit_state wm_state_ ## kernel[SAMPLER_STATE_FILTER_COUNT] \
 						[SAMPLER_STATE_EXTEND_COUNT] \
@@ -406,114 +513,128 @@ static const uint32_t ps_kernel_masknoca
 #define PAD64(previous, idx) PAD64_MULTI(previous, idx, 1)
 
 typedef enum {
-    SAMPLER_STATE_FILTER_NEAREST,
-    SAMPLER_STATE_FILTER_BILINEAR,
-    SAMPLER_STATE_FILTER_COUNT
+	SAMPLER_STATE_FILTER_NEAREST,
+	SAMPLER_STATE_FILTER_BILINEAR,
+	SAMPLER_STATE_FILTER_COUNT
 } sampler_state_filter_t;
 
 typedef enum {
-    SAMPLER_STATE_EXTEND_NONE,
-    SAMPLER_STATE_EXTEND_REPEAT,
-    SAMPLER_STATE_EXTEND_PAD,
-    SAMPLER_STATE_EXTEND_REFLECT,
-    SAMPLER_STATE_EXTEND_COUNT
+	SAMPLER_STATE_EXTEND_NONE,
+	SAMPLER_STATE_EXTEND_REPEAT,
+	SAMPLER_STATE_EXTEND_PAD,
+	SAMPLER_STATE_EXTEND_REFLECT,
+	SAMPLER_STATE_EXTEND_COUNT
 } sampler_state_extend_t;
 
 typedef enum {
-    WM_KERNEL_NOMASK_AFFINE,
-    WM_KERNEL_NOMASK_PROJECTIVE,
-    WM_KERNEL_MASKCA_AFFINE,
-    WM_KERNEL_MASKCA_PROJECTIVE,
-    WM_KERNEL_MASKCA_SRCALPHA_AFFINE,
-    WM_KERNEL_MASKCA_SRCALPHA_PROJECTIVE,
-    WM_KERNEL_MASKNOCA_AFFINE,
-    WM_KERNEL_MASKNOCA_PROJECTIVE,
-    WM_KERNEL_COUNT
+	WM_KERNEL_NOMASK_AFFINE,
+	WM_KERNEL_NOMASK_PROJECTIVE,
+	WM_KERNEL_MASKCA_AFFINE,
+	WM_KERNEL_MASKCA_PROJECTIVE,
+	WM_KERNEL_MASKCA_SRCALPHA_AFFINE,
+	WM_KERNEL_MASKCA_SRCALPHA_PROJECTIVE,
+	WM_KERNEL_MASKNOCA_AFFINE,
+	WM_KERNEL_MASKNOCA_PROJECTIVE,
+	WM_KERNEL_COUNT
 } wm_kernel_t;
 
 #define KERNEL(kernel_enum, kernel, masked) \
     [kernel_enum] = {&kernel, sizeof(kernel), masked}
 struct wm_kernel_info {
-    void *data;
-    unsigned int size;
-    Bool has_mask;
-} wm_kernels[] = {
-    KERNEL(WM_KERNEL_NOMASK_AFFINE,
-	   ps_kernel_nomask_affine_static, FALSE),
-    KERNEL(WM_KERNEL_NOMASK_PROJECTIVE,
-	   ps_kernel_nomask_projective_static, FALSE),
-    KERNEL(WM_KERNEL_MASKCA_AFFINE,
-	   ps_kernel_maskca_affine_static, TRUE),
-    KERNEL(WM_KERNEL_MASKCA_PROJECTIVE,
-	   ps_kernel_maskca_projective_static, TRUE),
-    KERNEL(WM_KERNEL_MASKCA_SRCALPHA_AFFINE,
-	   ps_kernel_maskca_srcalpha_affine_static, TRUE),
-    KERNEL(WM_KERNEL_MASKCA_SRCALPHA_PROJECTIVE,
-	   ps_kernel_maskca_srcalpha_projective_static, TRUE),
-    KERNEL(WM_KERNEL_MASKNOCA_AFFINE,
-	   ps_kernel_masknoca_affine_static, TRUE),
-    KERNEL(WM_KERNEL_MASKNOCA_PROJECTIVE,
-	   ps_kernel_masknoca_projective_static, TRUE),
+	void *data;
+	unsigned int size;
+	Bool has_mask;
+};
+
+static struct wm_kernel_info wm_kernels[] = {
+	KERNEL(WM_KERNEL_NOMASK_AFFINE,
+	       ps_kernel_nomask_affine_static, FALSE),
+	KERNEL(WM_KERNEL_NOMASK_PROJECTIVE,
+	       ps_kernel_nomask_projective_static, FALSE),
+	KERNEL(WM_KERNEL_MASKCA_AFFINE,
+	       ps_kernel_maskca_affine_static, TRUE),
+	KERNEL(WM_KERNEL_MASKCA_PROJECTIVE,
+	       ps_kernel_maskca_projective_static, TRUE),
+	KERNEL(WM_KERNEL_MASKCA_SRCALPHA_AFFINE,
+	       ps_kernel_maskca_srcalpha_affine_static, TRUE),
+	KERNEL(WM_KERNEL_MASKCA_SRCALPHA_PROJECTIVE,
+	       ps_kernel_maskca_srcalpha_projective_static, TRUE),
+	KERNEL(WM_KERNEL_MASKNOCA_AFFINE,
+	       ps_kernel_masknoca_affine_static, TRUE),
+	KERNEL(WM_KERNEL_MASKNOCA_PROJECTIVE,
+	       ps_kernel_masknoca_projective_static, TRUE),
 };
+
+static struct wm_kernel_info wm_kernels_gen5[] = {
+	KERNEL(WM_KERNEL_NOMASK_AFFINE,
+	       ps_kernel_nomask_affine_static_gen5, FALSE),
+	KERNEL(WM_KERNEL_NOMASK_PROJECTIVE,
+	       ps_kernel_nomask_projective_static_gen5, FALSE),
+	KERNEL(WM_KERNEL_MASKCA_AFFINE,
+	       ps_kernel_maskca_affine_static_gen5, TRUE),
+	KERNEL(WM_KERNEL_MASKCA_PROJECTIVE,
+	       ps_kernel_maskca_projective_static_gen5, TRUE),
+	KERNEL(WM_KERNEL_MASKCA_SRCALPHA_AFFINE,
+	       ps_kernel_maskca_srcalpha_affine_static_gen5, TRUE),
+	KERNEL(WM_KERNEL_MASKCA_SRCALPHA_PROJECTIVE,
+	       ps_kernel_maskca_srcalpha_projective_static_gen5, TRUE),
+	KERNEL(WM_KERNEL_MASKNOCA_AFFINE,
+	       ps_kernel_masknoca_affine_static_gen5, TRUE),
+	KERNEL(WM_KERNEL_MASKNOCA_PROJECTIVE,
+	       ps_kernel_masknoca_projective_static_gen5, TRUE),
+};
+
 #undef KERNEL
 
 typedef struct _brw_cc_unit_state_padded {
-    struct brw_cc_unit_state state;
-    char pad[64 - sizeof (struct brw_cc_unit_state)];
+	struct brw_cc_unit_state state;
+	char pad[64 - sizeof(struct brw_cc_unit_state)];
 } brw_cc_unit_state_padded;
 
 typedef struct brw_surface_state_padded {
-    struct brw_surface_state state;
-    char pad[32 - sizeof (struct brw_surface_state)];
+	struct brw_surface_state state;
+	char pad[32 - sizeof(struct brw_surface_state)];
 } brw_surface_state_padded;
 
 struct gen4_cc_unit_state {
-    /* Index by [src_blend][dst_blend] */
-    brw_cc_unit_state_padded cc_state[BRW_BLENDFACTOR_COUNT]
-				     [BRW_BLENDFACTOR_COUNT];
+	/* Index by [src_blend][dst_blend] */
+	brw_cc_unit_state_padded cc_state[BRW_BLENDFACTOR_COUNT]
+	    [BRW_BLENDFACTOR_COUNT];
 };
 
 typedef float gen4_vertex_buffer[VERTEX_BUFFER_SIZE];
 
 typedef struct gen4_composite_op {
-    int		op;
-    PicturePtr	source_picture;
-    PicturePtr	mask_picture;
-    PicturePtr	dest_picture;
-    PixmapPtr	source;
-    PixmapPtr	mask;
-    PixmapPtr	dest;
-    drm_intel_bo *binding_table_bo;
-    sampler_state_filter_t src_filter;
-    sampler_state_filter_t mask_filter;
-    sampler_state_extend_t src_extend;
-    sampler_state_extend_t mask_extend;
-    Bool is_affine;
-    wm_kernel_t wm_kernel;
+	int op;
+	drm_intel_bo *binding_table_bo;
+	sampler_state_filter_t src_filter;
+	sampler_state_filter_t mask_filter;
+	sampler_state_extend_t src_extend;
+	sampler_state_extend_t mask_extend;
+	Bool is_affine;
+	wm_kernel_t wm_kernel;
 } gen4_composite_op;
 
 /** Private data for gen4 render accel implementation. */
 struct gen4_render_state {
-    drm_intel_bo *vs_state_bo;
-    drm_intel_bo *sf_state_bo;
-    drm_intel_bo *sf_mask_state_bo;
-    drm_intel_bo *cc_state_bo;
-    drm_intel_bo *wm_state_bo[WM_KERNEL_COUNT]
-			     [SAMPLER_STATE_FILTER_COUNT]
-			     [SAMPLER_STATE_EXTEND_COUNT]
-			     [SAMPLER_STATE_FILTER_COUNT]
-			     [SAMPLER_STATE_EXTEND_COUNT];
-    drm_intel_bo *wm_kernel_bo[WM_KERNEL_COUNT];
-
-    drm_intel_bo *sip_kernel_bo;
-    dri_bo* vertex_buffer_bo;
+	drm_intel_bo *vs_state_bo;
+	drm_intel_bo *sf_state_bo;
+	drm_intel_bo *sf_mask_state_bo;
+	drm_intel_bo *cc_state_bo;
+	drm_intel_bo *wm_state_bo[WM_KERNEL_COUNT]
+	    [SAMPLER_STATE_FILTER_COUNT]
+	    [SAMPLER_STATE_EXTEND_COUNT]
+	    [SAMPLER_STATE_FILTER_COUNT]
+	    [SAMPLER_STATE_EXTEND_COUNT];
+	drm_intel_bo *wm_kernel_bo[WM_KERNEL_COUNT];
 
-    gen4_composite_op composite_op;
+	drm_intel_bo *sip_kernel_bo;
+	dri_bo *vertex_buffer_bo;
 
-    int vb_offset;
-    int vertex_size;
+	gen4_composite_op composite_op;
 
-    Bool needs_state_emit;
+	int vb_offset;
+	int vertex_size;
 };
 
 /**
@@ -523,394 +644,400 @@ struct gen4_render_state {
  * calculate dA/dx and dA/dy.  Hand these interpolation coefficients
  * back to SF which then hands pixels off to WM.
  */
-static drm_intel_bo *
-gen4_create_sf_state(ScrnInfoPtr scrn, drm_intel_bo *kernel_bo)
+static drm_intel_bo *gen4_create_sf_state(ScrnInfoPtr scrn,
+					  drm_intel_bo * kernel_bo)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    struct brw_sf_unit_state *sf_state;
-    drm_intel_bo *sf_state_bo;
-
-    sf_state_bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 SF state",
-				     sizeof(*sf_state), 4096);
-    drm_intel_bo_map(sf_state_bo, TRUE);
-    sf_state = sf_state_bo->virtual;
-
-    memset(sf_state, 0, sizeof(*sf_state));
-    sf_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(SF_KERNEL_NUM_GRF);
-    sf_state->thread0.kernel_start_pointer =
-	intel_emit_reloc(sf_state_bo,
-			 offsetof(struct brw_sf_unit_state, thread0),
-			 kernel_bo, sf_state->thread0.grf_reg_count << 1,
-			 I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
-    sf_state->sf1.single_program_flow = 1;
-    sf_state->sf1.binding_table_entry_count = 0;
-    sf_state->sf1.thread_priority = 0;
-    sf_state->sf1.floating_point_mode = 0; /* Mesa does this */
-    sf_state->sf1.illegal_op_exception_enable = 1;
-    sf_state->sf1.mask_stack_exception_enable = 1;
-    sf_state->sf1.sw_exception_enable = 1;
-    sf_state->thread2.per_thread_scratch_space = 0;
-    /* scratch space is not used in our kernel */
-    sf_state->thread2.scratch_space_base_pointer = 0;
-    sf_state->thread3.const_urb_entry_read_length = 0; /* no const URBs */
-    sf_state->thread3.const_urb_entry_read_offset = 0; /* no const URBs */
-    sf_state->thread3.urb_entry_read_length = 1; /* 1 URB per vertex */
-    /* don't smash vertex header, read start from dw8 */
-    sf_state->thread3.urb_entry_read_offset = 1;
-    sf_state->thread3.dispatch_grf_start_reg = 3;
-    sf_state->thread4.max_threads = SF_MAX_THREADS - 1;
-    sf_state->thread4.urb_entry_allocation_size = URB_SF_ENTRY_SIZE - 1;
-    sf_state->thread4.nr_urb_entries = URB_SF_ENTRIES;
-    sf_state->thread4.stats_enable = 1;
-    sf_state->sf5.viewport_transform = FALSE; /* skip viewport */
-    sf_state->sf6.cull_mode = BRW_CULLMODE_NONE;
-    sf_state->sf6.scissor = 0;
-    sf_state->sf7.trifan_pv = 2;
-    sf_state->sf6.dest_org_vbias = 0x8;
-    sf_state->sf6.dest_org_hbias = 0x8;
-
-    drm_intel_bo_unmap(sf_state_bo);
-
-    return sf_state_bo;
-}
-
-static drm_intel_bo *
-sampler_border_color_create(ScrnInfoPtr scrn)
-{
-    struct brw_sampler_legacy_border_color sampler_border_color;
-
-    /* Set up the sampler border color (always transparent black) */
-    memset(&sampler_border_color, 0, sizeof(sampler_border_color));
-    sampler_border_color.color[0] = 0; /* R */
-    sampler_border_color.color[1] = 0; /* G */
-    sampler_border_color.color[2] = 0; /* B */
-    sampler_border_color.color[3] = 0; /* A */
-
-    return intel_bo_alloc_for_data(scrn,
-				   &sampler_border_color,
-				   sizeof(sampler_border_color),
-				   "gen4 render sampler border color");
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct brw_sf_unit_state *sf_state;
+	drm_intel_bo *sf_state_bo;
+
+	sf_state_bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 SF state",
+					 sizeof(*sf_state), 4096);
+	drm_intel_bo_map(sf_state_bo, TRUE);
+	sf_state = sf_state_bo->virtual;
+
+	memset(sf_state, 0, sizeof(*sf_state));
+	sf_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(SF_KERNEL_NUM_GRF);
+	sf_state->thread0.kernel_start_pointer =
+	    intel_emit_reloc(sf_state_bo,
+			     offsetof(struct brw_sf_unit_state, thread0),
+			     kernel_bo, sf_state->thread0.grf_reg_count << 1,
+			     I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
+	sf_state->sf1.single_program_flow = 1;
+	sf_state->sf1.binding_table_entry_count = 0;
+	sf_state->sf1.thread_priority = 0;
+	sf_state->sf1.floating_point_mode = 0;	/* Mesa does this */
+	sf_state->sf1.illegal_op_exception_enable = 1;
+	sf_state->sf1.mask_stack_exception_enable = 1;
+	sf_state->sf1.sw_exception_enable = 1;
+	sf_state->thread2.per_thread_scratch_space = 0;
+	/* scratch space is not used in our kernel */
+	sf_state->thread2.scratch_space_base_pointer = 0;
+	sf_state->thread3.const_urb_entry_read_length = 0;	/* no const URBs */
+	sf_state->thread3.const_urb_entry_read_offset = 0;	/* no const URBs */
+	sf_state->thread3.urb_entry_read_length = 1;	/* 1 URB per vertex */
+	/* don't smash vertex header, read start from dw8 */
+	sf_state->thread3.urb_entry_read_offset = 1;
+	sf_state->thread3.dispatch_grf_start_reg = 3;
+	sf_state->thread4.max_threads = SF_MAX_THREADS - 1;
+	sf_state->thread4.urb_entry_allocation_size = URB_SF_ENTRY_SIZE - 1;
+	sf_state->thread4.nr_urb_entries = URB_SF_ENTRIES;
+	sf_state->thread4.stats_enable = 1;
+	sf_state->sf5.viewport_transform = FALSE;	/* skip viewport */
+	sf_state->sf6.cull_mode = BRW_CULLMODE_NONE;
+	sf_state->sf6.scissor = 0;
+	sf_state->sf7.trifan_pv = 2;
+	sf_state->sf6.dest_org_vbias = 0x8;
+	sf_state->sf6.dest_org_hbias = 0x8;
+
+	drm_intel_bo_unmap(sf_state_bo);
+
+	return sf_state_bo;
+}
+
+static drm_intel_bo *sampler_border_color_create(ScrnInfoPtr scrn)
+{
+	struct brw_sampler_legacy_border_color sampler_border_color;
+
+	/* Set up the sampler border color (always transparent black) */
+	memset(&sampler_border_color, 0, sizeof(sampler_border_color));
+	sampler_border_color.color[0] = 0;	/* R */
+	sampler_border_color.color[1] = 0;	/* G */
+	sampler_border_color.color[2] = 0;	/* B */
+	sampler_border_color.color[3] = 0;	/* A */
+
+	return intel_bo_alloc_for_data(scrn,
+				       &sampler_border_color,
+				       sizeof(sampler_border_color),
+				       "gen4 render sampler border color");
 }
 
 static void
-sampler_state_init (drm_intel_bo *sampler_state_bo,
-		    struct brw_sampler_state *sampler_state,
-		    sampler_state_filter_t filter,
-		    sampler_state_extend_t extend,
-		    drm_intel_bo *border_color_bo)
-{
-    uint32_t sampler_state_offset;
-
-    sampler_state_offset = (char *)sampler_state -
-	(char *)sampler_state_bo->virtual;
-
-    /* PS kernel use this sampler */
-    memset(sampler_state, 0, sizeof(*sampler_state));
-
-    sampler_state->ss0.lod_preclamp = 1; /* GL mode */
-
-    /* We use the legacy mode to get the semantics specified by
-     * the Render extension. */
-    sampler_state->ss0.border_color_mode = BRW_BORDER_COLOR_MODE_LEGACY;
-
-    switch(filter) {
-    default:
-    case SAMPLER_STATE_FILTER_NEAREST:
-	sampler_state->ss0.min_filter = BRW_MAPFILTER_NEAREST;
-	sampler_state->ss0.mag_filter = BRW_MAPFILTER_NEAREST;
-	break;
-    case SAMPLER_STATE_FILTER_BILINEAR:
-	sampler_state->ss0.min_filter = BRW_MAPFILTER_LINEAR;
-	sampler_state->ss0.mag_filter = BRW_MAPFILTER_LINEAR;
-	break;
-    }
-
-    switch (extend) {
-    default:
-    case SAMPLER_STATE_EXTEND_NONE:
-	sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP_BORDER;
-	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP_BORDER;
-	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP_BORDER;
-	break;
-    case SAMPLER_STATE_EXTEND_REPEAT:
-	sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_WRAP;
-	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_WRAP;
-	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_WRAP;
-	break;
-    case SAMPLER_STATE_EXTEND_PAD:
-	sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
-	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
-	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
-	break;
-    case SAMPLER_STATE_EXTEND_REFLECT:
-	sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
-	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
-	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
-	break;
-    }
-
-    sampler_state->ss2.border_color_pointer =
-	intel_emit_reloc(sampler_state_bo, sampler_state_offset +
-			 offsetof(struct brw_sampler_state, ss2),
-			 border_color_bo, 0,
-			 I915_GEM_DOMAIN_SAMPLER, 0) >> 5;
-
-    sampler_state->ss3.chroma_key_enable = 0; /* disable chromakey */
-}
-
-static drm_intel_bo *
-gen4_create_sampler_state(ScrnInfoPtr scrn,
-			  sampler_state_filter_t src_filter,
-			  sampler_state_extend_t src_extend,
-			  sampler_state_filter_t mask_filter,
-			  sampler_state_extend_t mask_extend,
-			  drm_intel_bo *border_color_bo)
-{
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *sampler_state_bo;
-    struct brw_sampler_state *sampler_state;
-
-    sampler_state_bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 sampler state",
-					  sizeof(struct brw_sampler_state) * 2,
-					  4096);
-    drm_intel_bo_map(sampler_state_bo, TRUE);
-    sampler_state = sampler_state_bo->virtual;
-
-    sampler_state_init(sampler_state_bo,
-		       &sampler_state[0],
-		       src_filter, src_extend,
-		       border_color_bo);
-    sampler_state_init(sampler_state_bo,
-		       &sampler_state[1],
-		       mask_filter, mask_extend,
-		       border_color_bo);
+sampler_state_init(drm_intel_bo * sampler_state_bo,
+		   struct brw_sampler_state *sampler_state,
+		   sampler_state_filter_t filter,
+		   sampler_state_extend_t extend,
+		   drm_intel_bo * border_color_bo)
+{
+	uint32_t sampler_state_offset;
+
+	sampler_state_offset = (char *)sampler_state -
+	    (char *)sampler_state_bo->virtual;
+
+	/* PS kernel use this sampler */
+	memset(sampler_state, 0, sizeof(*sampler_state));
+
+	sampler_state->ss0.lod_preclamp = 1;	/* GL mode */
+
+	/* We use the legacy mode to get the semantics specified by
+	 * the Render extension. */
+	sampler_state->ss0.border_color_mode = BRW_BORDER_COLOR_MODE_LEGACY;
+
+	switch (filter) {
+	default:
+	case SAMPLER_STATE_FILTER_NEAREST:
+		sampler_state->ss0.min_filter = BRW_MAPFILTER_NEAREST;
+		sampler_state->ss0.mag_filter = BRW_MAPFILTER_NEAREST;
+		break;
+	case SAMPLER_STATE_FILTER_BILINEAR:
+		sampler_state->ss0.min_filter = BRW_MAPFILTER_LINEAR;
+		sampler_state->ss0.mag_filter = BRW_MAPFILTER_LINEAR;
+		break;
+	}
 
-    drm_intel_bo_unmap(sampler_state_bo);
+	switch (extend) {
+	default:
+	case SAMPLER_STATE_EXTEND_NONE:
+		sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP_BORDER;
+		sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP_BORDER;
+		sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP_BORDER;
+		break;
+	case SAMPLER_STATE_EXTEND_REPEAT:
+		sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_WRAP;
+		sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_WRAP;
+		sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_WRAP;
+		break;
+	case SAMPLER_STATE_EXTEND_PAD:
+		sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
+		sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
+		sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
+		break;
+	case SAMPLER_STATE_EXTEND_REFLECT:
+		sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
+		sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
+		sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_MIRROR;
+		break;
+	}
+
+	sampler_state->ss2.border_color_pointer =
+	    intel_emit_reloc(sampler_state_bo, sampler_state_offset +
+			     offsetof(struct brw_sampler_state, ss2),
+			     border_color_bo, 0,
+			     I915_GEM_DOMAIN_SAMPLER, 0) >> 5;
+
+	sampler_state->ss3.chroma_key_enable = 0;	/* disable chromakey */
+}
+
+static drm_intel_bo *gen4_create_sampler_state(ScrnInfoPtr scrn,
+					       sampler_state_filter_t
+					       src_filter,
+					       sampler_state_extend_t
+					       src_extend,
+					       sampler_state_filter_t
+					       mask_filter,
+					       sampler_state_extend_t
+					       mask_extend,
+					       drm_intel_bo * border_color_bo)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *sampler_state_bo;
+	struct brw_sampler_state *sampler_state;
+
+	sampler_state_bo =
+	    drm_intel_bo_alloc(intel->bufmgr, "gen4 sampler state",
+			       sizeof(struct brw_sampler_state) * 2, 4096);
+	drm_intel_bo_map(sampler_state_bo, TRUE);
+	sampler_state = sampler_state_bo->virtual;
+
+	sampler_state_init(sampler_state_bo,
+			   &sampler_state[0],
+			   src_filter, src_extend, border_color_bo);
+	sampler_state_init(sampler_state_bo,
+			   &sampler_state[1],
+			   mask_filter, mask_extend, border_color_bo);
+
+	drm_intel_bo_unmap(sampler_state_bo);
 
-    return sampler_state_bo;
+	return sampler_state_bo;
 }
 
 static void
-cc_state_init (drm_intel_bo *cc_state_bo,
-	       uint32_t cc_state_offset,
-	       int src_blend,
-	       int dst_blend,
-	       drm_intel_bo *cc_vp_bo)
-{
-    struct brw_cc_unit_state *cc_state;
-
-    cc_state = (struct brw_cc_unit_state *)((char *)cc_state_bo->virtual +
-					    cc_state_offset);
-
-    memset(cc_state, 0, sizeof(*cc_state));
-    cc_state->cc0.stencil_enable = 0;   /* disable stencil */
-    cc_state->cc2.depth_test = 0;       /* disable depth test */
-    cc_state->cc2.logicop_enable = 0;   /* disable logic op */
-    cc_state->cc3.ia_blend_enable = 0;  /* blend alpha same as colors */
-    cc_state->cc3.blend_enable = 1;     /* enable color blend */
-    cc_state->cc3.alpha_test = 0;       /* disable alpha test */
-
-    cc_state->cc4.cc_viewport_state_offset =
-	intel_emit_reloc(cc_state_bo, cc_state_offset +
-			 offsetof(struct brw_cc_unit_state, cc4),
-			 cc_vp_bo, 0,
-			 I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
-
-    cc_state->cc5.dither_enable = 0;    /* disable dither */
-    cc_state->cc5.logicop_func = 0xc;   /* COPY */
-    cc_state->cc5.statistics_enable = 1;
-    cc_state->cc5.ia_blend_function = BRW_BLENDFUNCTION_ADD;
-
-    /* Fill in alpha blend factors same as color, for the future. */
-    cc_state->cc5.ia_src_blend_factor = src_blend;
-    cc_state->cc5.ia_dest_blend_factor = dst_blend;
-
-    cc_state->cc6.blend_function = BRW_BLENDFUNCTION_ADD;
-    cc_state->cc6.clamp_post_alpha_blend = 1;
-    cc_state->cc6.clamp_pre_alpha_blend = 1;
-    cc_state->cc6.clamp_range = 0;  /* clamp range [0,1] */
-
-    cc_state->cc6.src_blend_factor = src_blend;
-    cc_state->cc6.dest_blend_factor = dst_blend;
-}
-
-static drm_intel_bo *
-gen4_create_wm_state(ScrnInfoPtr scrn,
-		     Bool has_mask, drm_intel_bo *kernel_bo,
-		     drm_intel_bo *sampler_bo)
-{
-    I830Ptr pI830 = I830PTR(scrn);
-    struct brw_wm_unit_state *wm_state;
-    drm_intel_bo *wm_state_bo;
-
-    wm_state_bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 WM state",
-				     sizeof(*wm_state), 4096);
-    drm_intel_bo_map(wm_state_bo, TRUE);
-    wm_state = wm_state_bo->virtual;
-
-    memset(wm_state, 0, sizeof (*wm_state));
-    wm_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(PS_KERNEL_NUM_GRF);
-    wm_state->thread0.kernel_start_pointer =
-	intel_emit_reloc(wm_state_bo,
-			 offsetof(struct brw_wm_unit_state, thread0),
-                         kernel_bo, wm_state->thread0.grf_reg_count << 1,
-                         I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
-
-    wm_state->thread1.single_program_flow = 0;
-
-    /* scratch space is not used in our kernel */
-    wm_state->thread2.scratch_space_base_pointer = 0;
-    wm_state->thread2.per_thread_scratch_space = 0;
-
-    wm_state->thread3.const_urb_entry_read_length = 0;
-    wm_state->thread3.const_urb_entry_read_offset = 0;
-
-    wm_state->thread3.urb_entry_read_offset = 0;
-    /* wm kernel use urb from 3, see wm_program in compiler module */
-    wm_state->thread3.dispatch_grf_start_reg = 3; /* must match kernel */
-
-    wm_state->wm4.stats_enable = 1;  /* statistic */
-    wm_state->wm4.sampler_count = 1; /* 1-4 samplers used */
-    wm_state->wm4.sampler_state_pointer =
-	intel_emit_reloc(wm_state_bo, offsetof(struct brw_wm_unit_state, wm4),
-			 sampler_bo,
-			 wm_state->wm4.stats_enable +
-			 (wm_state->wm4.sampler_count << 2),
-			 I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
-    wm_state->wm5.max_threads = PS_MAX_THREADS - 1;
-    wm_state->wm5.transposed_urb_read = 0;
-    wm_state->wm5.thread_dispatch_enable = 1;
-    /* just use 16-pixel dispatch (4 subspans), don't need to change kernel
-     * start point
-     */
-    wm_state->wm5.enable_16_pix = 1;
-    wm_state->wm5.enable_8_pix = 0;
-    wm_state->wm5.early_depth_test = 1;
-
-    /* Each pair of attributes (src/mask coords) is two URB entries */
-    if (has_mask) {
-	wm_state->thread1.binding_table_entry_count = 3; /* 2 tex and fb */
-	wm_state->thread3.urb_entry_read_length = 4;
-    } else {
-	wm_state->thread1.binding_table_entry_count = 2; /* 1 tex and fb */
-	wm_state->thread3.urb_entry_read_length = 2;
-    }
-
-    drm_intel_bo_unmap(wm_state_bo);
-
-    return wm_state_bo;
-}
-
-static drm_intel_bo *
-gen4_create_cc_viewport(ScrnInfoPtr scrn)
-{
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *bo;
-    struct brw_cc_viewport cc_viewport;
-
-    cc_viewport.min_depth = -1.e35;
-    cc_viewport.max_depth = 1.e35;
-
-    bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 render unit state",
-			    sizeof(cc_viewport), 4096);
-    drm_intel_bo_subdata(bo, 0, sizeof(cc_viewport), &cc_viewport);
-
-    return bo;
-}
-
-static drm_intel_bo *
-gen4_create_vs_unit_state(ScrnInfoPtr scrn)
-{
-    struct brw_vs_unit_state vs_state;
-    memset(&vs_state, 0, sizeof(vs_state));
-
-    /* Set up the vertex shader to be disabled (passthrough) */
-    vs_state.thread4.nr_urb_entries = URB_VS_ENTRIES;
-    vs_state.thread4.urb_entry_allocation_size = URB_VS_ENTRY_SIZE - 1;
-    vs_state.vs6.vs_enable = 0;
-    vs_state.vs6.vert_cache_disable = 1;
+cc_state_init(drm_intel_bo * cc_state_bo,
+	      uint32_t cc_state_offset,
+	      int src_blend, int dst_blend, drm_intel_bo * cc_vp_bo)
+{
+	struct brw_cc_unit_state *cc_state;
+
+	cc_state = (struct brw_cc_unit_state *)((char *)cc_state_bo->virtual +
+						cc_state_offset);
+
+	memset(cc_state, 0, sizeof(*cc_state));
+	cc_state->cc0.stencil_enable = 0;	/* disable stencil */
+	cc_state->cc2.depth_test = 0;	/* disable depth test */
+	cc_state->cc2.logicop_enable = 0;	/* disable logic op */
+	cc_state->cc3.ia_blend_enable = 0;	/* blend alpha same as colors */
+	cc_state->cc3.blend_enable = 1;	/* enable color blend */
+	cc_state->cc3.alpha_test = 0;	/* disable alpha test */
+
+	cc_state->cc4.cc_viewport_state_offset =
+	    intel_emit_reloc(cc_state_bo, cc_state_offset +
+			     offsetof(struct brw_cc_unit_state, cc4),
+			     cc_vp_bo, 0, I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
+
+	cc_state->cc5.dither_enable = 0;	/* disable dither */
+	cc_state->cc5.logicop_func = 0xc;	/* COPY */
+	cc_state->cc5.statistics_enable = 1;
+	cc_state->cc5.ia_blend_function = BRW_BLENDFUNCTION_ADD;
+
+	/* Fill in alpha blend factors same as color, for the future. */
+	cc_state->cc5.ia_src_blend_factor = src_blend;
+	cc_state->cc5.ia_dest_blend_factor = dst_blend;
+
+	cc_state->cc6.blend_function = BRW_BLENDFUNCTION_ADD;
+	cc_state->cc6.clamp_post_alpha_blend = 1;
+	cc_state->cc6.clamp_pre_alpha_blend = 1;
+	cc_state->cc6.clamp_range = 0;	/* clamp range [0,1] */
+
+	cc_state->cc6.src_blend_factor = src_blend;
+	cc_state->cc6.dest_blend_factor = dst_blend;
+}
+
+static drm_intel_bo *gen4_create_wm_state(ScrnInfoPtr scrn,
+					  Bool has_mask,
+					  drm_intel_bo * kernel_bo,
+					  drm_intel_bo * sampler_bo)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct brw_wm_unit_state *wm_state;
+	drm_intel_bo *wm_state_bo;
+
+	wm_state_bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 WM state",
+					 sizeof(*wm_state), 4096);
+	drm_intel_bo_map(wm_state_bo, TRUE);
+	wm_state = wm_state_bo->virtual;
+
+	memset(wm_state, 0, sizeof(*wm_state));
+	wm_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(PS_KERNEL_NUM_GRF);
+	wm_state->thread0.kernel_start_pointer =
+	    intel_emit_reloc(wm_state_bo,
+			     offsetof(struct brw_wm_unit_state, thread0),
+			     kernel_bo, wm_state->thread0.grf_reg_count << 1,
+			     I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
+
+	wm_state->thread1.single_program_flow = 0;
+
+	/* scratch space is not used in our kernel */
+	wm_state->thread2.scratch_space_base_pointer = 0;
+	wm_state->thread2.per_thread_scratch_space = 0;
+
+	wm_state->thread3.const_urb_entry_read_length = 0;
+	wm_state->thread3.const_urb_entry_read_offset = 0;
+
+	wm_state->thread3.urb_entry_read_offset = 0;
+	/* wm kernel use urb from 3, see wm_program in compiler module */
+	wm_state->thread3.dispatch_grf_start_reg = 3;	/* must match kernel */
+
+	wm_state->wm4.stats_enable = 1;	/* statistic */
+
+	if (IS_IGDNG(intel))
+		wm_state->wm4.sampler_count = 0;	/* hardware requirement */
+	else
+		wm_state->wm4.sampler_count = 1;	/* 1-4 samplers used */
+
+	wm_state->wm4.sampler_state_pointer =
+	    intel_emit_reloc(wm_state_bo,
+			     offsetof(struct brw_wm_unit_state, wm4),
+			     sampler_bo,
+			     wm_state->wm4.stats_enable +
+			     (wm_state->wm4.sampler_count << 2),
+			     I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
+	wm_state->wm5.max_threads = PS_MAX_THREADS - 1;
+	wm_state->wm5.transposed_urb_read = 0;
+	wm_state->wm5.thread_dispatch_enable = 1;
+	/* just use 16-pixel dispatch (4 subspans), don't need to change kernel
+	 * start point
+	 */
+	wm_state->wm5.enable_16_pix = 1;
+	wm_state->wm5.enable_8_pix = 0;
+	wm_state->wm5.early_depth_test = 1;
+
+	/* Each pair of attributes (src/mask coords) is two URB entries */
+	if (has_mask) {
+		wm_state->thread1.binding_table_entry_count = 3;	/* 2 tex and fb */
+		wm_state->thread3.urb_entry_read_length = 4;
+	} else {
+		wm_state->thread1.binding_table_entry_count = 2;	/* 1 tex and fb */
+		wm_state->thread3.urb_entry_read_length = 2;
+	}
+
+	/* binding table entry count is only used for prefetching, and it has to
+	 * be set 0 for IGDNG
+	 */
+	if (IS_IGDNG(intel))
+		wm_state->thread1.binding_table_entry_count = 0;
+
+	drm_intel_bo_unmap(wm_state_bo);
+
+	return wm_state_bo;
+}
+
+static drm_intel_bo *gen4_create_cc_viewport(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *bo;
+	struct brw_cc_viewport cc_viewport;
+
+	cc_viewport.min_depth = -1.e35;
+	cc_viewport.max_depth = 1.e35;
+
+	bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 render unit state",
+				sizeof(cc_viewport), 4096);
+	drm_intel_bo_subdata(bo, 0, sizeof(cc_viewport), &cc_viewport);
 
-    return intel_bo_alloc_for_data(scrn, &vs_state, sizeof(vs_state),
-				   "gen4 render VS state");
+	return bo;
+}
+
+static drm_intel_bo *gen4_create_vs_unit_state(ScrnInfoPtr scrn)
+{
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct brw_vs_unit_state vs_state;
+	memset(&vs_state, 0, sizeof(vs_state));
+
+	/* Set up the vertex shader to be disabled (passthrough) */
+	if (IS_IGDNG(intel))
+		vs_state.thread4.nr_urb_entries = URB_VS_ENTRIES >> 2;	/* hardware requirement */
+	else
+		vs_state.thread4.nr_urb_entries = URB_VS_ENTRIES;
+	vs_state.thread4.urb_entry_allocation_size = URB_VS_ENTRY_SIZE - 1;
+	vs_state.vs6.vs_enable = 0;
+	vs_state.vs6.vert_cache_disable = 1;
+
+	return intel_bo_alloc_for_data(scrn, &vs_state, sizeof(vs_state),
+				       "gen4 render VS state");
 }
 
 /**
  * Set up all combinations of cc state: each blendfactor for source and
  * dest.
  */
-static drm_intel_bo *
-gen4_create_cc_unit_state(ScrnInfoPtr scrn)
+static drm_intel_bo *gen4_create_cc_unit_state(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    struct gen4_cc_unit_state *cc_state;
-    drm_intel_bo *cc_state_bo, *cc_vp_bo;
-    int i, j;
-
-    cc_vp_bo = gen4_create_cc_viewport(scrn);
-
-    cc_state_bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 CC state",
-				     sizeof(*cc_state), 4096);
-    drm_intel_bo_map(cc_state_bo, TRUE);
-    cc_state = cc_state_bo->virtual;
-    for (i = 0; i < BRW_BLENDFACTOR_COUNT; i++) {
-	for (j = 0; j < BRW_BLENDFACTOR_COUNT; j++) {
-	    cc_state_init(cc_state_bo,
-			  offsetof(struct gen4_cc_unit_state,
-				   cc_state[i][j].state),
-			  i, j, cc_vp_bo);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_cc_unit_state *cc_state;
+	drm_intel_bo *cc_state_bo, *cc_vp_bo;
+	int i, j;
+
+	cc_vp_bo = gen4_create_cc_viewport(scrn);
+
+	cc_state_bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 CC state",
+					 sizeof(*cc_state), 4096);
+	drm_intel_bo_map(cc_state_bo, TRUE);
+	cc_state = cc_state_bo->virtual;
+	for (i = 0; i < BRW_BLENDFACTOR_COUNT; i++) {
+		for (j = 0; j < BRW_BLENDFACTOR_COUNT; j++) {
+			cc_state_init(cc_state_bo,
+				      offsetof(struct gen4_cc_unit_state,
+					       cc_state[i][j].state),
+				      i, j, cc_vp_bo);
+		}
 	}
-    }
-    drm_intel_bo_unmap(cc_state_bo);
+	drm_intel_bo_unmap(cc_state_bo);
 
-    drm_intel_bo_unreference(cc_vp_bo);
+	drm_intel_bo_unreference(cc_vp_bo);
 
-    return cc_state_bo;
+	return cc_state_bo;
 }
 
-static uint32_t 
-i965_get_card_format(PicturePtr pPict)
+static uint32_t i965_get_card_format(PicturePtr picture)
 {
-    int i;
+	int i;
 
-    for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
-	 i++)
-    {
-	if (i965_tex_formats[i].fmt == pPict->format)
-	    break;
-    }
-    assert(i != sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]));
+	for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
+	     i++) {
+		if (i965_tex_formats[i].fmt == picture->format)
+			break;
+	}
+	assert(i != sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]));
 
-    return i965_tex_formats[i].card_fmt;
+	return i965_tex_formats[i].card_fmt;
 }
 
-static sampler_state_filter_t
-sampler_state_filter_from_picture (int filter)
+static sampler_state_filter_t sampler_state_filter_from_picture(int filter)
 {
-    switch (filter) {
-    case PictFilterNearest:
-	return SAMPLER_STATE_FILTER_NEAREST;
-    case PictFilterBilinear:
-	return SAMPLER_STATE_FILTER_BILINEAR;
-    default:
-	return -1;
-    }
+	switch (filter) {
+	case PictFilterNearest:
+		return SAMPLER_STATE_FILTER_NEAREST;
+	case PictFilterBilinear:
+		return SAMPLER_STATE_FILTER_BILINEAR;
+	default:
+		return -1;
+	}
 }
 
-static sampler_state_extend_t
-sampler_state_extend_from_picture (int repeat_type)
+static sampler_state_extend_t sampler_state_extend_from_picture(int repeat_type)
 {
-    switch (repeat_type) {
-    case RepeatNone:
-	return SAMPLER_STATE_EXTEND_NONE;
-    case RepeatNormal:
-	return SAMPLER_STATE_EXTEND_REPEAT;
-    case RepeatPad:
-	return SAMPLER_STATE_EXTEND_PAD;
-    case RepeatReflect:
-	return SAMPLER_STATE_EXTEND_REFLECT;
-    default:
-	return -1;
-    }
+	switch (repeat_type) {
+	case RepeatNone:
+		return SAMPLER_STATE_EXTEND_NONE;
+	case RepeatNormal:
+		return SAMPLER_STATE_EXTEND_REPEAT;
+	case RepeatPad:
+		return SAMPLER_STATE_EXTEND_PAD;
+	case RepeatReflect:
+		return SAMPLER_STATE_EXTEND_REFLECT;
+	default:
+		return -1;
+	}
 }
 
 /**
@@ -918,835 +1045,999 @@ sampler_state_extend_from_picture (int r
  * picture in the given surface state buffer.
  */
 static void
-i965_set_picture_surface_state(dri_bo *ss_bo, int ss_index,
-			       PicturePtr pPicture, PixmapPtr pPixmap,
+i965_set_picture_surface_state(intel_screen_private *intel,
+			       dri_bo * ss_bo, int ss_index,
+			       PicturePtr picture, PixmapPtr pixmap,
 			       Bool is_dst)
 {
-    struct brw_surface_state_padded *ss;
-    struct brw_surface_state local_ss;
-    dri_bo *pixmap_bo = i830_get_pixmap_bo(pPixmap);
-
-    ss = (struct brw_surface_state_padded *)ss_bo->virtual + ss_index;
-
-    /* Since ss is a pointer to WC memory, do all of our bit operations
-     * into a local temporary first.
-     */
-    memset(&local_ss, 0, sizeof(local_ss));
-    local_ss.ss0.surface_type = BRW_SURFACE_2D;
-    if (is_dst) {
-	uint32_t dst_format = 0;
-	Bool ret = TRUE;
-
-	ret = i965_get_dest_format(pPicture, &dst_format);
-	assert(ret == TRUE);
-	local_ss.ss0.surface_format = dst_format;
-    } else {
-	local_ss.ss0.surface_format = i965_get_card_format(pPicture);
-    }
-
-    local_ss.ss0.data_return_format = BRW_SURFACERETURNFORMAT_FLOAT32;
-    local_ss.ss0.writedisable_alpha = 0;
-    local_ss.ss0.writedisable_red = 0;
-    local_ss.ss0.writedisable_green = 0;
-    local_ss.ss0.writedisable_blue = 0;
-    local_ss.ss0.color_blend = 1;
-    local_ss.ss0.vert_line_stride = 0;
-    local_ss.ss0.vert_line_stride_ofs = 0;
-    local_ss.ss0.mipmap_layout_mode = 0;
-    local_ss.ss0.render_cache_read_mode = 0;
-    if (pixmap_bo != NULL)
-	local_ss.ss1.base_addr = pixmap_bo->offset;
-    else
-	local_ss.ss1.base_addr = intel_get_pixmap_offset(pPixmap);
-
-    local_ss.ss2.mip_count = 0;
-    local_ss.ss2.render_target_rotation = 0;
-    local_ss.ss2.height = pPixmap->drawable.height - 1;
-    local_ss.ss2.width = pPixmap->drawable.width - 1;
-    local_ss.ss3.pitch = intel_get_pixmap_pitch(pPixmap) - 1;
-    local_ss.ss3.tile_walk = 0; /* Tiled X */
-    local_ss.ss3.tiled_surface = i830_pixmap_tiled(pPixmap) ? 1 : 0;
-
-    memcpy(ss, &local_ss, sizeof(local_ss));
+	struct brw_surface_state_padded *ss;
+	struct brw_surface_state local_ss;
+	struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap);
 
-    if (pixmap_bo != NULL) {
-	uint32_t write_domain, read_domains;
+	ss = (struct brw_surface_state_padded *)ss_bo->virtual + ss_index;
 
+	/* Since ss is a pointer to WC memory, do all of our bit operations
+	 * into a local temporary first.
+	 */
+	memset(&local_ss, 0, sizeof(local_ss));
+	local_ss.ss0.surface_type = BRW_SURFACE_2D;
 	if (is_dst) {
-	    write_domain = I915_GEM_DOMAIN_RENDER;
-	    read_domains = I915_GEM_DOMAIN_RENDER;
+		uint32_t dst_format = 0;
+		Bool ret = TRUE;
+
+		ret = i965_get_dest_format(picture, &dst_format);
+		assert(ret == TRUE);
+		local_ss.ss0.surface_format = dst_format;
 	} else {
-	    write_domain = 0;
-	    read_domains = I915_GEM_DOMAIN_SAMPLER;
+		local_ss.ss0.surface_format = i965_get_card_format(picture);
+	}
+
+	local_ss.ss0.data_return_format = BRW_SURFACERETURNFORMAT_FLOAT32;
+	local_ss.ss0.writedisable_alpha = 0;
+	local_ss.ss0.writedisable_red = 0;
+	local_ss.ss0.writedisable_green = 0;
+	local_ss.ss0.writedisable_blue = 0;
+	local_ss.ss0.color_blend = 1;
+	local_ss.ss0.vert_line_stride = 0;
+	local_ss.ss0.vert_line_stride_ofs = 0;
+	local_ss.ss0.mipmap_layout_mode = 0;
+	local_ss.ss0.render_cache_read_mode = 0;
+	local_ss.ss1.base_addr = priv->bo->offset;
+
+	local_ss.ss2.mip_count = 0;
+	local_ss.ss2.render_target_rotation = 0;
+	local_ss.ss2.height = pixmap->drawable.height - 1;
+	local_ss.ss2.width = pixmap->drawable.width - 1;
+	local_ss.ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1;
+	local_ss.ss3.tile_walk = 0;	/* Tiled X */
+	local_ss.ss3.tiled_surface = i830_pixmap_tiled(pixmap) ? 1 : 0;
+
+	memcpy(ss, &local_ss, sizeof(local_ss));
+
+	if (priv->bo != NULL) {
+		uint32_t write_domain, read_domains;
+
+		if (is_dst) {
+			write_domain = I915_GEM_DOMAIN_RENDER;
+			read_domains = I915_GEM_DOMAIN_RENDER;
+		} else {
+			write_domain = 0;
+			read_domains = I915_GEM_DOMAIN_SAMPLER;
+		}
+
+		intel_batch_mark_pixmap_domains(intel, priv, read_domains, write_domain);
+		dri_bo_emit_reloc(ss_bo, read_domains, write_domain,
+				  0,
+				  ss_index * sizeof(*ss) +
+				  offsetof(struct brw_surface_state, ss1),
+				  priv->bo);
 	}
-	dri_bo_emit_reloc(ss_bo, read_domains, write_domain,
-			  0,
-			  ss_index * sizeof(*ss) +
-			  offsetof(struct brw_surface_state, ss1),
-			  pixmap_bo);
-    }
 }
 
-static void
-i965_emit_composite_state(ScrnInfoPtr pScrn)
+static void i965_emit_composite_state(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state= pI830->gen4_render_state;
-    gen4_composite_op *composite_op = &render_state->composite_op;
-    int op = composite_op->op;
-    PicturePtr pMaskPicture = composite_op->mask_picture;
-    PicturePtr pDstPicture = composite_op->dest_picture;
-    PixmapPtr pMask = composite_op->mask;
-    PixmapPtr pDst = composite_op->dest;
-    sampler_state_filter_t src_filter = composite_op->src_filter;
-    sampler_state_filter_t mask_filter = composite_op->mask_filter;
-    sampler_state_extend_t src_extend = composite_op->src_extend;
-    sampler_state_extend_t mask_extend = composite_op->mask_extend;
-    Bool is_affine = composite_op->is_affine;
-    int urb_vs_start, urb_vs_size;
-    int urb_gs_start, urb_gs_size;
-    int urb_clip_start, urb_clip_size;
-    int urb_sf_start, urb_sf_size;
-    int urb_cs_start, urb_cs_size;
-    uint32_t src_blend, dst_blend;
-    dri_bo *binding_table_bo = composite_op->binding_table_bo;
-
-    render_state->needs_state_emit = FALSE;
-
-    IntelEmitInvarientState(pScrn);
-    pI830->last_3d = LAST_3D_RENDER;
-
-    urb_vs_start = 0;
-    urb_vs_size = URB_VS_ENTRIES * URB_VS_ENTRY_SIZE;
-    urb_gs_start = urb_vs_start + urb_vs_size;
-    urb_gs_size = URB_GS_ENTRIES * URB_GS_ENTRY_SIZE;
-    urb_clip_start = urb_gs_start + urb_gs_size;
-    urb_clip_size = URB_CLIP_ENTRIES * URB_CLIP_ENTRY_SIZE;
-    urb_sf_start = urb_clip_start + urb_clip_size;
-    urb_sf_size = URB_SF_ENTRIES * URB_SF_ENTRY_SIZE;
-    urb_cs_start = urb_sf_start + urb_sf_size;
-    urb_cs_size = URB_CS_ENTRIES * URB_CS_ENTRY_SIZE;
-
-    i965_get_blend_cntl(op, pMaskPicture, pDstPicture->format,
-			&src_blend, &dst_blend);
-
-    /* Begin the long sequence of commands needed to set up the 3D
-     * rendering pipe
-     */
-    {
-	BEGIN_BATCH(2);
-	OUT_BATCH(MI_FLUSH |
-		  MI_STATE_INSTRUCTION_CACHE_FLUSH |
-		  BRW_MI_GLOBAL_SNAPSHOT_RESET);
-	OUT_BATCH(MI_NOOP);
-	ADVANCE_BATCH();
-    }
-    {
-        BEGIN_BATCH(12);
-
-        /* Match Mesa driver setup */
-	if (IS_G4X(pI830))
-	    OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
-	else
-	    OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state = intel->gen4_render_state;
+	gen4_composite_op *composite_op = &render_state->composite_op;
+	int op = composite_op->op;
+	PicturePtr mask_picture = intel->render_mask_picture;
+	PicturePtr dest_picture = intel->render_dest_picture;
+	PixmapPtr mask = intel->render_mask;
+	PixmapPtr dest = intel->render_dest;
+	sampler_state_filter_t src_filter = composite_op->src_filter;
+	sampler_state_filter_t mask_filter = composite_op->mask_filter;
+	sampler_state_extend_t src_extend = composite_op->src_extend;
+	sampler_state_extend_t mask_extend = composite_op->mask_extend;
+	Bool is_affine = composite_op->is_affine;
+	int urb_vs_start, urb_vs_size;
+	int urb_gs_start, urb_gs_size;
+	int urb_clip_start, urb_clip_size;
+	int urb_sf_start, urb_sf_size;
+	int urb_cs_start, urb_cs_size;
+	uint32_t src_blend, dst_blend;
+	dri_bo *binding_table_bo = composite_op->binding_table_bo;
+
+	intel->needs_render_state_emit = FALSE;
+
+	IntelEmitInvarientState(scrn);
+	intel->last_3d = LAST_3D_RENDER;
+
+	/* Mark the destination dirty within this batch */
+	intel_batch_mark_pixmap_domains(intel,
+					i830_get_pixmap_intel(dest),
+					I915_GEM_DOMAIN_RENDER,
+					I915_GEM_DOMAIN_RENDER);
+
+	urb_vs_start = 0;
+	urb_vs_size = URB_VS_ENTRIES * URB_VS_ENTRY_SIZE;
+	urb_gs_start = urb_vs_start + urb_vs_size;
+	urb_gs_size = URB_GS_ENTRIES * URB_GS_ENTRY_SIZE;
+	urb_clip_start = urb_gs_start + urb_gs_size;
+	urb_clip_size = URB_CLIP_ENTRIES * URB_CLIP_ENTRY_SIZE;
+	urb_sf_start = urb_clip_start + urb_clip_size;
+	urb_sf_size = URB_SF_ENTRIES * URB_SF_ENTRY_SIZE;
+	urb_cs_start = urb_sf_start + urb_sf_size;
+	urb_cs_size = URB_CS_ENTRIES * URB_CS_ENTRY_SIZE;
 
-	OUT_BATCH(BRW_CS_URB_STATE | 0);
-	OUT_BATCH((0 << 4) |  /* URB Entry Allocation Size */
-		  (0 << 0));  /* Number of URB Entries */
+	i965_get_blend_cntl(op, mask_picture, dest_picture->format,
+			    &src_blend, &dst_blend);
 
-	/* Zero out the two base address registers so all offsets are
-	 * absolute.
+	/* Begin the long sequence of commands needed to set up the 3D
+	 * rendering pipe
 	 */
-	OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4);
-	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);  /* Generate state base address */
-	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);  /* Surface state base address */
-	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);  /* media base addr, don't care */
-	/* general state max addr, disabled */
-	OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
-	/* media object state max addr, disabled */
-	OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
-
-	/* Set system instruction pointer */
-	OUT_BATCH(BRW_STATE_SIP | 0);
-	OUT_RELOC(render_state->sip_kernel_bo,
-		  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-	OUT_BATCH(MI_NOOP);
-	ADVANCE_BATCH();
-    }
-    {
-	BEGIN_BATCH(26);
-	/* Pipe control */
-	OUT_BATCH(BRW_PIPE_CONTROL |
-		  BRW_PIPE_CONTROL_NOWRITE |
-		  BRW_PIPE_CONTROL_IS_FLUSH |
-		  2);
-	OUT_BATCH(0);			       /* Destination address */
-	OUT_BATCH(0);			       /* Immediate data low DW */
-	OUT_BATCH(0);			       /* Immediate data high DW */
-
-	/* Binding table pointers */
-	OUT_BATCH(BRW_3DSTATE_BINDING_TABLE_POINTERS | 4);
-	OUT_BATCH(0); /* vs */
-	OUT_BATCH(0); /* gs */
-	OUT_BATCH(0); /* clip */
-	OUT_BATCH(0); /* sf */
-	/* Only the PS uses the binding table */
-	OUT_RELOC(binding_table_bo, I915_GEM_DOMAIN_SAMPLER, 0, 0);
 
-	/* The drawing rectangle clipping is always on.  Set it to values that
-	 * shouldn't do any clipping.
+	/* URB fence. Erratum (Vol 1a, p32): URB_FENCE must not cross a
+	 * cache-line (64 bytes). Start by aligning this sequence of ops to
+	 * a cache-line...
 	 */
-	OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2); /* XXX 3 for BLC or CTG */
-	OUT_BATCH(0x00000000);	/* ymin, xmin */
-	OUT_BATCH(DRAW_YMAX(pDst->drawable.height - 1) |
-		  DRAW_XMAX(pDst->drawable.width - 1)); /* ymax, xmax */
-	OUT_BATCH(0x00000000);	/* yorigin, xorigin */
-
-	/* skip the depth buffer */
-	/* skip the polygon stipple */
-	/* skip the polygon stipple offset */
-	/* skip the line stipple */
-
-	/* Set the pointers to the 3d pipeline state */
-	OUT_BATCH(BRW_3DSTATE_PIPELINED_POINTERS | 5);
-	OUT_RELOC(render_state->vs_state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-	OUT_BATCH(BRW_GS_DISABLE);   /* disable GS, resulting in passthrough */
-	OUT_BATCH(BRW_CLIP_DISABLE); /* disable CLIP, resulting in passthrough */
-	if (pMask) {
-	    OUT_RELOC(render_state->sf_mask_state_bo,
-		      I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-	} else {
-	    OUT_RELOC(render_state->sf_state_bo,
-		      I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	ALIGN_BATCH(64);
+
+	assert(intel->in_batch_atomic);
+	{
+		/* Match Mesa driver setup */
+		OUT_BATCH(MI_FLUSH |
+			  MI_STATE_INSTRUCTION_CACHE_FLUSH |
+			  BRW_MI_GLOBAL_SNAPSHOT_RESET);
+		if (IS_G4X(intel) || IS_IGDNG(intel))
+			OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
+		else
+			OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
+
+		OUT_BATCH(BRW_CS_URB_STATE | 0);
+		OUT_BATCH((0 << 4) |	/* URB Entry Allocation Size */
+			  (0 << 0));	/* Number of URB Entries */
+
+		/* Zero out the two base address registers so all offsets are
+		 * absolute.
+		 */
+		if (IS_IGDNG(intel)) {
+			OUT_BATCH(BRW_STATE_BASE_ADDRESS | 6);
+			OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Generate state base address */
+			OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Surface state base address */
+			OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* media base addr, don't care */
+			OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Instruction base address */
+			/* general state max addr, disabled */
+			OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+			/* media object state max addr, disabled */
+			OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+			/* Instruction max addr, disabled */
+			OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+		} else {
+			OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4);
+			OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Generate state base address */
+			OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Surface state base address */
+			OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* media base addr, don't care */
+			/* general state max addr, disabled */
+			OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+			/* media object state max addr, disabled */
+			OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+		}
+		/* Set system instruction pointer */
+		OUT_BATCH(BRW_STATE_SIP | 0);
+		OUT_RELOC(render_state->sip_kernel_bo,
+			  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	}
+
+	if (IS_IGDNG(intel)) {
+		/* Ironlake errata workaround: Before disabling the clipper,
+		 * you have to MI_FLUSH to get the pipeline idle.
+		 */
+		OUT_BATCH(MI_FLUSH);
 	}
 
-	OUT_RELOC(render_state->wm_state_bo[composite_op->wm_kernel]
-		  [src_filter][src_extend]
-		  [mask_filter][mask_extend],
-		  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-
-	OUT_RELOC(render_state->cc_state_bo,
-		  I915_GEM_DOMAIN_INSTRUCTION, 0,
-		  offsetof(struct gen4_cc_unit_state,
-			   cc_state[src_blend][dst_blend]));
-
-	/* URB fence */
-	OUT_BATCH(BRW_URB_FENCE |
-		  UF0_CS_REALLOC |
-		  UF0_SF_REALLOC |
-		  UF0_CLIP_REALLOC |
-		  UF0_GS_REALLOC |
-		  UF0_VS_REALLOC |
-		  1);
-	OUT_BATCH(((urb_clip_start + urb_clip_size) << UF1_CLIP_FENCE_SHIFT) |
-		  ((urb_gs_start + urb_gs_size) << UF1_GS_FENCE_SHIFT) |
-		  ((urb_vs_start + urb_vs_size) << UF1_VS_FENCE_SHIFT));
-	OUT_BATCH(((urb_cs_start + urb_cs_size) << UF2_CS_FENCE_SHIFT) |
-		  ((urb_sf_start + urb_sf_size) << UF2_SF_FENCE_SHIFT));
-
-	/* Constant buffer state */
-	OUT_BATCH(BRW_CS_URB_STATE | 0);
-	OUT_BATCH(((URB_CS_ENTRY_SIZE - 1) << 4) |
-		  (URB_CS_ENTRIES << 0));
-	ADVANCE_BATCH();
-    }
-    {
-	/* 
-	 * number of extra parameters per vertex
-	 */
-        int nelem = pMask ? 2: 1;
-	/* 
-	 * size of extra parameters:
-	 *  3 for homogenous (xyzw)
-	 *  2 for cartesian (xy)
-	 */
-	int selem = is_affine ? 2 : 3;
-	uint32_t    w_component;
-	uint32_t    src_format;
-
-	render_state->vertex_size = 4 * (2 + nelem * selem);
-	
-	if (is_affine)
 	{
-	    src_format = BRW_SURFACEFORMAT_R32G32_FLOAT;
-	    w_component = BRW_VFCOMPONENT_STORE_1_FLT;
+		int pipe_ctrl;
+		/* Pipe control */
+
+		if (IS_IGDNG(intel))
+			pipe_ctrl = BRW_PIPE_CONTROL_NOWRITE;
+		else
+			pipe_ctrl =
+			    BRW_PIPE_CONTROL_NOWRITE |
+			    BRW_PIPE_CONTROL_IS_FLUSH;
+
+		OUT_BATCH(BRW_PIPE_CONTROL | pipe_ctrl | 2);
+		OUT_BATCH(0);	/* Destination address */
+		OUT_BATCH(0);	/* Immediate data low DW */
+		OUT_BATCH(0);	/* Immediate data high DW */
+
+		/* Binding table pointers */
+		OUT_BATCH(BRW_3DSTATE_BINDING_TABLE_POINTERS | 4);
+		OUT_BATCH(0);	/* vs */
+		OUT_BATCH(0);	/* gs */
+		OUT_BATCH(0);	/* clip */
+		OUT_BATCH(0);	/* sf */
+		/* Only the PS uses the binding table */
+		OUT_RELOC(binding_table_bo, I915_GEM_DOMAIN_SAMPLER, 0, 0);
+
+		/* The drawing rectangle clipping is always on.  Set it to values that
+		 * shouldn't do any clipping.
+		 */
+		OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2);
+		OUT_BATCH(0x00000000);	/* ymin, xmin */
+		OUT_BATCH(DRAW_YMAX(dest->drawable.height - 1) | DRAW_XMAX(dest->drawable.width - 1));	/* ymax, xmax */
+		OUT_BATCH(0x00000000);	/* yorigin, xorigin */
+
+		/* skip the depth buffer */
+		/* skip the polygon stipple */
+		/* skip the polygon stipple offset */
+		/* skip the line stipple */
+
+		/* Set the pointers to the 3d pipeline state */
+		OUT_BATCH(BRW_3DSTATE_PIPELINED_POINTERS | 5);
+		OUT_RELOC(render_state->vs_state_bo,
+			  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+		OUT_BATCH(BRW_GS_DISABLE);	/* disable GS, resulting in passthrough */
+		OUT_BATCH(BRW_CLIP_DISABLE);	/* disable CLIP, resulting in passthrough */
+		if (mask) {
+			OUT_RELOC(render_state->sf_mask_state_bo,
+				  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+		} else {
+			OUT_RELOC(render_state->sf_state_bo,
+				  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+		}
+
+		OUT_RELOC(render_state->wm_state_bo[composite_op->wm_kernel]
+			  [src_filter][src_extend]
+			  [mask_filter][mask_extend],
+			  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+
+		OUT_RELOC(render_state->cc_state_bo,
+			  I915_GEM_DOMAIN_INSTRUCTION, 0,
+			  offsetof(struct gen4_cc_unit_state,
+				   cc_state[src_blend][dst_blend]));
+
+		/* URB fence. Erratum (Vol 1a, p32): URB_FENCE must not cross a
+		 * cache-line (64 bytes).
+		 *
+		 * 21 preceding dwords since start of section: 84 bytes.
+		 * 12 bytes for URB_FENCE, implies that the end-of-instruction
+		 * does not cross the cache-line boundary...
+		 *
+		 * A total of 33 or 35 dwords since alignment: 132, 140 bytes.
+		 * Again, the URB_FENCE will not cross a cache-line.
+		 */
+		OUT_BATCH(BRW_URB_FENCE |
+			  UF0_CS_REALLOC |
+			  UF0_SF_REALLOC |
+			  UF0_CLIP_REALLOC |
+			  UF0_GS_REALLOC | UF0_VS_REALLOC | 1);
+		OUT_BATCH(((urb_clip_start +
+			    urb_clip_size) << UF1_CLIP_FENCE_SHIFT) |
+			  ((urb_gs_start +
+			    urb_gs_size) << UF1_GS_FENCE_SHIFT) | ((urb_vs_start
+								    +
+								    urb_vs_size)
+								   <<
+								   UF1_VS_FENCE_SHIFT));
+		OUT_BATCH(((urb_cs_start +
+			    urb_cs_size) << UF2_CS_FENCE_SHIFT) | ((urb_sf_start
+								    +
+								    urb_sf_size)
+								   <<
+								   UF2_SF_FENCE_SHIFT));
+
+		/* Constant buffer state */
+		OUT_BATCH(BRW_CS_URB_STATE | 0);
+		OUT_BATCH(((URB_CS_ENTRY_SIZE - 1) << 4) |
+			  (URB_CS_ENTRIES << 0));
 	}
-	else
 	{
-	    src_format = BRW_SURFACEFORMAT_R32G32B32_FLOAT;
-	    w_component = BRW_VFCOMPONENT_STORE_SRC;
+		/*
+		 * number of extra parameters per vertex
+		 */
+		int nelem = mask ? 2 : 1;
+		/*
+		 * size of extra parameters:
+		 *  3 for homogenous (xyzw)
+		 *  2 for cartesian (xy)
+		 */
+		int selem = is_affine ? 2 : 3;
+		uint32_t w_component;
+		uint32_t src_format;
+
+		render_state->vertex_size = 4 * (2 + nelem * selem);
+
+		if (is_affine) {
+			src_format = BRW_SURFACEFORMAT_R32G32_FLOAT;
+			w_component = BRW_VFCOMPONENT_STORE_1_FLT;
+		} else {
+			src_format = BRW_SURFACEFORMAT_R32G32B32_FLOAT;
+			w_component = BRW_VFCOMPONENT_STORE_SRC;
+		}
+
+		if (IS_IGDNG(intel)) {
+			/*
+			 * The reason to add this extra vertex element in the header is that
+			 * IGDNG has different vertex header definition and origin method to
+			 * set destination element offset doesn't exist anymore, which means
+			 * hardware requires a predefined vertex element layout.
+			 *
+			 * haihao proposed this approach to fill the first vertex element, so
+			 * origin layout for Gen4 doesn't need to change, and origin shader
+			 * programs behavior is also kept.
+			 *
+			 * I think this is not bad. - zhenyu
+			 */
+
+			OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS |
+				  ((2 * (2 + nelem)) - 1));
+			OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
+				  VE0_VALID | (BRW_SURFACEFORMAT_R32G32_FLOAT <<
+					       VE0_FORMAT_SHIFT) | (0 <<
+								    VE0_OFFSET_SHIFT));
+
+			OUT_BATCH((BRW_VFCOMPONENT_STORE_0 <<
+				   VE1_VFCOMPONENT_0_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_0 <<
+				   VE1_VFCOMPONENT_1_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_0 <<
+				   VE1_VFCOMPONENT_2_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_0 <<
+				   VE1_VFCOMPONENT_3_SHIFT));
+		} else {
+			/* Set up our vertex elements, sourced from the single vertex buffer.
+			 * that will be set up later.
+			 */
+			OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS |
+				  ((2 * (1 + nelem)) - 1));
+		}
+
+		/* x,y */
+		OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
+			  VE0_VALID |
+			  (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
+			  (0 << VE0_OFFSET_SHIFT));
+
+		if (IS_IGDNG(intel))
+			OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC <<
+				   VE1_VFCOMPONENT_0_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_SRC <<
+				   VE1_VFCOMPONENT_1_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_1_FLT <<
+				   VE1_VFCOMPONENT_2_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_1_FLT <<
+				   VE1_VFCOMPONENT_3_SHIFT));
+		else
+			OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC <<
+				   VE1_VFCOMPONENT_0_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_SRC <<
+				   VE1_VFCOMPONENT_1_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_1_FLT <<
+				   VE1_VFCOMPONENT_2_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_1_FLT <<
+				   VE1_VFCOMPONENT_3_SHIFT) | (4 <<
+							       VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
+		/* u0, v0, w0 */
+		OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) | VE0_VALID | (src_format << VE0_FORMAT_SHIFT) | ((2 * 4) << VE0_OFFSET_SHIFT));	/* offset vb in bytes */
+
+		if (IS_IGDNG(intel))
+			OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC <<
+				   VE1_VFCOMPONENT_0_SHIFT) |
+				  (BRW_VFCOMPONENT_STORE_SRC <<
+				   VE1_VFCOMPONENT_1_SHIFT) | (w_component <<
+							       VE1_VFCOMPONENT_2_SHIFT)
+				  | (BRW_VFCOMPONENT_STORE_1_FLT <<
+				     VE1_VFCOMPONENT_3_SHIFT));
+		else
+			OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT) | (BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT) | (w_component << VE1_VFCOMPONENT_2_SHIFT) | (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) | ((4 + 4) << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));	/* VUE offset in dwords */
+		/* u1, v1, w1 */
+		if (mask) {
+			OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) | VE0_VALID | (src_format << VE0_FORMAT_SHIFT) | (((2 + selem) * 4) << VE0_OFFSET_SHIFT));	/* vb offset in bytes */
+
+			if (IS_IGDNG(intel))
+				OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC <<
+					   VE1_VFCOMPONENT_0_SHIFT) |
+					  (BRW_VFCOMPONENT_STORE_SRC <<
+					   VE1_VFCOMPONENT_1_SHIFT) |
+					  (w_component <<
+					   VE1_VFCOMPONENT_2_SHIFT) |
+					  (BRW_VFCOMPONENT_STORE_1_FLT <<
+					   VE1_VFCOMPONENT_3_SHIFT));
+			else
+				OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT) | (BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT) | (w_component << VE1_VFCOMPONENT_2_SHIFT) | (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) | ((4 + 4 + 4) << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));	/* VUE offset in dwords */
+		}
 	}
-	BEGIN_BATCH(pMask?7:5);
-	/* Set up our vertex elements, sourced from the single vertex buffer.
-	 * that will be set up later.
-	 */
-	
-	OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS | ((2 * (1 + nelem)) - 1));
-	/* x,y */
-	OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
-		  VE0_VALID |
-		  (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
-		  (0				<< VE0_OFFSET_SHIFT));
-	OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC	<< VE1_VFCOMPONENT_0_SHIFT) |
-		  (BRW_VFCOMPONENT_STORE_SRC	<< VE1_VFCOMPONENT_1_SHIFT) |
-		  (BRW_VFCOMPONENT_STORE_1_FLT	<< VE1_VFCOMPONENT_2_SHIFT) |
-		  (BRW_VFCOMPONENT_STORE_1_FLT	<< VE1_VFCOMPONENT_3_SHIFT) |
-		  (4				<< VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
-	/* u0, v0, w0 */
-	OUT_BATCH((0				<< VE0_VERTEX_BUFFER_INDEX_SHIFT) |
-		  VE0_VALID					     |
-		  (src_format			<< VE0_FORMAT_SHIFT) |
-		  ((2 * 4)			<< VE0_OFFSET_SHIFT)); /* offset vb in bytes */
-	OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC	<< VE1_VFCOMPONENT_0_SHIFT) |
-		  (BRW_VFCOMPONENT_STORE_SRC	<< VE1_VFCOMPONENT_1_SHIFT) |
-		  (w_component			<< VE1_VFCOMPONENT_2_SHIFT) |
-		  (BRW_VFCOMPONENT_STORE_1_FLT	<< VE1_VFCOMPONENT_3_SHIFT) |
-		  ((4 + 4)			<< VE1_DESTINATION_ELEMENT_OFFSET_SHIFT)); /* VUE offset in dwords */
-	/* u1, v1, w1 */
-   	if (pMask) {
-	    OUT_BATCH((0			    << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
-		      VE0_VALID							    |
-		      (src_format		    << VE0_FORMAT_SHIFT) |
-		      (((2 + selem) * 4)    	    << VE0_OFFSET_SHIFT));  /* vb offset in bytes */
-	    
-	    OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC    << VE1_VFCOMPONENT_0_SHIFT) |
-		      (BRW_VFCOMPONENT_STORE_SRC    << VE1_VFCOMPONENT_1_SHIFT) |
-		      (w_component		    << VE1_VFCOMPONENT_2_SHIFT) |
-		      (BRW_VFCOMPONENT_STORE_1_FLT  << VE1_VFCOMPONENT_3_SHIFT) |
-		      ((4 + 4 + 4)		    << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT)); /* VUE offset in dwords */
-   	}
-
-	ADVANCE_BATCH();
-    }
-
-#ifdef I830DEBUG
-    ErrorF("try to sync to show any errors...\n");
-    I830Sync(pScrn);
-#endif
 }
 
 /**
  * Returns whether the current set of composite state plus vertex buffer is
  * expected to fit in the aperture.
  */
-static Bool
-i965_composite_check_aperture(ScrnInfoPtr pScrn)
+static Bool i965_composite_check_aperture(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state= pI830->gen4_render_state;
-    gen4_composite_op *composite_op = &render_state->composite_op;
-    drm_intel_bo *bo_table[] = {
-	pI830->batch_bo,
-	composite_op->binding_table_bo,
-	render_state->vertex_buffer_bo,
-	render_state->vs_state_bo,
-	render_state->sf_state_bo,
-	render_state->sf_mask_state_bo,
-	render_state->wm_state_bo[composite_op->wm_kernel]
-				 [composite_op->src_filter]
-				 [composite_op->src_extend]
-				 [composite_op->mask_filter]
-				 [composite_op->mask_extend],
-	render_state->cc_state_bo,
-	render_state->sip_kernel_bo,
-    };
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state = intel->gen4_render_state;
+	gen4_composite_op *composite_op = &render_state->composite_op;
+	drm_intel_bo *bo_table[] = {
+		intel->batch_bo,
+		composite_op->binding_table_bo,
+		render_state->vertex_buffer_bo,
+		render_state->vs_state_bo,
+		render_state->sf_state_bo,
+		render_state->sf_mask_state_bo,
+		render_state->wm_state_bo[composite_op->wm_kernel]
+		    [composite_op->src_filter]
+		    [composite_op->src_extend]
+		    [composite_op->mask_filter]
+		    [composite_op->mask_extend],
+		render_state->cc_state_bo,
+		render_state->sip_kernel_bo,
+	};
 
-    return drm_intel_bufmgr_check_aperture_space(bo_table,
-						 ARRAY_SIZE(bo_table)) == 0;
+	return drm_intel_bufmgr_check_aperture_space(bo_table,
+						     ARRAY_SIZE(bo_table)) == 0;
 }
 
 Bool
-i965_prepare_composite(int op, PicturePtr pSrcPicture,
-		       PicturePtr pMaskPicture, PicturePtr pDstPicture,
-		       PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state= pI830->gen4_render_state;
-    gen4_composite_op *composite_op = &render_state->composite_op;
-    uint32_t *binding_table;
-    drm_intel_bo *binding_table_bo, *surface_state_bo;
-
-    if (composite_op->src_filter < 0)
-	I830FALLBACK("Bad src filter 0x%x\n", pSrcPicture->filter);
-    composite_op->src_extend =
-	sampler_state_extend_from_picture(pSrcPicture->repeatType);
-    if (composite_op->src_extend < 0)
-	I830FALLBACK("Bad src repeat 0x%x\n", pSrcPicture->repeatType);
-
-    if (pMaskPicture) {
-	composite_op->mask_filter =
-	    sampler_state_filter_from_picture(pMaskPicture->filter);
-	if (composite_op->mask_filter < 0)
-	    I830FALLBACK("Bad mask filter 0x%x\n", pMaskPicture->filter);
-	composite_op->mask_extend =
-	    sampler_state_extend_from_picture(pMaskPicture->repeatType);
-	if (composite_op->mask_extend < 0)
-	    I830FALLBACK("Bad mask repeat 0x%x\n", pMaskPicture->repeatType);
-    } else {
-	composite_op->mask_filter = SAMPLER_STATE_FILTER_NEAREST;
-	composite_op->mask_extend = SAMPLER_STATE_EXTEND_NONE;
-    }
-
-    /* Set up the surface states. */
-    surface_state_bo = dri_bo_alloc(pI830->bufmgr, "surface_state",
-				    3 * sizeof (brw_surface_state_padded),
-				    4096);
-    if (dri_bo_map(surface_state_bo, 1) != 0)
-	return FALSE;
-    /* Set up the state buffer for the destination surface */
-    i965_set_picture_surface_state(surface_state_bo, 0,
-				   pDstPicture, pDst, TRUE);
-    /* Set up the source surface state buffer */
-    i965_set_picture_surface_state(surface_state_bo, 1,
-				   pSrcPicture, pSrc, FALSE);
-    if (pMask) {
-	/* Set up the mask surface state buffer */
-	i965_set_picture_surface_state(surface_state_bo, 2,
-				       pMaskPicture, pMask,
-				       FALSE);
-    }
-    dri_bo_unmap(surface_state_bo);
-
-    /* Set up the binding table of surface indices to surface state. */
-    binding_table_bo = dri_bo_alloc(pI830->bufmgr, "binding_table",
-				    3 * sizeof(uint32_t), 4096);
-    if (dri_bo_map (binding_table_bo, 1) != 0) {
-	dri_bo_unreference(surface_state_bo);
-	return FALSE;
-    }
+i965_prepare_composite(int op, PicturePtr source_picture,
+		       PicturePtr mask_picture, PicturePtr dest_picture,
+		       PixmapPtr source, PixmapPtr mask, PixmapPtr dest)
+{
+	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state = intel->gen4_render_state;
+	gen4_composite_op *composite_op = &render_state->composite_op;
+	uint32_t *binding_table;
+	drm_intel_bo *binding_table_bo, *surface_state_bo;
+
+	composite_op->src_filter =
+	    sampler_state_filter_from_picture(source_picture->filter);
+	if (composite_op->src_filter < 0) {
+		intel_debug_fallback(scrn, "Bad src filter 0x%x\n",
+				     source_picture->filter);
+		return FALSE;
+	}
+	composite_op->src_extend =
+	    sampler_state_extend_from_picture(source_picture->repeatType);
+	if (composite_op->src_extend < 0) {
+		intel_debug_fallback(scrn, "Bad src repeat 0x%x\n",
+				     source_picture->repeatType);
+		return FALSE;
+	}
+
+	if (mask_picture) {
+		if (mask_picture->componentAlpha &&
+		    PICT_FORMAT_RGB(mask_picture->format)) {
+			/* Check if it's component alpha that relies on a source alpha and on
+			 * the source value.  We can only get one of those into the single
+			 * source value that we get to blend with.
+			 */
+			if (i965_blend_op[op].src_alpha &&
+			    (i965_blend_op[op].src_blend != BRW_BLENDFACTOR_ZERO)) {
+				intel_debug_fallback(scrn,
+						     "Component alpha not supported "
+						     "with source alpha and source "
+						     "value blending.\n");
+				return FALSE;
+			}
+		}
 
-    binding_table = binding_table_bo->virtual;
-    binding_table[0] = intel_emit_reloc(binding_table_bo,
-					0 * sizeof(uint32_t),
-					surface_state_bo,
-					0 * sizeof(brw_surface_state_padded),
-					I915_GEM_DOMAIN_INSTRUCTION, 0);
-
-    binding_table[1] = intel_emit_reloc(binding_table_bo,
-					1 * sizeof(uint32_t),
-					surface_state_bo,
-					1 * sizeof(brw_surface_state_padded),
-					I915_GEM_DOMAIN_INSTRUCTION, 0);
-
-    if (pMask) {
-	binding_table[2] = intel_emit_reloc(binding_table_bo,
-					    2 * sizeof(uint32_t),
+		composite_op->mask_filter =
+		    sampler_state_filter_from_picture(mask_picture->filter);
+		if (composite_op->mask_filter < 0) {
+			intel_debug_fallback(scrn, "Bad mask filter 0x%x\n",
+					     mask_picture->filter);
+			return FALSE;
+		}
+		composite_op->mask_extend =
+		    sampler_state_extend_from_picture(mask_picture->repeatType);
+		if (composite_op->mask_extend < 0) {
+			intel_debug_fallback(scrn, "Bad mask repeat 0x%x\n",
+					     mask_picture->repeatType);
+			return FALSE;
+		}
+	} else {
+		composite_op->mask_filter = SAMPLER_STATE_FILTER_NEAREST;
+		composite_op->mask_extend = SAMPLER_STATE_EXTEND_NONE;
+	}
+
+	/* Flush any pending writes prior to relocating the textures. */
+	if(i830_uxa_pixmap_is_dirty(source) ||
+	   (mask && i830_uxa_pixmap_is_dirty(mask)))
+		intel_batch_emit_flush(scrn);
+
+
+	/* Set up the surface states. */
+	surface_state_bo = dri_bo_alloc(intel->bufmgr, "surface_state",
+					3 * sizeof(brw_surface_state_padded),
+					4096);
+	if (dri_bo_map(surface_state_bo, 1) != 0) {
+		dri_bo_unreference(surface_state_bo);
+		return FALSE;
+	}
+	/* Set up the state buffer for the destination surface */
+	i965_set_picture_surface_state(intel, surface_state_bo, 0,
+				       dest_picture, dest, TRUE);
+	/* Set up the source surface state buffer */
+	i965_set_picture_surface_state(intel, surface_state_bo, 1,
+				       source_picture, source, FALSE);
+	if (mask) {
+		/* Set up the mask surface state buffer */
+		i965_set_picture_surface_state(intel, surface_state_bo, 2,
+					       mask_picture, mask, FALSE);
+	}
+	dri_bo_unmap(surface_state_bo);
+
+	/* Set up the binding table of surface indices to surface state. */
+	binding_table_bo = dri_bo_alloc(intel->bufmgr, "binding_table",
+					3 * sizeof(uint32_t), 4096);
+	if (dri_bo_map(binding_table_bo, 1) != 0) {
+		dri_bo_unreference(binding_table_bo);
+		dri_bo_unreference(surface_state_bo);
+		return FALSE;
+	}
+
+	binding_table = binding_table_bo->virtual;
+	binding_table[0] = intel_emit_reloc(binding_table_bo,
+					    0 * sizeof(uint32_t),
 					    surface_state_bo,
-					    2 * sizeof(brw_surface_state_padded),
+					    0 *
+					    sizeof(brw_surface_state_padded),
 					    I915_GEM_DOMAIN_INSTRUCTION, 0);
-    } else {
-	binding_table[2] = 0;
-    }
-    dri_bo_unmap(binding_table_bo);
-    /* All refs to surface_state are now contained in binding_table_bo. */
-    drm_intel_bo_unreference(surface_state_bo);
-
-    composite_op->op = op;
-    composite_op->source_picture = pSrcPicture;
-    composite_op->mask_picture = pMaskPicture;
-    composite_op->dest_picture = pDstPicture;
-    composite_op->source = pSrc;
-    composite_op->mask = pMask;
-    composite_op->dest = pDst;
-    drm_intel_bo_unreference(composite_op->binding_table_bo);
-    composite_op->binding_table_bo = binding_table_bo;
-    composite_op->src_filter =
-	sampler_state_filter_from_picture(pSrcPicture->filter);
-
-    pI830->scale_units[0][0] = pSrc->drawable.width;
-    pI830->scale_units[0][1] = pSrc->drawable.height;
-
-    pI830->transform[0] = pSrcPicture->transform;
-    composite_op->is_affine =
-	i830_transform_is_affine(pI830->transform[0]);
-
-    if (!pMask) {
-	pI830->transform[1] = NULL;
-	pI830->scale_units[1][0] = -1;
-	pI830->scale_units[1][1] = -1;
-    } else {
-	pI830->transform[1] = pMaskPicture->transform;
-	pI830->scale_units[1][0] = pMask->drawable.width;
-	pI830->scale_units[1][1] = pMask->drawable.height;
-	composite_op->is_affine |=
-	    i830_transform_is_affine(pI830->transform[1]);
-    }
-
-
-    if (pMask) {
-	if (pMaskPicture->componentAlpha &&
-	    PICT_FORMAT_RGB(pMaskPicture->format))
-	{
-	    if (i965_blend_op[op].src_alpha) {
-		if (composite_op->is_affine)
-		    composite_op->wm_kernel = WM_KERNEL_MASKCA_SRCALPHA_AFFINE;
-		else
-		    composite_op->wm_kernel = WM_KERNEL_MASKCA_SRCALPHA_PROJECTIVE;
-	    } else {
+
+	binding_table[1] = intel_emit_reloc(binding_table_bo,
+					    1 * sizeof(uint32_t),
+					    surface_state_bo,
+					    1 *
+					    sizeof(brw_surface_state_padded),
+					    I915_GEM_DOMAIN_INSTRUCTION, 0);
+
+	if (mask) {
+		binding_table[2] = intel_emit_reloc(binding_table_bo,
+						    2 * sizeof(uint32_t),
+						    surface_state_bo,
+						    2 *
+						    sizeof
+						    (brw_surface_state_padded),
+						    I915_GEM_DOMAIN_INSTRUCTION,
+						    0);
+	} else {
+		binding_table[2] = 0;
+	}
+	dri_bo_unmap(binding_table_bo);
+	/* All refs to surface_state are now contained in binding_table_bo. */
+	drm_intel_bo_unreference(surface_state_bo);
+
+	composite_op->op = op;
+	intel->render_source_picture = source_picture;
+	intel->render_mask_picture = mask_picture;
+	intel->render_dest_picture = dest_picture;
+	intel->render_source = source;
+	intel->render_mask = mask;
+	intel->render_dest = dest;
+	drm_intel_bo_unreference(composite_op->binding_table_bo);
+	composite_op->binding_table_bo = binding_table_bo;
+
+	intel->scale_units[0][0] = source->drawable.width;
+	intel->scale_units[0][1] = source->drawable.height;
+
+	intel->transform[0] = source_picture->transform;
+	composite_op->is_affine = i830_transform_is_affine(intel->transform[0]);
+
+	if (!mask) {
+		intel->transform[1] = NULL;
+		intel->scale_units[1][0] = -1;
+		intel->scale_units[1][1] = -1;
+	} else {
+		intel->transform[1] = mask_picture->transform;
+		intel->scale_units[1][0] = mask->drawable.width;
+		intel->scale_units[1][1] = mask->drawable.height;
+		composite_op->is_affine &=
+		    i830_transform_is_affine(intel->transform[1]);
+	}
+
+	if (mask) {
+		if (mask_picture->componentAlpha &&
+		    PICT_FORMAT_RGB(mask_picture->format)) {
+			if (i965_blend_op[op].src_alpha) {
+				if (composite_op->is_affine)
+					composite_op->wm_kernel =
+					    WM_KERNEL_MASKCA_SRCALPHA_AFFINE;
+				else
+					composite_op->wm_kernel =
+					    WM_KERNEL_MASKCA_SRCALPHA_PROJECTIVE;
+			} else {
+				if (composite_op->is_affine)
+					composite_op->wm_kernel =
+					    WM_KERNEL_MASKCA_AFFINE;
+				else
+					composite_op->wm_kernel =
+					    WM_KERNEL_MASKCA_PROJECTIVE;
+			}
+		} else {
+			if (composite_op->is_affine)
+				composite_op->wm_kernel =
+				    WM_KERNEL_MASKNOCA_AFFINE;
+			else
+				composite_op->wm_kernel =
+				    WM_KERNEL_MASKNOCA_PROJECTIVE;
+		}
+	} else {
 		if (composite_op->is_affine)
-		    composite_op->wm_kernel = WM_KERNEL_MASKCA_AFFINE;
+			composite_op->wm_kernel = WM_KERNEL_NOMASK_AFFINE;
 		else
-		    composite_op->wm_kernel = WM_KERNEL_MASKCA_PROJECTIVE;
-	    }
-	} else {
-	    if (composite_op->is_affine)
-		composite_op->wm_kernel = WM_KERNEL_MASKNOCA_AFFINE;
-	    else
-		composite_op->wm_kernel = WM_KERNEL_MASKNOCA_PROJECTIVE;
-	}
-    } else {
-	if (composite_op->is_affine)
-	    composite_op->wm_kernel = WM_KERNEL_NOMASK_AFFINE;
-	else
-	    composite_op->wm_kernel = WM_KERNEL_NOMASK_PROJECTIVE;
-    }
+			composite_op->wm_kernel = WM_KERNEL_NOMASK_PROJECTIVE;
+	}
 
-    if (!i965_composite_check_aperture(pScrn)) {
-	intel_batch_flush(pScrn, FALSE);
-	if (!i965_composite_check_aperture(pScrn))
-	    I830FALLBACK("Couldn't fit render operation in aperture\n");
-    }
+	if (!i965_composite_check_aperture(scrn)) {
+		intel_batch_submit(scrn, FALSE);
+		if (!i965_composite_check_aperture(scrn)) {
+			intel_debug_fallback(scrn,
+					     "Couldn't fit render operation "
+					     "in aperture\n");
+			return FALSE;
+		}
+	}
 
-    render_state->needs_state_emit = TRUE;
+	intel->needs_render_state_emit = TRUE;
 
-    return TRUE;
+	return TRUE;
 }
 
-static drm_intel_bo *
-i965_get_vb_space(ScrnInfoPtr pScrn)
+static drm_intel_bo *i965_get_vb_space(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state = pI830->gen4_render_state;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state = intel->gen4_render_state;
 
-    /* If the vertex buffer is too full, then we free the old and a new one
-     * gets made.
-     */
-    if (render_state->vb_offset + VERTEX_FLOATS_PER_COMPOSITE >
-	VERTEX_BUFFER_SIZE) {
-	drm_intel_bo_unreference(render_state->vertex_buffer_bo);
-	render_state->vertex_buffer_bo = NULL;
-    }
+	/* If the vertex buffer is too full, then we free the old and a new one
+	 * gets made.
+	 */
+	if (render_state->vb_offset + VERTEX_FLOATS_PER_COMPOSITE >
+	    VERTEX_BUFFER_SIZE) {
+		drm_intel_bo_unreference(render_state->vertex_buffer_bo);
+		render_state->vertex_buffer_bo = NULL;
+	}
 
-    /* Alloc a new vertex buffer if necessary. */
-    if (render_state->vertex_buffer_bo == NULL) {
-	render_state->vertex_buffer_bo = drm_intel_bo_alloc(pI830->bufmgr, "vb",
-							    sizeof(gen4_vertex_buffer),
-							    4096);
-	render_state->vb_offset = 0;
-    }
+	/* Alloc a new vertex buffer if necessary. */
+	if (render_state->vertex_buffer_bo == NULL) {
+		render_state->vertex_buffer_bo =
+		    drm_intel_bo_alloc(intel->bufmgr, "vb",
+				       sizeof(gen4_vertex_buffer), 4096);
+		render_state->vb_offset = 0;
+	}
 
-    drm_intel_bo_reference(render_state->vertex_buffer_bo);
-    return render_state->vertex_buffer_bo;
+	drm_intel_bo_reference(render_state->vertex_buffer_bo);
+	return render_state->vertex_buffer_bo;
 }
 
 void
-i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
+i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
 	       int dstX, int dstY, int w, int h)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state = pI830->gen4_render_state;
-    Bool has_mask;
-    float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
-    int i;
-    drm_intel_bo *vb_bo;
-    float vb[18];
-    Bool is_affine = render_state->composite_op.is_affine;
-
-    if (is_affine)
-    {
-	if (!i830_get_transformed_coordinates(srcX, srcY,
-					      pI830->transform[0],
-					      &src_x[0], &src_y[0]))
-	    return;
-	if (!i830_get_transformed_coordinates(srcX, srcY + h,
-					      pI830->transform[0],
-					      &src_x[1], &src_y[1]))
-	    return;
-	if (!i830_get_transformed_coordinates(srcX + w, srcY + h,
-					      pI830->transform[0],
-					      &src_x[2], &src_y[2]))
-	    return;
-    }
-    else
-    {
-	if (!i830_get_transformed_coordinates_3d(srcX, srcY,
-						 pI830->transform[0],
-						 &src_x[0], &src_y[0],
-						 &src_w[0]))
-	    return;
-	if (!i830_get_transformed_coordinates_3d(srcX, srcY + h,
-						 pI830->transform[0],
-						 &src_x[1], &src_y[1],
-						 &src_w[1]))
-	    return;
-	if (!i830_get_transformed_coordinates_3d(srcX + w, srcY + h,
-						 pI830->transform[0],
-						 &src_x[2], &src_y[2],
-						 &src_w[2]))
-	    return;
-    }
-
-    if (pI830->scale_units[1][0] == -1 || pI830->scale_units[1][1] == -1) {
-	has_mask = FALSE;
-    } else {
-	has_mask = TRUE;
+	ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state = intel->gen4_render_state;
+	Bool has_mask;
+	float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
+	int i;
+	drm_intel_bo *vb_bo;
+	float vb[24]; /* 3 * (2 dst + 3 src + 3 mask) */
+	Bool is_affine = render_state->composite_op.is_affine;
+
 	if (is_affine) {
-	    if (!i830_get_transformed_coordinates(maskX, maskY,
-						  pI830->transform[1],
-						  &mask_x[0], &mask_y[0]))
-		return;
-	    if (!i830_get_transformed_coordinates(maskX, maskY + h,
-						  pI830->transform[1],
-						  &mask_x[1], &mask_y[1]))
-		return;
-	    if (!i830_get_transformed_coordinates(maskX + w, maskY + h,
-						  pI830->transform[1],
-						  &mask_x[2], &mask_y[2]))
-		return;
+		if (!i830_get_transformed_coordinates(srcX, srcY,
+						      intel->transform[0],
+						      &src_x[0], &src_y[0]))
+			return;
+		if (!i830_get_transformed_coordinates(srcX, srcY + h,
+						      intel->transform[0],
+						      &src_x[1], &src_y[1]))
+			return;
+		if (!i830_get_transformed_coordinates(srcX + w, srcY + h,
+						      intel->transform[0],
+						      &src_x[2], &src_y[2]))
+			return;
 	} else {
-	    if (!i830_get_transformed_coordinates_3d(maskX, maskY,
-						     pI830->transform[1],
-						     &mask_x[0], &mask_y[0],
-						     &mask_w[0]))
-		return;
-	    if (!i830_get_transformed_coordinates_3d(maskX, maskY + h,
-						     pI830->transform[1],
-						     &mask_x[1], &mask_y[1],
-						     &mask_w[1]))
-		return;
-	    if (!i830_get_transformed_coordinates_3d(maskX + w, maskY + h,
-						     pI830->transform[1],
-						     &mask_x[2], &mask_y[2],
-						     &mask_w[2]))
-		return;
+		if (!i830_get_transformed_coordinates_3d(srcX, srcY,
+							 intel->transform[0],
+							 &src_x[0], &src_y[0],
+							 &src_w[0]))
+			return;
+		if (!i830_get_transformed_coordinates_3d(srcX, srcY + h,
+							 intel->transform[0],
+							 &src_x[1], &src_y[1],
+							 &src_w[1]))
+			return;
+		if (!i830_get_transformed_coordinates_3d(srcX + w, srcY + h,
+							 intel->transform[0],
+							 &src_x[2], &src_y[2],
+							 &src_w[2]))
+			return;
 	}
-    }
 
-    vb_bo = i965_get_vb_space(pScrn);
-    if (vb_bo == NULL)
-	return;
-    i = 0;
-    /* rect (x2,y2) */
-    vb[i++] = (float)(dstX + w);
-    vb[i++] = (float)(dstY + h);
-    vb[i++] = src_x[2] / pI830->scale_units[0][0];
-    vb[i++] = src_y[2] / pI830->scale_units[0][1];
-    if (!is_affine)
-	vb[i++] = src_w[2];
-    if (has_mask) {
-        vb[i++] = mask_x[2] / pI830->scale_units[1][0];
-        vb[i++] = mask_y[2] / pI830->scale_units[1][1];
+	if (intel->scale_units[1][0] == -1 || intel->scale_units[1][1] == -1) {
+		has_mask = FALSE;
+	} else {
+		has_mask = TRUE;
+		if (is_affine) {
+			if (!i830_get_transformed_coordinates(maskX, maskY,
+							      intel->
+							      transform[1],
+							      &mask_x[0],
+							      &mask_y[0]))
+				return;
+			if (!i830_get_transformed_coordinates(maskX, maskY + h,
+							      intel->
+							      transform[1],
+							      &mask_x[1],
+							      &mask_y[1]))
+				return;
+			if (!i830_get_transformed_coordinates
+			    (maskX + w, maskY + h, intel->transform[1],
+			     &mask_x[2], &mask_y[2]))
+				return;
+		} else {
+			if (!i830_get_transformed_coordinates_3d(maskX, maskY,
+								 intel->
+								 transform[1],
+								 &mask_x[0],
+								 &mask_y[0],
+								 &mask_w[0]))
+				return;
+			if (!i830_get_transformed_coordinates_3d
+			    (maskX, maskY + h, intel->transform[1], &mask_x[1],
+			     &mask_y[1], &mask_w[1]))
+				return;
+			if (!i830_get_transformed_coordinates_3d
+			    (maskX + w, maskY + h, intel->transform[1],
+			     &mask_x[2], &mask_y[2], &mask_w[2]))
+				return;
+		}
+	}
+
+	vb_bo = i965_get_vb_space(scrn);
+	if (vb_bo == NULL)
+		return;
+	i = 0;
+	/* rect (x2,y2) */
+	vb[i++] = (float)(dstX + w);
+	vb[i++] = (float)(dstY + h);
+	vb[i++] = src_x[2] / intel->scale_units[0][0];
+	vb[i++] = src_y[2] / intel->scale_units[0][1];
 	if (!is_affine)
-	    vb[i++] = mask_w[2];
-    }
+		vb[i++] = src_w[2];
+	if (has_mask) {
+		vb[i++] = mask_x[2] / intel->scale_units[1][0];
+		vb[i++] = mask_y[2] / intel->scale_units[1][1];
+		if (!is_affine)
+			vb[i++] = mask_w[2];
+	}
 
-    /* rect (x1,y2) */
-    vb[i++] = (float)dstX;
-    vb[i++] = (float)(dstY + h);
-    vb[i++] = src_x[1] / pI830->scale_units[0][0];
-    vb[i++] = src_y[1] / pI830->scale_units[0][1];
-    if (!is_affine)
-	vb[i++] = src_w[1];
-    if (has_mask) {
-        vb[i++] = mask_x[1] / pI830->scale_units[1][0];
-        vb[i++] = mask_y[1] / pI830->scale_units[1][1];
+	/* rect (x1,y2) */
+	vb[i++] = (float)dstX;
+	vb[i++] = (float)(dstY + h);
+	vb[i++] = src_x[1] / intel->scale_units[0][0];
+	vb[i++] = src_y[1] / intel->scale_units[0][1];
 	if (!is_affine)
-	    vb[i++] = mask_w[1];
-    }
+		vb[i++] = src_w[1];
+	if (has_mask) {
+		vb[i++] = mask_x[1] / intel->scale_units[1][0];
+		vb[i++] = mask_y[1] / intel->scale_units[1][1];
+		if (!is_affine)
+			vb[i++] = mask_w[1];
+	}
 
-    /* rect (x1,y1) */
-    vb[i++] = (float)dstX;
-    vb[i++] = (float)dstY;
-    vb[i++] = src_x[0] / pI830->scale_units[0][0];
-    vb[i++] = src_y[0] / pI830->scale_units[0][1];
-    if (!is_affine)
-	vb[i++] = src_w[0];
-    if (has_mask) {
-        vb[i++] = mask_x[0] / pI830->scale_units[1][0];
-        vb[i++] = mask_y[0] / pI830->scale_units[1][1];
+	/* rect (x1,y1) */
+	vb[i++] = (float)dstX;
+	vb[i++] = (float)dstY;
+	vb[i++] = src_x[0] / intel->scale_units[0][0];
+	vb[i++] = src_y[0] / intel->scale_units[0][1];
 	if (!is_affine)
-	    vb[i++] = mask_w[0];
-    }
-    assert (i <= VERTEX_BUFFER_SIZE);
-    drm_intel_bo_subdata(vb_bo, render_state->vb_offset * 4, i * 4, vb);
-
-    if (!i965_composite_check_aperture(pScrn))
-	intel_batch_flush(pScrn, FALSE);
-
-    intel_batch_start_atomic(pScrn, 200);
-    if (render_state->needs_state_emit)
-	i965_emit_composite_state(pScrn);
-
-    BEGIN_BATCH(12);
-    OUT_BATCH(MI_FLUSH);
-    /* Set up the pointer to our (single) vertex buffer */
-    OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 3);
-    OUT_BATCH((0 << VB0_BUFFER_INDEX_SHIFT) |
-	      VB0_VERTEXDATA |
-	      (render_state->vertex_size << VB0_BUFFER_PITCH_SHIFT));
-    OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0, render_state->vb_offset * 4);
-    OUT_BATCH(3);
-    OUT_BATCH(0); // ignore for VERTEXDATA, but still there
-
-    OUT_BATCH(BRW_3DPRIMITIVE |
-	      BRW_3DPRIMITIVE_VERTEX_SEQUENTIAL |
-	      (_3DPRIM_RECTLIST << BRW_3DPRIMITIVE_TOPOLOGY_SHIFT) |
-	      (0 << 9) |  /* CTG - indirect vertex count */
-	      4);
-    OUT_BATCH(3);  /* vertex count per instance */
-    OUT_BATCH(0); /* start vertex offset */
-    OUT_BATCH(1); /* single instance */
-    OUT_BATCH(0); /* start instance location */
-    OUT_BATCH(0); /* index buffer offset, ignored */
-    ADVANCE_BATCH();
-
-    render_state->vb_offset += i;
-    drm_intel_bo_unreference(vb_bo);
-
-    intel_batch_end_atomic(pScrn);
-
-#ifdef I830DEBUG
-    ErrorF("sync after 3dprimitive\n");
-    I830Sync(pScrn);
-#endif
+		vb[i++] = src_w[0];
+	if (has_mask) {
+		vb[i++] = mask_x[0] / intel->scale_units[1][0];
+		vb[i++] = mask_y[0] / intel->scale_units[1][1];
+		if (!is_affine)
+			vb[i++] = mask_w[0];
+	}
+	drm_intel_bo_subdata(vb_bo, render_state->vb_offset * 4, i * 4, vb);
+
+	if (!i965_composite_check_aperture(scrn))
+		intel_batch_submit(scrn, FALSE);
+
+	intel_batch_start_atomic(scrn, 200);
+	if (intel->needs_render_state_emit)
+		i965_emit_composite_state(scrn);
+
+	OUT_BATCH(MI_FLUSH);
+	/* Set up the pointer to our (single) vertex buffer */
+	OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 3);
+	OUT_BATCH((0 << VB0_BUFFER_INDEX_SHIFT) |
+		  VB0_VERTEXDATA |
+		  (render_state->vertex_size << VB0_BUFFER_PITCH_SHIFT));
+	OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0,
+		  render_state->vb_offset * 4);
+
+	if (IS_IGDNG(intel))
+		OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0,
+			  render_state->vb_offset * 4 + i * 4);
+	else
+		OUT_BATCH(3);
+
+	OUT_BATCH(0);		// ignore for VERTEXDATA, but still there
+
+	OUT_BATCH(BRW_3DPRIMITIVE | BRW_3DPRIMITIVE_VERTEX_SEQUENTIAL | (_3DPRIM_RECTLIST << BRW_3DPRIMITIVE_TOPOLOGY_SHIFT) | (0 << 9) |	/* CTG - indirect vertex count */
+		  4);
+	OUT_BATCH(3);		/* vertex count per instance */
+	OUT_BATCH(0);		/* start vertex offset */
+	OUT_BATCH(1);		/* single instance */
+	OUT_BATCH(0);		/* start instance location */
+	OUT_BATCH(0);		/* index buffer offset, ignored */
+
+	render_state->vb_offset += i;
+	drm_intel_bo_unreference(vb_bo);
+
+	intel_batch_end_atomic(scrn);
 }
 
-void
-i965_batch_flush_notify(ScrnInfoPtr pScrn)
+void i965_batch_flush_notify(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state = pI830->gen4_render_state;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state = intel->gen4_render_state;
 
-    /* Once a batch is emitted, we never want to map again any buffer
-     * object being referenced by that batch, (which would be very
-     * expensive). */
-    if (render_state->vertex_buffer_bo) {
-	dri_bo_unreference (render_state->vertex_buffer_bo);
-	render_state->vertex_buffer_bo = NULL;
-    }
+	/* Once a batch is emitted, we never want to map again any buffer
+	 * object being referenced by that batch, (which would be very
+	 * expensive). */
+	if (render_state->vertex_buffer_bo) {
+		dri_bo_unreference(render_state->vertex_buffer_bo);
+		render_state->vertex_buffer_bo = NULL;
+	}
 
-    render_state->needs_state_emit = TRUE;
+	intel->needs_render_state_emit = TRUE;
 }
 
 /**
  * Called at EnterVT so we can set up our offsets into the state buffer.
  */
-void
-gen4_render_state_init(ScrnInfoPtr pScrn)
+void gen4_render_state_init(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state;
-    int i, j, k, l, m;
-    drm_intel_bo *sf_kernel_bo, *sf_kernel_mask_bo;
-    drm_intel_bo *border_color_bo;
-
-    if (pI830->gen4_render_state == NULL)
-	pI830->gen4_render_state = calloc(sizeof(*render_state), 1);
-
-    render_state = pI830->gen4_render_state;
-    render_state->vb_offset = 0;
-
-    render_state->vs_state_bo = gen4_create_vs_unit_state(pScrn);
-
-    /* Set up the two SF states (one for blending with a mask, one without) */
-    sf_kernel_bo = intel_bo_alloc_for_data(pScrn,
-					   sf_kernel_static,
-					   sizeof(sf_kernel_static),
-					   "sf kernel");
-    sf_kernel_mask_bo = intel_bo_alloc_for_data(pScrn,
-						sf_kernel_mask_static,
-						sizeof(sf_kernel_mask_static),
-						"sf mask kernel");
-    render_state->sf_state_bo = gen4_create_sf_state(pScrn, sf_kernel_bo);
-    render_state->sf_mask_state_bo = gen4_create_sf_state(pScrn,
-							  sf_kernel_mask_bo);
-    drm_intel_bo_unreference(sf_kernel_bo);
-    drm_intel_bo_unreference(sf_kernel_mask_bo);
-
-    for (m = 0; m < WM_KERNEL_COUNT; m++) {
-	render_state->wm_kernel_bo[m] =
-	    intel_bo_alloc_for_data(pScrn,
-				    wm_kernels[m].data, wm_kernels[m].size,
-				    "WM kernel");
-    }
-
-    /* Set up the WM states: each filter/extend type for source and mask, per
-     * kernel.
-     */
-    border_color_bo = sampler_border_color_create(pScrn);
-    for (i = 0; i < SAMPLER_STATE_FILTER_COUNT; i++) {
-	for (j = 0; j < SAMPLER_STATE_EXTEND_COUNT; j++) {
-	    for (k = 0; k < SAMPLER_STATE_FILTER_COUNT; k++) {
-		for (l = 0; l < SAMPLER_STATE_EXTEND_COUNT; l++) {
-		    drm_intel_bo *sampler_state_bo;
-
-		    sampler_state_bo =
-			gen4_create_sampler_state(pScrn,
-						  i, j,
-						  k, l,
-						  border_color_bo);
-
-		    for (m = 0; m < WM_KERNEL_COUNT; m++) {
-			render_state->wm_state_bo[m][i][j][k][l] =
-			    gen4_create_wm_state(pScrn,
-						 wm_kernels[m].has_mask,
-						 render_state->wm_kernel_bo[m],
-						 sampler_state_bo);
-		    }
-		    drm_intel_bo_unreference(sampler_state_bo);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state;
+	int i, j, k, l, m;
+	drm_intel_bo *sf_kernel_bo, *sf_kernel_mask_bo;
+	drm_intel_bo *border_color_bo;
+
+	if (intel->gen4_render_state == NULL)
+		intel->gen4_render_state = calloc(sizeof(*render_state), 1);
+
+	render_state = intel->gen4_render_state;
+	render_state->vb_offset = 0;
+
+	render_state->vs_state_bo = gen4_create_vs_unit_state(scrn);
+
+	/* Set up the two SF states (one for blending with a mask, one without) */
+	if (IS_IGDNG(intel)) {
+		sf_kernel_bo = intel_bo_alloc_for_data(scrn,
+						       sf_kernel_static_gen5,
+						       sizeof
+						       (sf_kernel_static_gen5),
+						       "sf kernel gen5");
+		sf_kernel_mask_bo =
+		    intel_bo_alloc_for_data(scrn, sf_kernel_mask_static_gen5,
+					    sizeof(sf_kernel_mask_static_gen5),
+					    "sf mask kernel");
+	} else {
+		sf_kernel_bo = intel_bo_alloc_for_data(scrn,
+						       sf_kernel_static,
+						       sizeof(sf_kernel_static),
+						       "sf kernel");
+		sf_kernel_mask_bo = intel_bo_alloc_for_data(scrn,
+							    sf_kernel_mask_static,
+							    sizeof
+							    (sf_kernel_mask_static),
+							    "sf mask kernel");
+	}
+	render_state->sf_state_bo = gen4_create_sf_state(scrn, sf_kernel_bo);
+	render_state->sf_mask_state_bo = gen4_create_sf_state(scrn,
+							      sf_kernel_mask_bo);
+	drm_intel_bo_unreference(sf_kernel_bo);
+	drm_intel_bo_unreference(sf_kernel_mask_bo);
+
+	for (m = 0; m < WM_KERNEL_COUNT; m++) {
+		if (IS_IGDNG(intel))
+			render_state->wm_kernel_bo[m] =
+			    intel_bo_alloc_for_data(scrn,
+						    wm_kernels_gen5[m].data,
+						    wm_kernels_gen5[m].size,
+						    "WM kernel gen5");
+		else
+			render_state->wm_kernel_bo[m] =
+			    intel_bo_alloc_for_data(scrn,
+						    wm_kernels[m].data,
+						    wm_kernels[m].size,
+						    "WM kernel");
+	}
+
+	/* Set up the WM states: each filter/extend type for source and mask, per
+	 * kernel.
+	 */
+	border_color_bo = sampler_border_color_create(scrn);
+	for (i = 0; i < SAMPLER_STATE_FILTER_COUNT; i++) {
+		for (j = 0; j < SAMPLER_STATE_EXTEND_COUNT; j++) {
+			for (k = 0; k < SAMPLER_STATE_FILTER_COUNT; k++) {
+				for (l = 0; l < SAMPLER_STATE_EXTEND_COUNT; l++) {
+					drm_intel_bo *sampler_state_bo;
+
+					sampler_state_bo =
+					    gen4_create_sampler_state(scrn,
+								      i, j,
+								      k, l,
+								      border_color_bo);
+
+					for (m = 0; m < WM_KERNEL_COUNT; m++) {
+						if (IS_IGDNG(intel))
+							render_state->
+							    wm_state_bo[m][i][j]
+							    [k][l] =
+							    gen4_create_wm_state
+							    (scrn,
+							     wm_kernels_gen5[m].
+							     has_mask,
+							     render_state->
+							     wm_kernel_bo[m],
+							     sampler_state_bo);
+						else
+							render_state->
+							    wm_state_bo[m][i][j]
+							    [k][l] =
+							    gen4_create_wm_state
+							    (scrn,
+							     wm_kernels[m].
+							     has_mask,
+							     render_state->
+							     wm_kernel_bo[m],
+							     sampler_state_bo);
+					}
+					drm_intel_bo_unreference
+					    (sampler_state_bo);
+				}
+			}
 		}
-	    }
 	}
-    }
-    drm_intel_bo_unreference(border_color_bo);
+	drm_intel_bo_unreference(border_color_bo);
 
-    render_state->cc_state_bo = gen4_create_cc_unit_state(pScrn);
-    render_state->sip_kernel_bo = intel_bo_alloc_for_data(pScrn,
-							  sip_kernel_static,
-							  sizeof(sip_kernel_static),
-							  "sip kernel");
+	render_state->cc_state_bo = gen4_create_cc_unit_state(scrn);
+	render_state->sip_kernel_bo = intel_bo_alloc_for_data(scrn,
+							      sip_kernel_static,
+							      sizeof
+							      (sip_kernel_static),
+							      "sip kernel");
 }
 
 /**
  * Called at LeaveVT.
  */
-void
-gen4_render_state_cleanup(ScrnInfoPtr pScrn)
+void gen4_render_state_cleanup(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    struct gen4_render_state *render_state= pI830->gen4_render_state;
-    int i, j, k, l, m;
-
-    if (render_state->vertex_buffer_bo) {
-	dri_bo_unreference (render_state->vertex_buffer_bo);
-	render_state->vertex_buffer_bo = NULL;
-    }
-
-    drm_intel_bo_unreference(render_state->vs_state_bo);
-    render_state->vs_state_bo = NULL;
-    drm_intel_bo_unreference(render_state->sf_state_bo);
-    render_state->sf_state_bo = NULL;
-    drm_intel_bo_unreference(render_state->sf_mask_state_bo);
-    render_state->sf_mask_state_bo = NULL;
-
-    for (i = 0; i < WM_KERNEL_COUNT; i++) {
-	drm_intel_bo_unreference(render_state->wm_kernel_bo[i]);
-	render_state->wm_kernel_bo[i] = NULL;
-    }
-
-    for (i = 0; i < SAMPLER_STATE_FILTER_COUNT; i++)
-	for (j = 0; j < SAMPLER_STATE_EXTEND_COUNT; j++)
-	    for (k = 0; k < SAMPLER_STATE_FILTER_COUNT; k++)
-		for (l = 0; l < SAMPLER_STATE_EXTEND_COUNT; l++)
-		    for (m = 0; m < WM_KERNEL_COUNT; m++) {
-			drm_intel_bo_unreference(render_state->wm_state_bo[m][i][j][k][l]);
-			render_state->wm_state_bo[m][i][j][k][l] = NULL;
-		    }
-
-    drm_intel_bo_unreference(render_state->cc_state_bo);
-    render_state->cc_state_bo = NULL;
-    drm_intel_bo_unreference(render_state->sip_kernel_bo);
-    render_state->sip_kernel_bo = NULL;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct gen4_render_state *render_state = intel->gen4_render_state;
+	int i, j, k, l, m;
+	gen4_composite_op *composite_op = &render_state->composite_op;
+
+	drm_intel_bo_unreference(composite_op->binding_table_bo);
+	drm_intel_bo_unreference(render_state->vertex_buffer_bo);
+
+	drm_intel_bo_unreference(render_state->vs_state_bo);
+	drm_intel_bo_unreference(render_state->sf_state_bo);
+	drm_intel_bo_unreference(render_state->sf_mask_state_bo);
+
+	for (i = 0; i < WM_KERNEL_COUNT; i++)
+		drm_intel_bo_unreference(render_state->wm_kernel_bo[i]);
+
+	for (i = 0; i < SAMPLER_STATE_FILTER_COUNT; i++)
+		for (j = 0; j < SAMPLER_STATE_EXTEND_COUNT; j++)
+			for (k = 0; k < SAMPLER_STATE_FILTER_COUNT; k++)
+				for (l = 0; l < SAMPLER_STATE_EXTEND_COUNT; l++)
+					for (m = 0; m < WM_KERNEL_COUNT; m++)
+						drm_intel_bo_unreference
+						    (render_state->
+						     wm_state_bo[m][i][j][k]
+						     [l]);
+
+	drm_intel_bo_unreference(render_state->cc_state_bo);
+	drm_intel_bo_unreference(render_state->sip_kernel_bo);
+
+	free(intel->gen4_render_state);
+	intel->gen4_render_state = NULL;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/i965_video.c new/xsrc/external/mit/xf86-video-intel/dist/src/i965_video.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/i965_video.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/i965_video.c	2011-02-08 11:14:00.000000000 +0100
@@ -48,25 +48,25 @@
 
 static const uint32_t sip_kernel_static[][4] = {
 /*    wait (1) a0<1>UW a145<0,1,0>UW { align1 +  } */
-    { 0x00000030, 0x20000108, 0x00001220, 0x00000000 },
+	{0x00000030, 0x20000108, 0x00001220, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 /*    nop (4) g0<1>UD { align1 +  } */
-    { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+	{0x0040007e, 0x20000c21, 0x00690000, 0x00000000},
 };
 
 /*
@@ -110,43 +110,64 @@ static const uint32_t ps_kernel_planar_s
 #include "exa_wm_write.g4b"
 };
 
-#define ALIGN(i,m)    (((i) + (m) - 1) & ~((m) - 1))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
+/* new program for IGDNG */
+static const uint32_t sf_kernel_static_gen5[][4] = {
+#include "exa_sf.g4b.gen5"
+};
+
+static const uint32_t ps_kernel_packed_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_affine.g4b.gen5"
+#include "exa_wm_src_sample_argb.g4b.gen5"
+#include "exa_wm_yuv_rgb.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
 
-static uint32_t float_to_uint (float f) {
-    union {uint32_t i; float f;} x;
-    x.f = f;
-    return x.i;
+static const uint32_t ps_kernel_planar_static_gen5[][4] = {
+#include "exa_wm_xy.g4b.gen5"
+#include "exa_wm_src_affine.g4b.gen5"
+#include "exa_wm_src_sample_planar.g4b.gen5"
+#include "exa_wm_yuv_rgb.g4b.gen5"
+#include "exa_wm_write.g4b.gen5"
+};
+
+static uint32_t float_to_uint(float f)
+{
+	union {
+		uint32_t i;
+		float f;
+	} x;
+	x.f = f;
+	return x.i;
 }
 
 #if 0
 static struct {
-    uint32_t svg_ctl;
-    char *name;
+	uint32_t svg_ctl;
+	char *name;
 } svg_ctl_bits[] = {
-    { BRW_SVG_CTL_GS_BA, "General State Base Address" },
-    { BRW_SVG_CTL_SS_BA, "Surface State Base Address" },
-    { BRW_SVG_CTL_IO_BA, "Indirect Object Base Address" },
-    { BRW_SVG_CTL_GS_AUB, "Generate State Access Upper Bound" },
-    { BRW_SVG_CTL_IO_AUB, "Indirect Object Access Upper Bound" },
-    { BRW_SVG_CTL_SIP, "System Instruction Pointer" },
-    { 0, 0 },
-};
+	{
+	BRW_SVG_CTL_GS_BA, "General State Base Address"}, {
+	BRW_SVG_CTL_SS_BA, "Surface State Base Address"}, {
+	BRW_SVG_CTL_IO_BA, "Indirect Object Base Address"}, {
+	BRW_SVG_CTL_GS_AUB, "Generate State Access Upper Bound"}, {
+	BRW_SVG_CTL_IO_AUB, "Indirect Object Access Upper Bound"}, {
+	BRW_SVG_CTL_SIP, "System Instruction Pointer"}, {
+0, 0},};
 
-static void
-brw_debug (ScrnInfoPtr pScrn, char *when)
+static void brw_debug(ScrnInfoPtr scrn, char *when)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int	i;
-    uint32_t v;
-
-    I830Sync (pScrn);
-    ErrorF("brw_debug: %s\n", when);
-    for (i = 0; svg_ctl_bits[i].name; i++) {
-	OUTREG(BRW_SVG_CTL, svg_ctl_bits[i].svg_ctl);
-	v = INREG(BRW_SVG_RDATA);
-	ErrorF("\t%34.34s: 0x%08x\n", svg_ctl_bits[i].name, v);
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int i;
+	uint32_t v;
+
+	intel_sync(scrn);
+	ErrorF("brw_debug: %s\n", when);
+	for (i = 0; svg_ctl_bits[i].name; i++) {
+		OUTREG(BRW_SVG_CTL, svg_ctl_bits[i].svg_ctl);
+		v = INREG(BRW_SVG_RDATA);
+		ErrorF("\t%34.34s: 0x%08x\n", svg_ctl_bits[i].name, v);
+	}
 }
 #endif
 
@@ -154,150 +175,142 @@ brw_debug (ScrnInfoPtr pScrn, char *when
 #define WATCH_WIZ 0
 #define WATCH_STATS 0
 
-static void
-i965_pre_draw_debug(ScrnInfoPtr scrn)
+static void i965_pre_draw_debug(ScrnInfoPtr scrn)
 {
 #if 0
-    I830Ptr pI830 = I830PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 #endif
 
 #if 0
-    ErrorF ("before EU_ATT 0x%08x%08x EU_ATT_DATA 0x%08x%08x\n",
-	    INREG(BRW_EU_ATT_1), INREG(BRW_EU_ATT_0),
-	    INREG(BRW_EU_ATT_DATA_1), INREG(BRW_EU_ATT_DATA_0));
-
-    OUTREG(BRW_VF_CTL,
-	   BRW_VF_CTL_SNAPSHOT_MUX_SELECT_THREADID |
-	   BRW_VF_CTL_SNAPSHOT_TYPE_VERTEX_INDEX |
-	   BRW_VF_CTL_SNAPSHOT_ENABLE);
-    OUTREG(BRW_VF_STRG_VAL, 0);
+	ErrorF("before EU_ATT 0x%08x%08x EU_ATT_DATA 0x%08x%08x\n",
+	       INREG(BRW_EU_ATT_1), INREG(BRW_EU_ATT_0),
+	       INREG(BRW_EU_ATT_DATA_1), INREG(BRW_EU_ATT_DATA_0));
+
+	OUTREG(BRW_VF_CTL,
+	       BRW_VF_CTL_SNAPSHOT_MUX_SELECT_THREADID |
+	       BRW_VF_CTL_SNAPSHOT_TYPE_VERTEX_INDEX |
+	       BRW_VF_CTL_SNAPSHOT_ENABLE);
+	OUTREG(BRW_VF_STRG_VAL, 0);
 #endif
 
 #if 0
-    OUTREG(BRW_VS_CTL,
-	   BRW_VS_CTL_SNAPSHOT_ALL_THREADS |
-	   BRW_VS_CTL_SNAPSHOT_MUX_VALID_COUNT |
-	   BRW_VS_CTL_THREAD_SNAPSHOT_ENABLE);
+	OUTREG(BRW_VS_CTL,
+	       BRW_VS_CTL_SNAPSHOT_ALL_THREADS |
+	       BRW_VS_CTL_SNAPSHOT_MUX_VALID_COUNT |
+	       BRW_VS_CTL_THREAD_SNAPSHOT_ENABLE);
 
-    OUTREG(BRW_VS_STRG_VAL, 0);
+	OUTREG(BRW_VS_STRG_VAL, 0);
 #endif
 
 #if WATCH_SF
-    OUTREG(BRW_SF_CTL,
-	   BRW_SF_CTL_SNAPSHOT_MUX_VERTEX_COUNT |
-	   BRW_SF_CTL_SNAPSHOT_ALL_THREADS |
-	   BRW_SF_CTL_THREAD_SNAPSHOT_ENABLE);
-    OUTREG(BRW_SF_STRG_VAL, 0);
+	OUTREG(BRW_SF_CTL,
+	       BRW_SF_CTL_SNAPSHOT_MUX_VERTEX_COUNT |
+	       BRW_SF_CTL_SNAPSHOT_ALL_THREADS |
+	       BRW_SF_CTL_THREAD_SNAPSHOT_ENABLE);
+	OUTREG(BRW_SF_STRG_VAL, 0);
 #endif
 
 #if WATCH_WIZ
-    OUTREG(BRW_WIZ_CTL,
-	   BRW_WIZ_CTL_SNAPSHOT_MUX_SUBSPAN_INSTANCE |
-	   BRW_WIZ_CTL_SNAPSHOT_ALL_THREADS |
-	   BRW_WIZ_CTL_SNAPSHOT_ENABLE);
-    OUTREG(BRW_WIZ_STRG_VAL,
-	   (box_x1) | (box_y1 << 16));
+	OUTREG(BRW_WIZ_CTL,
+	       BRW_WIZ_CTL_SNAPSHOT_MUX_SUBSPAN_INSTANCE |
+	       BRW_WIZ_CTL_SNAPSHOT_ALL_THREADS | BRW_WIZ_CTL_SNAPSHOT_ENABLE);
+	OUTREG(BRW_WIZ_STRG_VAL, (box_x1) | (box_y1 << 16));
 #endif
 
 #if 0
-    OUTREG(BRW_TS_CTL,
-	   BRW_TS_CTL_SNAPSHOT_MESSAGE_ERROR |
-	   BRW_TS_CTL_SNAPSHOT_ALL_CHILD_THREADS |
-	   BRW_TS_CTL_SNAPSHOT_ALL_ROOT_THREADS |
-	   BRW_TS_CTL_SNAPSHOT_ENABLE);
+	OUTREG(BRW_TS_CTL,
+	       BRW_TS_CTL_SNAPSHOT_MESSAGE_ERROR |
+	       BRW_TS_CTL_SNAPSHOT_ALL_CHILD_THREADS |
+	       BRW_TS_CTL_SNAPSHOT_ALL_ROOT_THREADS |
+	       BRW_TS_CTL_SNAPSHOT_ENABLE);
 #endif
 }
 
-static void
-i965_post_draw_debug(ScrnInfoPtr scrn)
+static void i965_post_draw_debug(ScrnInfoPtr scrn)
 {
 #if 0
-    I830Ptr pI830 = I830PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 #endif
 
 #if 0
-    for (j = 0; j < 100000; j++) {
-	ctl = INREG(BRW_VF_CTL);
-	if (ctl & BRW_VF_CTL_SNAPSHOT_COMPLETE)
-	    break;
-    }
-
-    rdata = INREG(BRW_VF_RDATA);
-    OUTREG(BRW_VF_CTL, 0);
-    ErrorF ("VF_CTL: 0x%08x VF_RDATA: 0x%08x\n", ctl, rdata);
+	for (j = 0; j < 100000; j++) {
+		ctl = INREG(BRW_VF_CTL);
+		if (ctl & BRW_VF_CTL_SNAPSHOT_COMPLETE)
+			break;
+	}
+
+	rdata = INREG(BRW_VF_RDATA);
+	OUTREG(BRW_VF_CTL, 0);
+	ErrorF("VF_CTL: 0x%08x VF_RDATA: 0x%08x\n", ctl, rdata);
 #endif
 
 #if 0
-    for (j = 0; j < 1000000; j++) {
-	ctl = INREG(BRW_VS_CTL);
-	if (ctl & BRW_VS_CTL_SNAPSHOT_COMPLETE)
-	    break;
-    }
+	for (j = 0; j < 1000000; j++) {
+		ctl = INREG(BRW_VS_CTL);
+		if (ctl & BRW_VS_CTL_SNAPSHOT_COMPLETE)
+			break;
+	}
 
-    rdata = INREG(BRW_VS_RDATA);
-    for (k = 0; k <= 3; k++) {
-	OUTREG(BRW_VS_CTL,
-	       BRW_VS_CTL_SNAPSHOT_COMPLETE |
-	       (k << 8));
 	rdata = INREG(BRW_VS_RDATA);
-	ErrorF ("VS_CTL: 0x%08x VS_RDATA(%d): 0x%08x\n", ctl, k, rdata);
-    }
+	for (k = 0; k <= 3; k++) {
+		OUTREG(BRW_VS_CTL, BRW_VS_CTL_SNAPSHOT_COMPLETE | (k << 8));
+		rdata = INREG(BRW_VS_RDATA);
+		ErrorF("VS_CTL: 0x%08x VS_RDATA(%d): 0x%08x\n", ctl, k, rdata);
+	}
 
-    OUTREG(BRW_VS_CTL, 0);
+	OUTREG(BRW_VS_CTL, 0);
 #endif
 
 #if WATCH_SF
-    for (j = 0; j < 1000000; j++) {
-	ctl = INREG(BRW_SF_CTL);
-	if (ctl & BRW_SF_CTL_SNAPSHOT_COMPLETE)
-	    break;
-    }
+	for (j = 0; j < 1000000; j++) {
+		ctl = INREG(BRW_SF_CTL);
+		if (ctl & BRW_SF_CTL_SNAPSHOT_COMPLETE)
+			break;
+	}
 
-    for (k = 0; k <= 7; k++) {
-	OUTREG(BRW_SF_CTL,
-	       BRW_SF_CTL_SNAPSHOT_COMPLETE |
-	       (k << 8));
-	rdata = INREG(BRW_SF_RDATA);
-	ErrorF("SF_CTL: 0x%08x SF_RDATA(%d): 0x%08x\n", ctl, k, rdata);
-    }
+	for (k = 0; k <= 7; k++) {
+		OUTREG(BRW_SF_CTL, BRW_SF_CTL_SNAPSHOT_COMPLETE | (k << 8));
+		rdata = INREG(BRW_SF_RDATA);
+		ErrorF("SF_CTL: 0x%08x SF_RDATA(%d): 0x%08x\n", ctl, k, rdata);
+	}
 
-    OUTREG(BRW_SF_CTL, 0);
+	OUTREG(BRW_SF_CTL, 0);
 #endif
 
 #if WATCH_WIZ
-    for (j = 0; j < 100000; j++) {
-	ctl = INREG(BRW_WIZ_CTL);
-	if (ctl & BRW_WIZ_CTL_SNAPSHOT_COMPLETE)
-	    break;
-    }
-
-    rdata = INREG(BRW_WIZ_RDATA);
-    OUTREG(BRW_WIZ_CTL, 0);
-    ErrorF("WIZ_CTL: 0x%08x WIZ_RDATA: 0x%08x\n", ctl, rdata);
+	for (j = 0; j < 100000; j++) {
+		ctl = INREG(BRW_WIZ_CTL);
+		if (ctl & BRW_WIZ_CTL_SNAPSHOT_COMPLETE)
+			break;
+	}
+
+	rdata = INREG(BRW_WIZ_RDATA);
+	OUTREG(BRW_WIZ_CTL, 0);
+	ErrorF("WIZ_CTL: 0x%08x WIZ_RDATA: 0x%08x\n", ctl, rdata);
 #endif
 
 #if 0
-    for (j = 0; j < 100000; j++) {
-	ctl = INREG(BRW_TS_CTL);
-	if (ctl & BRW_TS_CTL_SNAPSHOT_COMPLETE)
-	    break;
-    }
-
-    rdata = INREG(BRW_TS_RDATA);
-    OUTREG(BRW_TS_CTL, 0);
-    ErrorF("TS_CTL: 0x%08x TS_RDATA: 0x%08x\n", ctl, rdata);
-
-    ErrorF("after EU_ATT 0x%08x%08x EU_ATT_DATA 0x%08x%08x\n",
-	   INREG(BRW_EU_ATT_1), INREG(BRW_EU_ATT_0),
-	   INREG(BRW_EU_ATT_DATA_1), INREG(BRW_EU_ATT_DATA_0));
+	for (j = 0; j < 100000; j++) {
+		ctl = INREG(BRW_TS_CTL);
+		if (ctl & BRW_TS_CTL_SNAPSHOT_COMPLETE)
+			break;
+	}
+
+	rdata = INREG(BRW_TS_RDATA);
+	OUTREG(BRW_TS_CTL, 0);
+	ErrorF("TS_CTL: 0x%08x TS_RDATA: 0x%08x\n", ctl, rdata);
+
+	ErrorF("after EU_ATT 0x%08x%08x EU_ATT_DATA 0x%08x%08x\n",
+	       INREG(BRW_EU_ATT_1), INREG(BRW_EU_ATT_0),
+	       INREG(BRW_EU_ATT_DATA_1), INREG(BRW_EU_ATT_DATA_0));
 #endif
 
 #if 0
-    for (j = 0; j < 256; j++) {
-	OUTREG(BRW_TD_CTL, j << BRW_TD_CTL_MUX_SHIFT);
-	rdata = INREG(BRW_TD_RDATA);
-	ErrorF ("TD_RDATA(%d): 0x%08x\n", j, rdata);
-    }
+	for (j = 0; j < 256; j++) {
+		OUTREG(BRW_TD_CTL, j << BRW_TD_CTL_MUX_SHIFT);
+		rdata = INREG(BRW_TD_RDATA);
+		ErrorF("TD_RDATA(%d): 0x%08x\n", j, rdata);
+	}
 #endif
 }
 
@@ -327,869 +340,929 @@ i965_post_draw_debug(ScrnInfoPtr scrn)
 #define URB_CS_ENTRY_SIZE     0
 
 static int
-intel_alloc_and_map(I830Ptr i830, char *name, int size,
-		    drm_intel_bo **bop, void *virtualp)
+intel_alloc_and_map(intel_screen_private *intel, char *name, int size,
+		    drm_intel_bo ** bop, void *virtualp)
 {
-    drm_intel_bo    *bo;
+	drm_intel_bo *bo;
 
-    bo = drm_intel_bo_alloc(i830->bufmgr, name, size, 4096);
-    if (!bo)
-	return -1;
-    if (drm_intel_bo_map(bo, TRUE) != 0) {
-	drm_intel_bo_unreference(bo);
-	return -1;
-    }
-    *bop = bo;
-    *(void **) virtualp = bo->virtual;
-    memset (bo->virtual, 0, size);
-    return 0;
+	bo = drm_intel_bo_alloc(intel->bufmgr, name, size, 4096);
+	if (!bo)
+		return -1;
+	if (drm_intel_bo_map(bo, TRUE) != 0) {
+		drm_intel_bo_unreference(bo);
+		return -1;
+	}
+	*bop = bo;
+	*(void **)virtualp = bo->virtual;
+	memset(bo->virtual, 0, size);
+	return 0;
 }
 
-static drm_intel_bo *
-i965_create_dst_surface_state(ScrnInfoPtr scrn,
-			      PixmapPtr pixmap)
+static drm_intel_bo *i965_create_dst_surface_state(ScrnInfoPtr scrn,
+						   PixmapPtr pixmap)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    struct brw_surface_state *dest_surf_state;
-    drm_intel_bo *pixmap_bo = i830_get_pixmap_bo(pixmap);
-    drm_intel_bo *surf_bo;
-
-    if (intel_alloc_and_map(pI830, "textured video surface state", 4096,
-			    &surf_bo, &dest_surf_state) != 0)
-	return NULL;
-
-    dest_surf_state->ss0.surface_type = BRW_SURFACE_2D;
-    dest_surf_state->ss0.data_return_format = BRW_SURFACERETURNFORMAT_FLOAT32;
-    if (pI830->cpp == 2) {
-	dest_surf_state->ss0.surface_format = BRW_SURFACEFORMAT_B5G6R5_UNORM;
-    } else {
-	dest_surf_state->ss0.surface_format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
-    }
-    dest_surf_state->ss0.writedisable_alpha = 0;
-    dest_surf_state->ss0.writedisable_red = 0;
-    dest_surf_state->ss0.writedisable_green = 0;
-    dest_surf_state->ss0.writedisable_blue = 0;
-    dest_surf_state->ss0.color_blend = 1;
-    dest_surf_state->ss0.vert_line_stride = 0;
-    dest_surf_state->ss0.vert_line_stride_ofs = 0;
-    dest_surf_state->ss0.mipmap_layout_mode = 0;
-    dest_surf_state->ss0.render_cache_read_mode = 0;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	struct brw_surface_state *dest_surf_state;
+	drm_intel_bo *pixmap_bo = i830_get_pixmap_bo(pixmap);
+	drm_intel_bo *surf_bo;
+
+	if (intel_alloc_and_map(intel, "textured video surface state", 4096,
+				&surf_bo, &dest_surf_state) != 0)
+		return NULL;
+
+	dest_surf_state->ss0.surface_type = BRW_SURFACE_2D;
+	dest_surf_state->ss0.data_return_format =
+	    BRW_SURFACERETURNFORMAT_FLOAT32;
+	if (intel->cpp == 2) {
+		dest_surf_state->ss0.surface_format =
+		    BRW_SURFACEFORMAT_B5G6R5_UNORM;
+	} else {
+		dest_surf_state->ss0.surface_format =
+		    BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
+	}
+	dest_surf_state->ss0.writedisable_alpha = 0;
+	dest_surf_state->ss0.writedisable_red = 0;
+	dest_surf_state->ss0.writedisable_green = 0;
+	dest_surf_state->ss0.writedisable_blue = 0;
+	dest_surf_state->ss0.color_blend = 1;
+	dest_surf_state->ss0.vert_line_stride = 0;
+	dest_surf_state->ss0.vert_line_stride_ofs = 0;
+	dest_surf_state->ss0.mipmap_layout_mode = 0;
+	dest_surf_state->ss0.render_cache_read_mode = 0;
 
-    if (pixmap_bo != NULL)
 	dest_surf_state->ss1.base_addr =
 	    intel_emit_reloc(surf_bo, offsetof(struct brw_surface_state, ss1),
-			     pixmap_bo, 0,
-			     I915_GEM_DOMAIN_SAMPLER, 0);
-    else
-	dest_surf_state->ss1.base_addr = intel_get_pixmap_offset(pixmap);
-
-    dest_surf_state->ss2.height = scrn->virtualY - 1;
-    dest_surf_state->ss2.width = scrn->virtualX - 1;
-    dest_surf_state->ss2.mip_count = 0;
-    dest_surf_state->ss2.render_target_rotation = 0;
-    dest_surf_state->ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1;
-    dest_surf_state->ss3.tiled_surface = i830_pixmap_tiled(pixmap);
-    dest_surf_state->ss3.tile_walk = 0; /* TileX */
+			     pixmap_bo, 0, I915_GEM_DOMAIN_SAMPLER, 0);
+
+	dest_surf_state->ss2.height = scrn->virtualY - 1;
+	dest_surf_state->ss2.width = scrn->virtualX - 1;
+	dest_surf_state->ss2.mip_count = 0;
+	dest_surf_state->ss2.render_target_rotation = 0;
+	dest_surf_state->ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1;
+	dest_surf_state->ss3.tiled_surface = i830_pixmap_tiled(pixmap);
+	dest_surf_state->ss3.tile_walk = 0;	/* TileX */
 
-    drm_intel_bo_unmap(surf_bo);
-    return surf_bo;
+	drm_intel_bo_unmap(surf_bo);
+	return surf_bo;
 }
 
-static drm_intel_bo *
-i965_create_src_surface_state(ScrnInfoPtr scrn,
-			      drm_intel_bo *src_bo,
-			      uint32_t src_offset,
-			      int src_width,
-			      int src_height,
-			      int src_pitch,
-			      uint32_t src_surf_format)
+static drm_intel_bo *i965_create_src_surface_state(ScrnInfoPtr scrn,
+						   drm_intel_bo * src_bo,
+						   uint32_t src_offset,
+						   int src_width,
+						   int src_height,
+						   int src_pitch,
+						   uint32_t src_surf_format)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *surface_bo;
-    struct brw_surface_state *src_surf_state;
-
-    if (intel_alloc_and_map(pI830, "textured video surface state", 4096,
-			    &surface_bo, &src_surf_state) != 0)
-	return NULL;
-
-    /* Set up the source surface state buffer */
-    src_surf_state->ss0.surface_type = BRW_SURFACE_2D;
-    src_surf_state->ss0.surface_format = src_surf_format;
-    src_surf_state->ss0.writedisable_alpha = 0;
-    src_surf_state->ss0.writedisable_red = 0;
-    src_surf_state->ss0.writedisable_green = 0;
-    src_surf_state->ss0.writedisable_blue = 0;
-    src_surf_state->ss0.color_blend = 1;
-    src_surf_state->ss0.vert_line_stride = 0;
-    src_surf_state->ss0.vert_line_stride_ofs = 0;
-    src_surf_state->ss0.mipmap_layout_mode = 0;
-    src_surf_state->ss0.render_cache_read_mode = 0;
-
-    src_surf_state->ss2.width = src_width - 1;
-    src_surf_state->ss2.height = src_height - 1;
-    src_surf_state->ss2.mip_count = 0;
-    src_surf_state->ss2.render_target_rotation = 0;
-    src_surf_state->ss3.pitch = src_pitch - 1;
-
-    if (src_bo) {
-        src_surf_state->ss1.base_addr =
-            intel_emit_reloc(surface_bo,
-                             offsetof(struct brw_surface_state, ss1),
-                             src_bo, src_offset,
-                             I915_GEM_DOMAIN_SAMPLER, 0);
-    } else {
-        src_surf_state->ss1.base_addr = src_offset;
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *surface_bo;
+	struct brw_surface_state *src_surf_state;
+
+	if (intel_alloc_and_map(intel, "textured video surface state", 4096,
+				&surface_bo, &src_surf_state) != 0)
+		return NULL;
+
+	/* Set up the source surface state buffer */
+	src_surf_state->ss0.surface_type = BRW_SURFACE_2D;
+	src_surf_state->ss0.surface_format = src_surf_format;
+	src_surf_state->ss0.writedisable_alpha = 0;
+	src_surf_state->ss0.writedisable_red = 0;
+	src_surf_state->ss0.writedisable_green = 0;
+	src_surf_state->ss0.writedisable_blue = 0;
+	src_surf_state->ss0.color_blend = 1;
+	src_surf_state->ss0.vert_line_stride = 0;
+	src_surf_state->ss0.vert_line_stride_ofs = 0;
+	src_surf_state->ss0.mipmap_layout_mode = 0;
+	src_surf_state->ss0.render_cache_read_mode = 0;
+
+	src_surf_state->ss2.width = src_width - 1;
+	src_surf_state->ss2.height = src_height - 1;
+	src_surf_state->ss2.mip_count = 0;
+	src_surf_state->ss2.render_target_rotation = 0;
+	src_surf_state->ss3.pitch = src_pitch - 1;
+
+	if (src_bo) {
+		src_surf_state->ss1.base_addr =
+		    intel_emit_reloc(surface_bo,
+				     offsetof(struct brw_surface_state, ss1),
+				     src_bo, src_offset,
+				     I915_GEM_DOMAIN_SAMPLER, 0);
+	} else {
+		src_surf_state->ss1.base_addr = src_offset;
+	}
 
-    drm_intel_bo_unmap(surface_bo);
-    return surface_bo;
+	drm_intel_bo_unmap(surface_bo);
+	return surface_bo;
 }
 
-static drm_intel_bo *
-i965_create_binding_table(ScrnInfoPtr scrn, drm_intel_bo **surf_bos, int n_surf)
+static drm_intel_bo *i965_create_binding_table(ScrnInfoPtr scrn,
+					       drm_intel_bo ** surf_bos,
+					       int n_surf)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *bind_bo;
-    uint32_t *binding_table;
-    int i;
-
-    /* Set up a binding table for our surfaces.  Only the PS will use it */
-
-    if (intel_alloc_and_map(pI830, "textured video binding table", 4096,
-			    &bind_bo, &binding_table) != 0)
-	return NULL;
-
-    for (i = 0; i < n_surf; i++)
-	binding_table[i] = intel_emit_reloc(bind_bo, i * sizeof(uint32_t),
-					    surf_bos[i], 0,
-					    I915_GEM_DOMAIN_INSTRUCTION, 0);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *bind_bo;
+	uint32_t *binding_table;
+	int i;
 
-    drm_intel_bo_unmap(bind_bo);
-    return bind_bo;
+	/* Set up a binding table for our surfaces.  Only the PS will use it */
+
+	if (intel_alloc_and_map(intel, "textured video binding table", 4096,
+				&bind_bo, &binding_table) != 0)
+		return NULL;
+
+	for (i = 0; i < n_surf; i++)
+		binding_table[i] =
+		    intel_emit_reloc(bind_bo, i * sizeof(uint32_t), surf_bos[i],
+				     0, I915_GEM_DOMAIN_INSTRUCTION, 0);
+
+	drm_intel_bo_unmap(bind_bo);
+	return bind_bo;
 }
 
-static drm_intel_bo *
-i965_create_sampler_state(ScrnInfoPtr scrn)
+static drm_intel_bo *i965_create_sampler_state(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *sampler_bo;
-    struct brw_sampler_state *sampler_state;
-
-    if (intel_alloc_and_map(pI830, "textured video sampler state", 4096,
-			    &sampler_bo, &sampler_state) != 0)
-	return NULL;
-
-    sampler_state->ss0.min_filter = BRW_MAPFILTER_LINEAR;
-    sampler_state->ss0.mag_filter = BRW_MAPFILTER_LINEAR;
-    sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
-    sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
-    sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *sampler_bo;
+	struct brw_sampler_state *sampler_state;
+
+	if (intel_alloc_and_map(intel, "textured video sampler state", 4096,
+				&sampler_bo, &sampler_state) != 0)
+		return NULL;
+
+	sampler_state->ss0.min_filter = BRW_MAPFILTER_LINEAR;
+	sampler_state->ss0.mag_filter = BRW_MAPFILTER_LINEAR;
+	sampler_state->ss1.r_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
+	sampler_state->ss1.s_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
+	sampler_state->ss1.t_wrap_mode = BRW_TEXCOORDMODE_CLAMP;
 
-    drm_intel_bo_unmap(sampler_bo);
-    return sampler_bo;
+	drm_intel_bo_unmap(sampler_bo);
+	return sampler_bo;
 }
 
-static drm_intel_bo *
-i965_create_vs_state(ScrnInfoPtr scrn)
+static drm_intel_bo *i965_create_vs_state(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *vs_bo;
-    struct brw_vs_unit_state *vs_state;
-
-    if (intel_alloc_and_map(pI830, "textured video vs state", 4096,
-			    &vs_bo, &vs_state) != 0)
-	return NULL;
-
-    /* Set up the vertex shader to be disabled (passthrough) */
-    vs_state->thread4.nr_urb_entries = URB_VS_ENTRIES;
-    vs_state->thread4.urb_entry_allocation_size = URB_VS_ENTRY_SIZE - 1;
-    vs_state->vs6.vs_enable = 0;
-    vs_state->vs6.vert_cache_disable = 1;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *vs_bo;
+	struct brw_vs_unit_state *vs_state;
+
+	if (intel_alloc_and_map(intel, "textured video vs state", 4096,
+				&vs_bo, &vs_state) != 0)
+		return NULL;
+
+	/* Set up the vertex shader to be disabled (passthrough) */
+	if (IS_IGDNG(intel))
+		vs_state->thread4.nr_urb_entries = URB_VS_ENTRIES >> 2;
+	else
+		vs_state->thread4.nr_urb_entries = URB_VS_ENTRIES;
+	vs_state->thread4.urb_entry_allocation_size = URB_VS_ENTRY_SIZE - 1;
+	vs_state->vs6.vs_enable = 0;
+	vs_state->vs6.vert_cache_disable = 1;
 
-    drm_intel_bo_unmap(vs_bo);
-    return vs_bo;
+	drm_intel_bo_unmap(vs_bo);
+	return vs_bo;
 }
 
-static drm_intel_bo *
-i965_create_program(ScrnInfoPtr scrn, const uint32_t *program,
-		    unsigned int program_size)
+static drm_intel_bo *i965_create_program(ScrnInfoPtr scrn,
+					 const uint32_t * program,
+					 unsigned int program_size)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *prog_bo;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *prog_bo;
 
-    prog_bo = drm_intel_bo_alloc(pI830->bufmgr, "textured video program",
-				 program_size, 4096);
-    if (!prog_bo)
-	return NULL;
+	prog_bo = drm_intel_bo_alloc(intel->bufmgr, "textured video program",
+				     program_size, 4096);
+	if (!prog_bo)
+		return NULL;
 
-    drm_intel_bo_subdata(prog_bo, 0, program_size, program);
+	drm_intel_bo_subdata(prog_bo, 0, program_size, program);
 
-    return prog_bo;
+	return prog_bo;
 }
 
-static drm_intel_bo *
-i965_create_sf_state(ScrnInfoPtr scrn)
+static drm_intel_bo *i965_create_sf_state(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *sf_bo, *kernel_bo;
-    struct brw_sf_unit_state *sf_state;
-
-    kernel_bo = i965_create_program(scrn, &sf_kernel_static[0][0],
-				    sizeof(sf_kernel_static));
-
-    if (!kernel_bo)
-	return NULL;
-
-    if (intel_alloc_and_map(pI830, "textured video sf state", 4096,
-			    &sf_bo, &sf_state) != 0)
-    {
-	drm_intel_bo_unreference(kernel_bo);
-	return NULL;
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *sf_bo, *kernel_bo;
+	struct brw_sf_unit_state *sf_state;
+
+	if (IS_IGDNG(intel))
+		kernel_bo =
+		    i965_create_program(scrn, &sf_kernel_static_gen5[0][0],
+					sizeof(sf_kernel_static_gen5));
+	else
+		kernel_bo = i965_create_program(scrn, &sf_kernel_static[0][0],
+						sizeof(sf_kernel_static));
+
+	if (!kernel_bo)
+		return NULL;
+
+	if (intel_alloc_and_map(intel, "textured video sf state", 4096,
+				&sf_bo, &sf_state) != 0) {
+		drm_intel_bo_unreference(kernel_bo);
+		return NULL;
+	}
 
-    /* Set up the SF kernel to do coord interp: for each attribute,
-     * calculate dA/dx and dA/dy.  Hand these interpolation coefficients
-     * back to SF which then hands pixels off to WM.
-     */
-    sf_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(SF_KERNEL_NUM_GRF);
-    sf_state->thread0.kernel_start_pointer =
-	intel_emit_reloc(sf_bo, offsetof(struct brw_sf_unit_state, thread0),
-			 kernel_bo, sf_state->thread0.grf_reg_count << 1,
-			 I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
-    sf_state->sf1.single_program_flow = 1; /* XXX */
-    sf_state->sf1.binding_table_entry_count = 0;
-    sf_state->sf1.thread_priority = 0;
-    sf_state->sf1.floating_point_mode = 0; /* Mesa does this */
-    sf_state->sf1.illegal_op_exception_enable = 1;
-    sf_state->sf1.mask_stack_exception_enable = 1;
-    sf_state->sf1.sw_exception_enable = 1;
-    sf_state->thread2.per_thread_scratch_space = 0;
-    /* scratch space is not used in our kernel */
-    sf_state->thread2.scratch_space_base_pointer = 0;
-    sf_state->thread3.const_urb_entry_read_length = 0; /* no const URBs */
-    sf_state->thread3.const_urb_entry_read_offset = 0; /* no const URBs */
-    sf_state->thread3.urb_entry_read_length = 1; /* 1 URB per vertex */
-    sf_state->thread3.urb_entry_read_offset = 0;
-    sf_state->thread3.dispatch_grf_start_reg = 3;
-    sf_state->thread4.max_threads = SF_MAX_THREADS - 1;
-    sf_state->thread4.urb_entry_allocation_size = URB_SF_ENTRY_SIZE - 1;
-    sf_state->thread4.nr_urb_entries = URB_SF_ENTRIES;
-    sf_state->thread4.stats_enable = 1;
-    sf_state->sf5.viewport_transform = FALSE; /* skip viewport */
-    sf_state->sf6.cull_mode = BRW_CULLMODE_NONE;
-    sf_state->sf6.scissor = 0;
-    sf_state->sf7.trifan_pv = 2;
-    sf_state->sf6.dest_org_vbias = 0x8;
-    sf_state->sf6.dest_org_hbias = 0x8;
+	/* Set up the SF kernel to do coord interp: for each attribute,
+	 * calculate dA/dx and dA/dy.  Hand these interpolation coefficients
+	 * back to SF which then hands pixels off to WM.
+	 */
+	sf_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(SF_KERNEL_NUM_GRF);
+	sf_state->thread0.kernel_start_pointer =
+	    intel_emit_reloc(sf_bo, offsetof(struct brw_sf_unit_state, thread0),
+			     kernel_bo, sf_state->thread0.grf_reg_count << 1,
+			     I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
+	sf_state->sf1.single_program_flow = 1;	/* XXX */
+	sf_state->sf1.binding_table_entry_count = 0;
+	sf_state->sf1.thread_priority = 0;
+	sf_state->sf1.floating_point_mode = 0;	/* Mesa does this */
+	sf_state->sf1.illegal_op_exception_enable = 1;
+	sf_state->sf1.mask_stack_exception_enable = 1;
+	sf_state->sf1.sw_exception_enable = 1;
+	sf_state->thread2.per_thread_scratch_space = 0;
+	/* scratch space is not used in our kernel */
+	sf_state->thread2.scratch_space_base_pointer = 0;
+	sf_state->thread3.const_urb_entry_read_length = 0;	/* no const URBs */
+	sf_state->thread3.const_urb_entry_read_offset = 0;	/* no const URBs */
+	sf_state->thread3.urb_entry_read_length = 1;	/* 1 URB per vertex */
+	sf_state->thread3.urb_entry_read_offset = 0;
+	sf_state->thread3.dispatch_grf_start_reg = 3;
+	sf_state->thread4.max_threads = SF_MAX_THREADS - 1;
+	sf_state->thread4.urb_entry_allocation_size = URB_SF_ENTRY_SIZE - 1;
+	sf_state->thread4.nr_urb_entries = URB_SF_ENTRIES;
+	sf_state->thread4.stats_enable = 1;
+	sf_state->sf5.viewport_transform = FALSE;	/* skip viewport */
+	sf_state->sf6.cull_mode = BRW_CULLMODE_NONE;
+	sf_state->sf6.scissor = 0;
+	sf_state->sf7.trifan_pv = 2;
+	sf_state->sf6.dest_org_vbias = 0x8;
+	sf_state->sf6.dest_org_hbias = 0x8;
 
-    drm_intel_bo_unmap(sf_bo);
-    return sf_bo;
+	drm_intel_bo_unmap(sf_bo);
+	return sf_bo;
 }
 
-static drm_intel_bo *
-i965_create_wm_state(ScrnInfoPtr scrn, drm_intel_bo *sampler_bo, Bool is_packed)
+static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
+					  drm_intel_bo * sampler_bo,
+					  Bool is_packed)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *wm_bo, *kernel_bo;
-    struct brw_wm_unit_state *wm_state;
-
-    if (is_packed) {
-	kernel_bo = i965_create_program(scrn, &ps_kernel_packed_static[0][0],
-					sizeof(ps_kernel_packed_static));
-    } else {
-	kernel_bo = i965_create_program(scrn, &ps_kernel_planar_static[0][0],
-					sizeof(ps_kernel_planar_static));
-    }
-    if (!kernel_bo)
-	return NULL;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *wm_bo, *kernel_bo;
+	struct brw_wm_unit_state *wm_state;
+
+	if (is_packed) {
+		if (IS_IGDNG(intel))
+			kernel_bo =
+			    i965_create_program(scrn,
+						&ps_kernel_packed_static_gen5[0]
+						[0],
+						sizeof
+						(ps_kernel_packed_static_gen5));
+		else
+			kernel_bo =
+			    i965_create_program(scrn,
+						&ps_kernel_packed_static[0][0],
+						sizeof
+						(ps_kernel_packed_static));
+	} else {
+		if (IS_IGDNG(intel))
+			kernel_bo =
+			    i965_create_program(scrn,
+						&ps_kernel_planar_static_gen5[0]
+						[0],
+						sizeof
+						(ps_kernel_planar_static_gen5));
+		else
+			kernel_bo =
+			    i965_create_program(scrn,
+						&ps_kernel_planar_static[0][0],
+						sizeof
+						(ps_kernel_planar_static));
+	}
+	if (!kernel_bo)
+		return NULL;
 
-    if (intel_alloc_and_map(pI830, "textured video wm state", sizeof (*wm_state),
-			    &wm_bo, &wm_state)) {
-	drm_intel_bo_unreference(kernel_bo);
-	return NULL;
-    }
+	if (intel_alloc_and_map
+	    (intel, "textured video wm state", sizeof(*wm_state), &wm_bo,
+	     &wm_state)) {
+		drm_intel_bo_unreference(kernel_bo);
+		return NULL;
+	}
+
+	wm_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(PS_KERNEL_NUM_GRF);
+	wm_state->thread0.kernel_start_pointer =
+	    intel_emit_reloc(wm_bo, offsetof(struct brw_wm_unit_state, thread0),
+			     kernel_bo, wm_state->thread0.grf_reg_count << 1,
+			     I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
+	wm_state->thread1.single_program_flow = 1;	/* XXX */
+	if (is_packed)
+		wm_state->thread1.binding_table_entry_count = 2;
+	else
+		wm_state->thread1.binding_table_entry_count = 7;
+
+	/* binding table entry count is only used for prefetching, and it has to
+	 * be set 0 for IGDNG
+	 */
+	if (IS_IGDNG(intel))
+		wm_state->thread1.binding_table_entry_count = 0;
 
-    wm_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(PS_KERNEL_NUM_GRF);
-    wm_state->thread0.kernel_start_pointer =
-	intel_emit_reloc(wm_bo, offsetof(struct brw_wm_unit_state, thread0),
-			 kernel_bo, wm_state->thread0.grf_reg_count << 1,
-			 I915_GEM_DOMAIN_INSTRUCTION, 0) >> 6;
-    wm_state->thread1.single_program_flow = 1; /* XXX */
-    if (is_packed)
-	wm_state->thread1.binding_table_entry_count = 2;
-    else
-	wm_state->thread1.binding_table_entry_count = 7;
-    /* Though we never use the scratch space in our WM kernel, it has to be
-     * set, and the minimum allocation is 1024 bytes.
-     */
-    wm_state->thread2.scratch_space_base_pointer = 0;
-    wm_state->thread2.per_thread_scratch_space = 0; /* 1024 bytes */
-    wm_state->thread3.dispatch_grf_start_reg = 3; /* XXX */
-    wm_state->thread3.const_urb_entry_read_length = 0;
-    wm_state->thread3.const_urb_entry_read_offset = 0;
-    wm_state->thread3.urb_entry_read_length = 1; /* XXX */
-    wm_state->thread3.urb_entry_read_offset = 0; /* XXX */
-    wm_state->wm4.stats_enable = 1;
-    wm_state->wm4.sampler_state_pointer =
-	intel_emit_reloc(wm_bo, offsetof(struct brw_wm_unit_state, wm4),
-			 sampler_bo, 0,
-			 I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
-    wm_state->wm4.sampler_count = 1; /* 1-4 samplers used */
-    wm_state->wm5.max_threads = PS_MAX_THREADS - 1;
-    wm_state->wm5.thread_dispatch_enable = 1;
-    wm_state->wm5.enable_16_pix = 1;
-    wm_state->wm5.enable_8_pix = 0;
-    wm_state->wm5.early_depth_test = 1;
+	/* Though we never use the scratch space in our WM kernel, it has to be
+	 * set, and the minimum allocation is 1024 bytes.
+	 */
+	wm_state->thread2.scratch_space_base_pointer = 0;
+	wm_state->thread2.per_thread_scratch_space = 0;	/* 1024 bytes */
+	wm_state->thread3.dispatch_grf_start_reg = 3;	/* XXX */
+	wm_state->thread3.const_urb_entry_read_length = 0;
+	wm_state->thread3.const_urb_entry_read_offset = 0;
+	wm_state->thread3.urb_entry_read_length = 1;	/* XXX */
+	wm_state->thread3.urb_entry_read_offset = 0;	/* XXX */
+	wm_state->wm4.stats_enable = 1;
+	wm_state->wm4.sampler_state_pointer =
+	    intel_emit_reloc(wm_bo, offsetof(struct brw_wm_unit_state, wm4),
+			     sampler_bo, 0,
+			     I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
+	if (IS_IGDNG(intel))
+		wm_state->wm4.sampler_count = 0;
+	else
+		wm_state->wm4.sampler_count = 1;	/* 1-4 samplers used */
+	wm_state->wm5.max_threads = PS_MAX_THREADS - 1;
+	wm_state->wm5.thread_dispatch_enable = 1;
+	wm_state->wm5.enable_16_pix = 1;
+	wm_state->wm5.enable_8_pix = 0;
+	wm_state->wm5.early_depth_test = 1;
 
-    drm_intel_bo_unreference(kernel_bo);
+	drm_intel_bo_unreference(kernel_bo);
 
-    drm_intel_bo_unmap(wm_bo);
-    return wm_bo;
+	drm_intel_bo_unmap(wm_bo);
+	return wm_bo;
 }
 
-static drm_intel_bo *
-i965_create_cc_vp_state(ScrnInfoPtr scrn)
+static drm_intel_bo *i965_create_cc_vp_state(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *cc_vp_bo;
-    struct brw_cc_viewport *cc_viewport;
-
-    if (intel_alloc_and_map(pI830, "textured video cc viewport", 4096,
-			    &cc_vp_bo, &cc_viewport) != 0)
-	return NULL;
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *cc_vp_bo;
+	struct brw_cc_viewport *cc_viewport;
+
+	if (intel_alloc_and_map(intel, "textured video cc viewport", 4096,
+				&cc_vp_bo, &cc_viewport) != 0)
+		return NULL;
 
-    cc_viewport->min_depth = -1.e35;
-    cc_viewport->max_depth = 1.e35;
+	cc_viewport->min_depth = -1.e35;
+	cc_viewport->max_depth = 1.e35;
 
-    drm_intel_bo_unmap(cc_vp_bo);
-    return cc_vp_bo;
+	drm_intel_bo_unmap(cc_vp_bo);
+	return cc_vp_bo;
 }
 
-static drm_intel_bo *
-i965_create_cc_state(ScrnInfoPtr scrn)
+static drm_intel_bo *i965_create_cc_state(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
-    drm_intel_bo *cc_bo, *cc_vp_bo;
-    struct brw_cc_unit_state *cc_state;
-
-    cc_vp_bo = i965_create_cc_vp_state(scrn);
-    if (!cc_vp_bo)
-	return NULL;
-
-    if (intel_alloc_and_map(pI830, "textured video cc state", sizeof(*cc_state),
-			    &cc_bo, &cc_state) != 0) {
-	drm_intel_bo_unreference(cc_vp_bo);
-	return NULL;
-    }
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	drm_intel_bo *cc_bo, *cc_vp_bo;
+	struct brw_cc_unit_state *cc_state;
+
+	cc_vp_bo = i965_create_cc_vp_state(scrn);
+	if (!cc_vp_bo)
+		return NULL;
+
+	if (intel_alloc_and_map
+	    (intel, "textured video cc state", sizeof(*cc_state), &cc_bo,
+	     &cc_state) != 0) {
+		drm_intel_bo_unreference(cc_vp_bo);
+		return NULL;
+	}
 
-    /* Color calculator state */
-    memset(cc_state, 0, sizeof(*cc_state));
-    cc_state->cc0.stencil_enable = 0;   /* disable stencil */
-    cc_state->cc2.depth_test = 0;       /* disable depth test */
-    cc_state->cc2.logicop_enable = 1;   /* enable logic op */
-    cc_state->cc3.ia_blend_enable = 1;  /* blend alpha just like colors */
-    cc_state->cc3.blend_enable = 0;     /* disable color blend */
-    cc_state->cc3.alpha_test = 0;       /* disable alpha test */
-    cc_state->cc4.cc_viewport_state_offset =
-	intel_emit_reloc(cc_bo, offsetof(struct brw_cc_unit_state, cc4),
-			 cc_vp_bo, 0,
-			 I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
-    cc_state->cc5.dither_enable = 0;    /* disable dither */
-    cc_state->cc5.logicop_func = 0xc;   /* WHITE */
-    cc_state->cc5.statistics_enable = 1;
-    cc_state->cc5.ia_blend_function = BRW_BLENDFUNCTION_ADD;
-    cc_state->cc5.ia_src_blend_factor = BRW_BLENDFACTOR_ONE;
-    cc_state->cc5.ia_dest_blend_factor = BRW_BLENDFACTOR_ONE;
+	/* Color calculator state */
+	memset(cc_state, 0, sizeof(*cc_state));
+	cc_state->cc0.stencil_enable = 0;	/* disable stencil */
+	cc_state->cc2.depth_test = 0;	/* disable depth test */
+	cc_state->cc2.logicop_enable = 1;	/* enable logic op */
+	cc_state->cc3.ia_blend_enable = 1;	/* blend alpha just like colors */
+	cc_state->cc3.blend_enable = 0;	/* disable color blend */
+	cc_state->cc3.alpha_test = 0;	/* disable alpha test */
+	cc_state->cc4.cc_viewport_state_offset =
+	    intel_emit_reloc(cc_bo, offsetof(struct brw_cc_unit_state, cc4),
+			     cc_vp_bo, 0, I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
+	cc_state->cc5.dither_enable = 0;	/* disable dither */
+	cc_state->cc5.logicop_func = 0xc;	/* WHITE */
+	cc_state->cc5.statistics_enable = 1;
+	cc_state->cc5.ia_blend_function = BRW_BLENDFUNCTION_ADD;
+	cc_state->cc5.ia_src_blend_factor = BRW_BLENDFACTOR_ONE;
+	cc_state->cc5.ia_dest_blend_factor = BRW_BLENDFACTOR_ONE;
 
-    drm_intel_bo_unmap(cc_bo);
+	drm_intel_bo_unmap(cc_bo);
 
-    drm_intel_bo_unreference(cc_vp_bo);
-    return cc_bo;
+	drm_intel_bo_unreference(cc_vp_bo);
+	return cc_bo;
 }
 
 static void
-i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo *bind_bo, int n_src_surf)
+i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * bind_bo, int n_src_surf)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    int urb_vs_start, urb_vs_size;
-    int urb_gs_start, urb_gs_size;
-    int urb_clip_start, urb_clip_size;
-    int urb_sf_start, urb_sf_size;
-    int urb_cs_start, urb_cs_size;
-
-    IntelEmitInvarientState(pScrn);
-    pI830->last_3d = LAST_3D_VIDEO;
-
-    urb_vs_start = 0;
-    urb_vs_size = URB_VS_ENTRIES * URB_VS_ENTRY_SIZE;
-    urb_gs_start = urb_vs_start + urb_vs_size;
-    urb_gs_size = URB_GS_ENTRIES * URB_GS_ENTRY_SIZE;
-    urb_clip_start = urb_gs_start + urb_gs_size;
-    urb_clip_size = URB_CLIP_ENTRIES * URB_CLIP_ENTRY_SIZE;
-    urb_sf_start = urb_clip_start + urb_clip_size;
-    urb_sf_size = URB_SF_ENTRIES * URB_SF_ENTRY_SIZE;
-    urb_cs_start = urb_sf_start + urb_sf_size;
-    urb_cs_size = URB_CS_ENTRIES * URB_CS_ENTRY_SIZE;
-
-    BEGIN_BATCH(2);
-    OUT_BATCH(MI_FLUSH |
-	      MI_STATE_INSTRUCTION_CACHE_FLUSH |
-	      BRW_MI_GLOBAL_SNAPSHOT_RESET);
-    OUT_BATCH(MI_NOOP);
-    ADVANCE_BATCH();
-
-    /* brw_debug (pScrn, "before base address modify"); */
-    BEGIN_BATCH(12);
-    /* Match Mesa driver setup */
-    if (IS_G4X(pI830))
-	OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
-    else
-	OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
-
-    /* Mesa does this. Who knows... */
-    OUT_BATCH(BRW_CS_URB_STATE | 0);
-    OUT_BATCH((0 << 4) |	/* URB Entry Allocation Size */
-	      (0 << 0));	/* Number of URB Entries */
-
-    /* Zero out the two base address registers so all offsets are
-     * absolute
-     */
-    OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4);
-    OUT_BATCH(0 | BASE_ADDRESS_MODIFY);  /* Generate state base address */
-    OUT_BATCH(0 | BASE_ADDRESS_MODIFY);  /* Surface state base address */
-    OUT_BATCH(0 | BASE_ADDRESS_MODIFY);  /* media base addr, don't care */
-    /* general state max addr, disabled */
-    OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
-    /* media object state max addr, disabled */
-    OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
-
-    /* Set system instruction pointer */
-    OUT_BATCH(BRW_STATE_SIP | 0);
-    /* system instruction pointer */
-    OUT_RELOC(pI830->video.gen4_sip_kernel_bo,
-	      I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-
-    OUT_BATCH(MI_NOOP);
-    ADVANCE_BATCH();
-
-    /* brw_debug (pScrn, "after base address modify"); */
-
-    BEGIN_BATCH(38);
-    /* Enable VF statistics */
-    OUT_BATCH(BRW_3DSTATE_VF_STATISTICS | 1);
-
-    /* Pipe control */
-    OUT_BATCH(BRW_PIPE_CONTROL |
-	      BRW_PIPE_CONTROL_NOWRITE |
-	      BRW_PIPE_CONTROL_IS_FLUSH |
-	      2);
-    OUT_BATCH(0);			/* Destination address */
-    OUT_BATCH(0);			/* Immediate data low DW */
-    OUT_BATCH(0);			/* Immediate data high DW */
-
-    /* Binding table pointers */
-    OUT_BATCH(BRW_3DSTATE_BINDING_TABLE_POINTERS | 4);
-    OUT_BATCH(0); /* vs */
-    OUT_BATCH(0); /* gs */
-    OUT_BATCH(0); /* clip */
-    OUT_BATCH(0); /* sf */
-    /* Only the PS uses the binding table */
-    OUT_RELOC(bind_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-
-    /* Blend constant color (magenta is fun) */
-    OUT_BATCH(BRW_3DSTATE_CONSTANT_COLOR | 3);
-    OUT_BATCH(float_to_uint (1.0));
-    OUT_BATCH(float_to_uint (0.0));
-    OUT_BATCH(float_to_uint (1.0));
-    OUT_BATCH(float_to_uint (1.0));
-
-    /* The drawing rectangle clipping is always on.  Set it to values that
-     * shouldn't do any clipping.
-     */
-    OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2); /* XXX 3 for BLC or CTG */
-    OUT_BATCH(0x00000000);			/* ymin, xmin */
-    OUT_BATCH((pScrn->virtualX - 1) |
-	      (pScrn->virtualY - 1) << 16);	/* ymax, xmax */
-    OUT_BATCH(0x00000000);			/* yorigin, xorigin */
-
-    /* skip the depth buffer */
-    /* skip the polygon stipple */
-    /* skip the polygon stipple offset */
-    /* skip the line stipple */
-
-    /* Set the pointers to the 3d pipeline state */
-    OUT_BATCH(BRW_3DSTATE_PIPELINED_POINTERS | 5);
-    OUT_RELOC(pI830->video.gen4_vs_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-    /* disable GS, resulting in passthrough */
-    OUT_BATCH(BRW_GS_DISABLE);
-    /* disable CLIP, resulting in passthrough */
-    OUT_BATCH(BRW_CLIP_DISABLE);
-    OUT_RELOC(pI830->video.gen4_sf_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-    if (n_src_surf == 1)
-	OUT_RELOC(pI830->video.gen4_wm_packed_bo,
-		  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-    else
-	OUT_RELOC(pI830->video.gen4_wm_planar_bo,
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	int urb_vs_start, urb_vs_size;
+	int urb_gs_start, urb_gs_size;
+	int urb_clip_start, urb_clip_size;
+	int urb_sf_start, urb_sf_size;
+	int urb_cs_start, urb_cs_size;
+	int pipe_ctl;
+
+	IntelEmitInvarientState(scrn);
+	intel->last_3d = LAST_3D_VIDEO;
+
+	urb_vs_start = 0;
+	urb_vs_size = URB_VS_ENTRIES * URB_VS_ENTRY_SIZE;
+	urb_gs_start = urb_vs_start + urb_vs_size;
+	urb_gs_size = URB_GS_ENTRIES * URB_GS_ENTRY_SIZE;
+	urb_clip_start = urb_gs_start + urb_gs_size;
+	urb_clip_size = URB_CLIP_ENTRIES * URB_CLIP_ENTRY_SIZE;
+	urb_sf_start = urb_clip_start + urb_clip_size;
+	urb_sf_size = URB_SF_ENTRIES * URB_SF_ENTRY_SIZE;
+	urb_cs_start = urb_sf_start + urb_sf_size;
+	urb_cs_size = URB_CS_ENTRIES * URB_CS_ENTRY_SIZE;
+
+	OUT_BATCH(MI_FLUSH |
+		  MI_STATE_INSTRUCTION_CACHE_FLUSH |
+		  BRW_MI_GLOBAL_SNAPSHOT_RESET);
+	OUT_BATCH(MI_NOOP);
+
+	/* brw_debug (scrn, "before base address modify"); */
+	/* Match Mesa driver setup */
+	if (IS_G4X(intel) || IS_IGDNG(intel))
+		OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
+	else
+		OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
+
+	/* Mesa does this. Who knows... */
+	OUT_BATCH(BRW_CS_URB_STATE | 0);
+	OUT_BATCH((0 << 4) |	/* URB Entry Allocation Size */
+		  (0 << 0));	/* Number of URB Entries */
+
+	/* Zero out the two base address registers so all offsets are
+	 * absolute
+	 */
+	if (IS_IGDNG(intel)) {
+		OUT_BATCH(BRW_STATE_BASE_ADDRESS | 6);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Generate state base address */
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Surface state base address */
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* media base addr, don't care */
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Instruction base address */
+		/* general state max addr, disabled */
+		OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+		/* media object state max addr, disabled */
+		OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+		/* Instruction max addr, disabled */
+		OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+	} else {
+		OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Generate state base address */
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* Surface state base address */
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);	/* media base addr, don't care */
+		/* general state max addr, disabled */
+		OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+		/* media object state max addr, disabled */
+		OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
+	}
+
+	/* Set system instruction pointer */
+	OUT_BATCH(BRW_STATE_SIP | 0);
+	/* system instruction pointer */
+	OUT_RELOC(intel->video.gen4_sip_kernel_bo,
 		  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-    OUT_RELOC(pI830->video.gen4_cc_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
 
-    /* URB fence */
-    OUT_BATCH(BRW_URB_FENCE |
-	      UF0_CS_REALLOC |
-	      UF0_SF_REALLOC |
-	      UF0_CLIP_REALLOC |
-	      UF0_GS_REALLOC |
-	      UF0_VS_REALLOC |
-	      1);
-    OUT_BATCH(((urb_clip_start + urb_clip_size) << UF1_CLIP_FENCE_SHIFT) |
-	      ((urb_gs_start + urb_gs_size) << UF1_GS_FENCE_SHIFT) |
-	      ((urb_vs_start + urb_vs_size) << UF1_VS_FENCE_SHIFT));
-    OUT_BATCH(((urb_cs_start + urb_cs_size) << UF2_CS_FENCE_SHIFT) |
-	      ((urb_sf_start + urb_sf_size) << UF2_SF_FENCE_SHIFT));
-
-    /* Constant buffer state */
-    OUT_BATCH(BRW_CS_URB_STATE | 0);
-    OUT_BATCH(((URB_CS_ENTRY_SIZE - 1) << 4) |
-	      (URB_CS_ENTRIES << 0));
-
-    /* Set up our vertex elements, sourced from the single vertex buffer. */
-    OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS | 3);
-    /* offset 0: X,Y -> {X, Y, 1.0, 1.0} */
-    OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
-	      VE0_VALID |
-	      (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
-	      (0 << VE0_OFFSET_SHIFT));
-    OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT) |
-	      (BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT) |
-	      (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_2_SHIFT) |
-	      (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) |
-	      (0 << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
-    /* offset 8: S0, T0 -> {S0, T0, 1.0, 1.0} */
-    OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
-	      VE0_VALID |
-	      (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
-	      (8 << VE0_OFFSET_SHIFT));
-    OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT) |
-	      (BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT) |
-	      (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_2_SHIFT) |
-	      (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) |
-	      (4 << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
+	/* brw_debug (scrn, "after base address modify"); */
 
-    OUT_BATCH(MI_NOOP);			/* pad to quadword */
-    ADVANCE_BATCH();
+	if (IS_IGDNG(intel))
+		pipe_ctl = BRW_PIPE_CONTROL_NOWRITE;
+	else
+		pipe_ctl = BRW_PIPE_CONTROL_NOWRITE | BRW_PIPE_CONTROL_IS_FLUSH;
+
+	/* Pipe control */
+	OUT_BATCH(BRW_PIPE_CONTROL | pipe_ctl | 2);
+	OUT_BATCH(0);		/* Destination address */
+	OUT_BATCH(0);		/* Immediate data low DW */
+	OUT_BATCH(0);		/* Immediate data high DW */
+
+	/* Binding table pointers */
+	OUT_BATCH(BRW_3DSTATE_BINDING_TABLE_POINTERS | 4);
+	OUT_BATCH(0);		/* vs */
+	OUT_BATCH(0);		/* gs */
+	OUT_BATCH(0);		/* clip */
+	OUT_BATCH(0);		/* sf */
+	/* Only the PS uses the binding table */
+	OUT_RELOC(bind_bo, I915_GEM_DOMAIN_SAMPLER, 0, 0);
+
+	/* Blend constant color (magenta is fun) */
+	OUT_BATCH(BRW_3DSTATE_CONSTANT_COLOR | 3);
+	OUT_BATCH(float_to_uint(1.0));
+	OUT_BATCH(float_to_uint(0.0));
+	OUT_BATCH(float_to_uint(1.0));
+	OUT_BATCH(float_to_uint(1.0));
+
+	/* The drawing rectangle clipping is always on.  Set it to values that
+	 * shouldn't do any clipping.
+	 */
+	OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2);	/* XXX 3 for BLC or CTG */
+	OUT_BATCH(0x00000000);	/* ymin, xmin */
+	OUT_BATCH((scrn->virtualX - 1) | (scrn->virtualY - 1) << 16);	/* ymax, xmax */
+	OUT_BATCH(0x00000000);	/* yorigin, xorigin */
+
+	/* skip the depth buffer */
+	/* skip the polygon stipple */
+	/* skip the polygon stipple offset */
+	/* skip the line stipple */
+
+	/* Set the pointers to the 3d pipeline state */
+	OUT_BATCH(BRW_3DSTATE_PIPELINED_POINTERS | 5);
+	OUT_RELOC(intel->video.gen4_vs_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	/* disable GS, resulting in passthrough */
+	OUT_BATCH(BRW_GS_DISABLE);
+	/* disable CLIP, resulting in passthrough */
+	OUT_BATCH(BRW_CLIP_DISABLE);
+	OUT_RELOC(intel->video.gen4_sf_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	if (n_src_surf == 1)
+		OUT_RELOC(intel->video.gen4_wm_packed_bo,
+			  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	else
+		OUT_RELOC(intel->video.gen4_wm_planar_bo,
+			  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	OUT_RELOC(intel->video.gen4_cc_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+
+	/* URB fence */
+	OUT_BATCH(BRW_URB_FENCE |
+		  UF0_CS_REALLOC |
+		  UF0_SF_REALLOC |
+		  UF0_CLIP_REALLOC | UF0_GS_REALLOC | UF0_VS_REALLOC | 1);
+	OUT_BATCH(((urb_clip_start + urb_clip_size) << UF1_CLIP_FENCE_SHIFT) |
+		  ((urb_gs_start + urb_gs_size) << UF1_GS_FENCE_SHIFT) |
+		  ((urb_vs_start + urb_vs_size) << UF1_VS_FENCE_SHIFT));
+	OUT_BATCH(((urb_cs_start + urb_cs_size) << UF2_CS_FENCE_SHIFT) |
+		  ((urb_sf_start + urb_sf_size) << UF2_SF_FENCE_SHIFT));
+
+	/* Constant buffer state */
+	OUT_BATCH(BRW_CS_URB_STATE | 0);
+	OUT_BATCH(((URB_CS_ENTRY_SIZE - 1) << 4) | (URB_CS_ENTRIES << 0));
+
+	/* Set up our vertex elements, sourced from the single vertex buffer. */
+
+	if (IS_IGDNG(intel)) {
+		OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS | 3);
+		/* offset 0: X,Y -> {X, Y, 1.0, 1.0} */
+		OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
+			  VE0_VALID |
+			  (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
+			  (0 << VE0_OFFSET_SHIFT));
+		OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT)
+			  | (BRW_VFCOMPONENT_STORE_SRC <<
+			     VE1_VFCOMPONENT_1_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_2_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_3_SHIFT));
+		/* offset 8: S0, T0 -> {S0, T0, 1.0, 1.0} */
+		OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
+			  VE0_VALID |
+			  (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
+			  (8 << VE0_OFFSET_SHIFT));
+		OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT)
+			  | (BRW_VFCOMPONENT_STORE_SRC <<
+			     VE1_VFCOMPONENT_1_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_2_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_3_SHIFT));
+	} else {
+		OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS | 3);
+		/* offset 0: X,Y -> {X, Y, 1.0, 1.0} */
+		OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
+			  VE0_VALID |
+			  (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
+			  (0 << VE0_OFFSET_SHIFT));
+		OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT)
+			  | (BRW_VFCOMPONENT_STORE_SRC <<
+			     VE1_VFCOMPONENT_1_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_2_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_3_SHIFT) | (0 <<
+						       VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
+		/* offset 8: S0, T0 -> {S0, T0, 1.0, 1.0} */
+		OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
+			  VE0_VALID |
+			  (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
+			  (8 << VE0_OFFSET_SHIFT));
+		OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT)
+			  | (BRW_VFCOMPONENT_STORE_SRC <<
+			     VE1_VFCOMPONENT_1_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_2_SHIFT) |
+			  (BRW_VFCOMPONENT_STORE_1_FLT <<
+			   VE1_VFCOMPONENT_3_SHIFT) | (4 <<
+						       VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
+	}
 }
 
 void
-I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
+I965DisplayVideoTextured(ScrnInfoPtr scrn,
+			 intel_adaptor_private *adaptor_priv, int id,
 			 RegionPtr dstRegion,
-			 short width, short height, int video_pitch,
-			 int x1, int y1, int x2, int y2,
+			 short width, short height,
+			 int video_pitch, int video_pitch2,
 			 short src_w, short src_h,
-			 short drw_w, short drw_h,
-			 PixmapPtr pPixmap)
+			 short drw_w, short drw_h, PixmapPtr pixmap)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
-    BoxPtr pbox;
-    int nbox, dxo, dyo, pix_xoff, pix_yoff;
-    float src_scale_x, src_scale_y;
-    int src_surf, i;
-    int n_src_surf;
-    uint32_t	src_surf_format;
-    uint32_t	src_surf_base[6];
-    int		src_width[6];
-    int		src_height[6];
-    int		src_pitch[6];
-    drm_intel_bo *bind_bo, *surf_bos[7];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
+	BoxPtr pbox;
+	int nbox, dxo, dyo, pix_xoff, pix_yoff;
+	float src_scale_x, src_scale_y;
+	int src_surf, i;
+	int n_src_surf;
+	uint32_t src_surf_format;
+	uint32_t src_surf_base[6];
+	int src_width[6];
+	int src_height[6];
+	int src_pitch[6];
+	drm_intel_bo *bind_bo, *surf_bos[7];
 
 #if 0
-    ErrorF("BroadwaterDisplayVideoTextured: %dx%d (pitch %d)\n", width, height,
-	   video_pitch);
+	ErrorF("BroadwaterDisplayVideoTextured: %dx%d (pitch %d)\n", width,
+	       height, video_pitch);
 #endif
 
 #if 0
-    /* enable debug */
-    OUTREG (INST_PM,
-	    (1 << (16 + 4)) |
-	    (1 << 4));
-    ErrorF ("INST_PM 0x%08x\n", INREG(INST_PM));
+	/* enable debug */
+	OUTREG(INST_PM, (1 << (16 + 4)) | (1 << 4));
+	ErrorF("INST_PM 0x%08x\n", INREG(INST_PM));
 #endif
 
-    src_surf_base[0] = pPriv->YBuf0offset;
-    src_surf_base[1] = pPriv->YBuf0offset;
-    src_surf_base[2] = pPriv->VBuf0offset;
-    src_surf_base[3] = pPriv->VBuf0offset;
-    src_surf_base[4] = pPriv->UBuf0offset;
-    src_surf_base[5] = pPriv->UBuf0offset;
+	src_surf_base[0] = adaptor_priv->YBufOffset;
+	src_surf_base[1] = adaptor_priv->YBufOffset;
+	src_surf_base[2] = adaptor_priv->VBufOffset;
+	src_surf_base[3] = adaptor_priv->VBufOffset;
+	src_surf_base[4] = adaptor_priv->UBufOffset;
+	src_surf_base[5] = adaptor_priv->UBufOffset;
 #if 0
-    ErrorF ("base 0 0x%x base 1 0x%x base 2 0x%x\n",
-	    src_surf_base[0], src_surf_base[1], src_surf_base[2]);
+	ErrorF("base 0 0x%x base 1 0x%x base 2 0x%x\n",
+	       src_surf_base[0], src_surf_base[1], src_surf_base[2]);
 #endif
-    
-    switch (id) {
-    case FOURCC_UYVY:
-	src_surf_format = BRW_SURFACEFORMAT_YCRCB_SWAPY;
-	n_src_surf = 1;
-	src_width[0] = width;
-	src_height[0] = height;
-	src_pitch[0] = video_pitch;
-	break;
-    case FOURCC_YUY2:
-	src_surf_format = BRW_SURFACEFORMAT_YCRCB_NORMAL;
-	src_width[0] = width;
-	src_height[0] = height;
-	src_pitch[0] = video_pitch;
-	n_src_surf = 1;
-	break;
-#ifdef INTEL_XVMC
-    case FOURCC_XVMC:
-#endif
-    case FOURCC_I420:
-    case FOURCC_YV12:
-	src_surf_format = BRW_SURFACEFORMAT_R8_UNORM;
-	src_width[1] = src_width[0] = width;
-	src_height[1] = src_height[0] = height;
-	src_pitch[1] = src_pitch[0] = video_pitch * 2;
-	src_width[4] = src_width[5] = src_width[2] = src_width[3] = width / 2;
-	src_height[4] = src_height[5] = src_height[2] = src_height[3] = height / 2;
-	src_pitch[4] = src_pitch[5] = src_pitch[2] = src_pitch[3] = video_pitch;
-	n_src_surf = 6;
-	break;
-    default:
-	return;
-    }    
+
+	if (is_planar_fourcc(id)) {
+		src_surf_format = BRW_SURFACEFORMAT_R8_UNORM;
+		src_width[1] = src_width[0] = width;
+		src_height[1] = src_height[0] = height;
+		src_pitch[1] = src_pitch[0] = video_pitch2;
+		src_width[4] = src_width[5] = src_width[2] = src_width[3] =
+		    width / 2;
+		src_height[4] = src_height[5] = src_height[2] = src_height[3] =
+		    height / 2;
+		src_pitch[4] = src_pitch[5] = src_pitch[2] = src_pitch[3] =
+		    video_pitch;
+		n_src_surf = 6;
+	} else {
+		if (id == FOURCC_UYVY)
+			src_surf_format = BRW_SURFACEFORMAT_YCRCB_SWAPY;
+		else
+			src_surf_format = BRW_SURFACEFORMAT_YCRCB_NORMAL;
+
+		src_width[0] = width;
+		src_height[0] = height;
+		src_pitch[0] = video_pitch;
+		n_src_surf = 1;
+	}
 
 #if 0
-    ErrorF("dst surf:      0x%08x\n", state_base_offset + dest_surf_offset);
-    ErrorF("src surf:      0x%08x\n", state_base_offset + src_surf_offset);
+	ErrorF("dst surf:      0x%08x\n", state_base_offset + dest_surf_offset);
+	ErrorF("src surf:      0x%08x\n", state_base_offset + src_surf_offset);
 #endif
 
-    /* We'll be poking the state buffers that could be in use by the 3d
-     * hardware here, but we should have synced the 3D engine already in
-     * I830PutImage.
-     */
-
-    /* Upload kernels */
-    surf_bos[0] = i965_create_dst_surface_state(pScrn, pPixmap);
-    if (!surf_bos[0])
-	return;
-
-    for (src_surf = 0; src_surf < n_src_surf; src_surf++) {
-	drm_intel_bo *surf_bo =
-	    i965_create_src_surface_state(pScrn,
-					  pPriv->buf,
-					  src_surf_base[src_surf],
-					  src_width[src_surf],
-					  src_height[src_surf],
-					  src_pitch[src_surf],
-					  src_surf_format);
-	if (!surf_bo) {
-	    int	q;
-	    for(q = 0; q < src_surf + 1; q++)
-		drm_intel_bo_unreference(surf_bos[q]);
-	    return;
-	}
-	surf_bos[src_surf + 1] = surf_bo;
-    }
-    bind_bo = i965_create_binding_table(pScrn, surf_bos, n_src_surf + 1);
-    for (i = 0; i < n_src_surf + 1; i++) {
-	drm_intel_bo_unreference(surf_bos[i]);
-	surf_bos[i] = NULL;
-    }
-    if (!bind_bo)
-	return;
-
-    if (pI830->video.gen4_sampler_bo == NULL)
-	pI830->video.gen4_sampler_bo = i965_create_sampler_state(pScrn);
-    if (pI830->video.gen4_sip_kernel_bo == NULL) {
-	pI830->video.gen4_sip_kernel_bo =
-	    i965_create_program(pScrn, &sip_kernel_static[0][0],
-				sizeof(sip_kernel_static));
-	if (!pI830->video.gen4_sip_kernel_bo) {
-	    drm_intel_bo_unreference(bind_bo);
-	    return;
-	}
-    }
-
-    if (pI830->video.gen4_vs_bo == NULL) {
-	pI830->video.gen4_vs_bo = i965_create_vs_state(pScrn);
-	if (!pI830->video.gen4_vs_bo) {
-	    drm_intel_bo_unreference(bind_bo);
-	    return;
-	}
-    }
-    if (pI830->video.gen4_sf_bo == NULL) {
-	pI830->video.gen4_sf_bo = i965_create_sf_state(pScrn);
-	if (!pI830->video.gen4_sf_bo) {
-	    drm_intel_bo_unreference(bind_bo);
-	    return;
-	}
-    }
-    if (pI830->video.gen4_wm_packed_bo == NULL) {
-	pI830->video.gen4_wm_packed_bo =
-	    i965_create_wm_state(pScrn, pI830->video.gen4_sampler_bo, TRUE);
-	if (!pI830->video.gen4_wm_packed_bo) {
-	    drm_intel_bo_unreference(bind_bo);
-	    return;
-	}
-    }
-
-    if (pI830->video.gen4_wm_planar_bo == NULL) {
-	pI830->video.gen4_wm_planar_bo =
-	    i965_create_wm_state(pScrn, pI830->video.gen4_sampler_bo, FALSE);
-	if (!pI830->video.gen4_wm_planar_bo) {
-	    drm_intel_bo_unreference(bind_bo);
-	    return;
-	}
-    }
-
-    if (pI830->video.gen4_cc_bo == NULL) {
-	pI830->video.gen4_cc_bo = i965_create_cc_state(pScrn);
-	if (!pI830->video.gen4_cc_bo) {
-	    drm_intel_bo_unreference(bind_bo);
-	    return;
-	}
-    }
-
-   /* Set up the offset for translating from the given region (in screen
-    * coordinates) to the backing pixmap.
-    */
-#ifdef COMPOSITE
-    pix_xoff = -pPixmap->screen_x + pPixmap->drawable.x;
-    pix_yoff = -pPixmap->screen_y + pPixmap->drawable.y;
-#else
-    pix_xoff = 0;
-    pix_yoff = 0;
-#endif
+	/* We'll be poking the state buffers that could be in use by the 3d
+	 * hardware here, but we should have synced the 3D engine already in
+	 * I830PutImage.
+	 */
 
-    dxo = dstRegion->extents.x1;
-    dyo = dstRegion->extents.y1;
+	/* Upload kernels */
+	surf_bos[0] = i965_create_dst_surface_state(scrn, pixmap);
+	if (!surf_bos[0])
+		return;
+
+	for (src_surf = 0; src_surf < n_src_surf; src_surf++) {
+		drm_intel_bo *surf_bo =
+			i965_create_src_surface_state(scrn,
+						      adaptor_priv->buf,
+						      src_surf_base[src_surf],
+						      src_width[src_surf],
+						      src_height[src_surf],
+						      src_pitch[src_surf],
+						      src_surf_format);
+		if (!surf_bo) {
+			int q;
+			for (q = 0; q < src_surf + 1; q++)
+				drm_intel_bo_unreference(surf_bos[q]);
+			return;
+		}
+		surf_bos[src_surf + 1] = surf_bo;
+	}
+	bind_bo = i965_create_binding_table(scrn, surf_bos, n_src_surf + 1);
+	for (i = 0; i < n_src_surf + 1; i++) {
+		drm_intel_bo_unreference(surf_bos[i]);
+		surf_bos[i] = NULL;
+	}
+	if (!bind_bo)
+		return;
 
-    /* Use normalized texture coordinates */
-    src_scale_x = ((float)src_w / width) / (float)drw_w;
-    src_scale_y = ((float)src_h / height) / (float)drw_h;
-
-    pbox = REGION_RECTS(dstRegion);
-    nbox = REGION_NUM_RECTS(dstRegion);
-    while (nbox--) {
-	int box_x1 = pbox->x1;
-	int box_y1 = pbox->y1;
-	int box_x2 = pbox->x2;
-	int box_y2 = pbox->y2;
-	int i;
-	drm_intel_bo *vb_bo;
-	float *vb;
-	drm_intel_bo *bo_table[] = {
-	    NULL, /* vb_bo */
-	    pI830->batch_bo,
-	    bind_bo,
-	    pI830->video.gen4_sampler_bo,
-	    pI830->video.gen4_sip_kernel_bo,
-	    pI830->video.gen4_vs_bo,
-	    pI830->video.gen4_sf_bo,
-	    pI830->video.gen4_wm_packed_bo,
-	    pI830->video.gen4_wm_planar_bo,
-	    pI830->video.gen4_cc_bo,
-	};
-
-	pbox++;
-
-	if (intel_alloc_and_map(pI830, "textured video vb", 4096,
-				&vb_bo, &vb) != 0)
-	    break;
-	bo_table[0] = vb_bo;
-
-	i = 0;
-	vb[i++] = (box_x2 - dxo) * src_scale_x;
-	vb[i++] = (box_y2 - dyo) * src_scale_y;
-	vb[i++] = (float) box_x2 + pix_xoff;
-	vb[i++] = (float) box_y2 + pix_yoff;
-
-	vb[i++] = (box_x1 - dxo) * src_scale_x;
-	vb[i++] = (box_y2 - dyo) * src_scale_y;
-	vb[i++] = (float) box_x1 + pix_xoff;
-	vb[i++] = (float) box_y2 + pix_yoff;
-
-	vb[i++] = (box_x1 - dxo) * src_scale_x;
-	vb[i++] = (box_y1 - dyo) * src_scale_y;
-	vb[i++] = (float) box_x1 + pix_xoff;
-	vb[i++] = (float) box_y1 + pix_yoff;
+	if (intel->video.gen4_sampler_bo == NULL)
+		intel->video.gen4_sampler_bo = i965_create_sampler_state(scrn);
+	if (intel->video.gen4_sip_kernel_bo == NULL) {
+		intel->video.gen4_sip_kernel_bo =
+		    i965_create_program(scrn, &sip_kernel_static[0][0],
+					sizeof(sip_kernel_static));
+		if (!intel->video.gen4_sip_kernel_bo) {
+			drm_intel_bo_unreference(bind_bo);
+			return;
+		}
+	}
 
-	drm_intel_bo_unmap(vb_bo);
+	if (intel->video.gen4_vs_bo == NULL) {
+		intel->video.gen4_vs_bo = i965_create_vs_state(scrn);
+		if (!intel->video.gen4_vs_bo) {
+			drm_intel_bo_unreference(bind_bo);
+			return;
+		}
+	}
+	if (intel->video.gen4_sf_bo == NULL) {
+		intel->video.gen4_sf_bo = i965_create_sf_state(scrn);
+		if (!intel->video.gen4_sf_bo) {
+			drm_intel_bo_unreference(bind_bo);
+			return;
+		}
+	}
+	if (intel->video.gen4_wm_packed_bo == NULL) {
+		intel->video.gen4_wm_packed_bo =
+		    i965_create_wm_state(scrn, intel->video.gen4_sampler_bo,
+					 TRUE);
+		if (!intel->video.gen4_wm_packed_bo) {
+			drm_intel_bo_unreference(bind_bo);
+			return;
+		}
+	}
 
-	i965_pre_draw_debug(pScrn);
+	if (intel->video.gen4_wm_planar_bo == NULL) {
+		intel->video.gen4_wm_planar_bo =
+		    i965_create_wm_state(scrn, intel->video.gen4_sampler_bo,
+					 FALSE);
+		if (!intel->video.gen4_wm_planar_bo) {
+			drm_intel_bo_unreference(bind_bo);
+			return;
+		}
+	}
 
-	/* If this command won't fit in the current batch, flush.
-	 * Assume that it does after being flushed.
+	if (intel->video.gen4_cc_bo == NULL) {
+		intel->video.gen4_cc_bo = i965_create_cc_state(scrn);
+		if (!intel->video.gen4_cc_bo) {
+			drm_intel_bo_unreference(bind_bo);
+			return;
+		}
+	}
+
+	/* Set up the offset for translating from the given region (in screen
+	 * coordinates) to the backing pixmap.
 	 */
-	if (drm_intel_bufmgr_check_aperture_space(bo_table,
-						  ARRAY_SIZE(bo_table)) < 0) {
-	    intel_batch_flush(pScrn, FALSE);
-	}
-
-	intel_batch_start_atomic(pScrn, 100);
-
-	i965_emit_video_setup(pScrn, bind_bo, n_src_surf);
-
-	BEGIN_BATCH(12);
-	/* Set up the pointer to our vertex buffer */
-	OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 3);
-	/* four 32-bit floats per vertex */
-	OUT_BATCH((0 << VB0_BUFFER_INDEX_SHIFT) |
-		  VB0_VERTEXDATA |
-		  ((4 * 4) << VB0_BUFFER_PITCH_SHIFT));
-	OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0, 0);
-	OUT_BATCH(3); /* four corners to our rectangle */
-	OUT_BATCH(0); /* reserved */
-
-	OUT_BATCH(BRW_3DPRIMITIVE |
-		  BRW_3DPRIMITIVE_VERTEX_SEQUENTIAL |
-		  (_3DPRIM_RECTLIST << BRW_3DPRIMITIVE_TOPOLOGY_SHIFT) |
-		  (0 << 9) |  /* CTG - indirect vertex count */
-		  4);
-	OUT_BATCH(3); /* vertex count per instance */
-	OUT_BATCH(0); /* start vertex offset */
-	OUT_BATCH(1); /* single instance */
-	OUT_BATCH(0); /* start instance location */
-	OUT_BATCH(0); /* index buffer offset, ignored */
-	OUT_BATCH(MI_NOOP);
-	ADVANCE_BATCH();
+#ifdef COMPOSITE
+	pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
+	pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
+#else
+	pix_xoff = 0;
+	pix_yoff = 0;
+#endif
 
-	intel_batch_end_atomic(pScrn);
+	dxo = dstRegion->extents.x1;
+	dyo = dstRegion->extents.y1;
 
-	drm_intel_bo_unreference(vb_bo);
+	/* Use normalized texture coordinates */
+	src_scale_x = ((float)src_w / width) / (float)drw_w;
+	src_scale_y = ((float)src_h / height) / (float)drw_h;
+
+	pbox = REGION_RECTS(dstRegion);
+	nbox = REGION_NUM_RECTS(dstRegion);
+	while (nbox--) {
+		int box_x1 = pbox->x1;
+		int box_y1 = pbox->y1;
+		int box_x2 = pbox->x2;
+		int box_y2 = pbox->y2;
+		int i;
+		drm_intel_bo *vb_bo;
+		float *vb;
+		drm_intel_bo *bo_table[] = {
+			NULL,	/* vb_bo */
+			intel->batch_bo,
+			bind_bo,
+			intel->video.gen4_sampler_bo,
+			intel->video.gen4_sip_kernel_bo,
+			intel->video.gen4_vs_bo,
+			intel->video.gen4_sf_bo,
+			intel->video.gen4_wm_packed_bo,
+			intel->video.gen4_wm_planar_bo,
+			intel->video.gen4_cc_bo,
+		};
+
+		pbox++;
+
+		if (intel_alloc_and_map(intel, "textured video vb", 4096,
+					&vb_bo, &vb) != 0)
+			break;
+		bo_table[0] = vb_bo;
+
+		i = 0;
+		vb[i++] = (box_x2 - dxo) * src_scale_x;
+		vb[i++] = (box_y2 - dyo) * src_scale_y;
+		vb[i++] = (float)box_x2 + pix_xoff;
+		vb[i++] = (float)box_y2 + pix_yoff;
+
+		vb[i++] = (box_x1 - dxo) * src_scale_x;
+		vb[i++] = (box_y2 - dyo) * src_scale_y;
+		vb[i++] = (float)box_x1 + pix_xoff;
+		vb[i++] = (float)box_y2 + pix_yoff;
+
+		vb[i++] = (box_x1 - dxo) * src_scale_x;
+		vb[i++] = (box_y1 - dyo) * src_scale_y;
+		vb[i++] = (float)box_x1 + pix_xoff;
+		vb[i++] = (float)box_y1 + pix_yoff;
+
+		drm_intel_bo_unmap(vb_bo);
+
+		if (!IS_IGDNG(intel))
+			i965_pre_draw_debug(scrn);
+
+		/* If this command won't fit in the current batch, flush.
+		 * Assume that it does after being flushed.
+		 */
+		if (drm_intel_bufmgr_check_aperture_space(bo_table,
+							  ARRAY_SIZE(bo_table))
+		    < 0) {
+			intel_batch_submit(scrn, FALSE);
+		}
+
+		intel_batch_start_atomic(scrn, 100);
+
+		i965_emit_video_setup(scrn, bind_bo, n_src_surf);
+
+		/* Set up the pointer to our vertex buffer */
+		OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 3);
+		/* four 32-bit floats per vertex */
+		OUT_BATCH((0 << VB0_BUFFER_INDEX_SHIFT) |
+			  VB0_VERTEXDATA | ((4 * 4) << VB0_BUFFER_PITCH_SHIFT));
+		OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0, 0);
+		if (IS_IGDNG(intel))
+			OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0,
+				  i * 4);
+		else
+			OUT_BATCH(3);	/* four corners to our rectangle */
+		OUT_BATCH(0);	/* reserved */
+
+		OUT_BATCH(BRW_3DPRIMITIVE | BRW_3DPRIMITIVE_VERTEX_SEQUENTIAL | (_3DPRIM_RECTLIST << BRW_3DPRIMITIVE_TOPOLOGY_SHIFT) | (0 << 9) |	/* CTG - indirect vertex count */
+			  4);
+		OUT_BATCH(3);	/* vertex count per instance */
+		OUT_BATCH(0);	/* start vertex offset */
+		OUT_BATCH(1);	/* single instance */
+		OUT_BATCH(0);	/* start instance location */
+		OUT_BATCH(0);	/* index buffer offset, ignored */
+		OUT_BATCH(MI_NOOP);
 
-	i965_post_draw_debug(pScrn);
-    }
+		intel_batch_end_atomic(scrn);
 
-    i830MarkSync(pScrn);
+		drm_intel_bo_unreference(vb_bo);
 
-    /* release reference once we're finished */
-    drm_intel_bo_unreference(bind_bo);
+		if (!IS_IGDNG(intel))
+			i965_post_draw_debug(scrn);
+
+	}
+
+	/* release reference once we're finished */
+	drm_intel_bo_unreference(bind_bo);
 
 #if WATCH_STATS
-    i830_dump_error_state(pScrn);
+	/* i830_dump_error_state(scrn); */
 #endif
+
+	i830_debug_flush(scrn);
 }
 
-void
-i965_free_video(ScrnInfoPtr scrn)
+void i965_free_video(ScrnInfoPtr scrn)
 {
-    I830Ptr pI830 = I830PTR(scrn);
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-    drm_intel_bo_unreference(pI830->video.gen4_vs_bo);
-    pI830->video.gen4_vs_bo = NULL;
-    drm_intel_bo_unreference(pI830->video.gen4_sf_bo);
-    pI830->video.gen4_sf_bo = NULL;
-    drm_intel_bo_unreference(pI830->video.gen4_cc_bo);
-    pI830->video.gen4_cc_bo = NULL;
-    drm_intel_bo_unreference(pI830->video.gen4_wm_packed_bo);
-    pI830->video.gen4_wm_packed_bo = NULL;
-    drm_intel_bo_unreference(pI830->video.gen4_wm_planar_bo);
-    pI830->video.gen4_wm_planar_bo = NULL;
-    drm_intel_bo_unreference(pI830->video.gen4_cc_vp_bo);
-    pI830->video.gen4_cc_vp_bo = NULL;
-    drm_intel_bo_unreference(pI830->video.gen4_sampler_bo);
-    pI830->video.gen4_sampler_bo = NULL;
-    drm_intel_bo_unreference(pI830->video.gen4_sip_kernel_bo);
-    pI830->video.gen4_sip_kernel_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_vs_bo);
+	intel->video.gen4_vs_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_sf_bo);
+	intel->video.gen4_sf_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_cc_bo);
+	intel->video.gen4_cc_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_wm_packed_bo);
+	intel->video.gen4_wm_packed_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_wm_planar_bo);
+	intel->video.gen4_wm_planar_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_cc_vp_bo);
+	intel->video.gen4_cc_vp_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_sampler_bo);
+	intel->video.gen4_sampler_bo = NULL;
+	drm_intel_bo_unreference(intel->video.gen4_sip_kernel_bo);
+	intel->video.gen4_sip_kernel_bo = NULL;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ivch/ivch.c new/xsrc/external/mit/xf86-video-intel/dist/src/ivch/ivch.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ivch/ivch.c	2010-11-23 09:53:04.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ivch/ivch.c	2011-02-08 11:14:00.000000000 +0100
@@ -35,8 +35,13 @@
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 #include <unistd.h>
 
 #include "../i2c_vid.h"
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.am	2008-08-02 07:12:49.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 ivch_la_LTLIBRARIES = ivch.la
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.in	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/ivch/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +39,10 @@ host_triplet = @host@
 subdir = src/ivch
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,18 +57,17 @@ LTLIBRARIES = $(ivch_la_LTLIBRARIES)
 ivch_la_LIBADD =
 am_ivch_la_OBJECTS = ivch.lo ivch_module.lo
 ivch_la_OBJECTS = $(am_ivch_la_OBJECTS)
-ivch_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ivch_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(ivch_la_SOURCES)
 DIST_SOURCES = $(ivch_la_SOURCES)
 ETAGS = etags
@@ -74,7 +76,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -82,41 +87,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -124,12 +146,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -137,13 +158,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -157,26 +173,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -188,13 +205,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -208,7 +223,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -219,19 +233,15 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 ivch_la_LTLIBRARIES = ivch.la
@@ -250,8 +260,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -277,21 +287,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-ivch_laLTLIBRARIES: $(ivch_la_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(ivch_ladir)" || $(MKDIR_P) "$(DESTDIR)$(ivch_ladir)"
+	test -z "$(ivch_ladir)" || $(mkdir_p) "$(DESTDIR)$(ivch_ladir)"
 	@list='$(ivch_la_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ivch_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ivch_ladir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ivch_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ivch_ladir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(ivch_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(ivch_ladir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(ivch_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(ivch_ladir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-ivch_laLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(ivch_la_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(ivch_la_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(ivch_ladir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(ivch_ladir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(ivch_ladir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(ivch_ladir)/$$p"; \
 	done
 
 clean-ivch_laLTLIBRARIES:
@@ -303,7 +313,7 @@ clean-ivch_laLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 ivch.la: $(ivch_la_OBJECTS) $(ivch_la_DEPENDENCIES) 
-	$(ivch_la_LINK) -rpath $(ivch_ladir) $(ivch_la_OBJECTS) $(ivch_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(ivch_ladir) $(ivch_la_LDFLAGS) $(ivch_la_OBJECTS) $(ivch_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -315,22 +325,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ivch_module.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -341,13 +351,17 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -359,8 +373,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -370,12 +384,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -389,21 +404,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -419,7 +435,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(ivch_ladir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -454,7 +470,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -468,20 +484,12 @@ info-am:
 
 install-data-am: install-ivch_laLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -502,23 +510,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-ivch_laLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-ivch_laLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-ivch_laLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-ivch_laLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am \
+	install-ivch_laLTLIBRARIES install-man install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-ivch_laLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-ivch_laLTLIBRARIES
 
 # 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.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.am	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -18,11 +18,7 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-if LIBPCIACCESS
-REGDUMPER = reg_dumper
-endif
-
-SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
+SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 reg_dumper render_program
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
@@ -30,34 +26,14 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa \
-	@XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DI830_USE_UXA
+AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
+	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
 intel_drv_ladir = @moduledir@/drivers
 intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
-if XSERVER_LIBPCIACCESS
 intel_drv_la_LIBADD += @PCIACCESS_LIBS@
-endif
-
-XMODE_SRCS=\
-	 local_xf86Rename.h \
-	 parser/xf86Parser.h \
-	 parser/xf86Optrec.h \
-	 modes/xf86Modes.h \
-	 modes/xf86Modes.c \
-	 modes/xf86cvt.c \
-	 modes/xf86Crtc.h \
-	 modes/xf86Crtc.c \
-	 modes/xf86Cursors.c \
-	 modes/xf86EdidModes.c \
-	 modes/xf86RandR12.c \
-	 modes/xf86RandR12.h \
-	 modes/xf86Rename.h \
-	 modes/xf86Rotate.c \
-	 modes/xf86DiDGA.c
 
 INTEL_DRI_SRCS = \
          i810_dri.c \
@@ -69,9 +45,7 @@ INTEL_DRI_SRCS = \
 INTEL_XVMC_SRCS = \
 	 i830_hwmc.h \
 	 i830_hwmc.c \
-         i915_hwmc.c \
          i915_hwmc.h \
-         i965_hwmc.c \
          i965_hwmc.h
 
 
@@ -101,8 +75,6 @@ intel_drv_la_SOURCES = \
          i830_common.h \
 	 i830_crt.c \
          i830_cursor.c \
-	 i830_debug.c \
-	 i830_debug.h \
 	 i830_display.c \
 	 i830_display.h \
          i830_quirks.c \
@@ -128,87 +100,17 @@ intel_drv_la_SOURCES = \
 	 i915_reg.h \
 	 i915_video.c \
 	 i965_video.c \
-	 i830_exa.c \
-	 i830_xaa.c \
+	 i830_uxa.c \
 	 i830_render.c \
 	 i915_render.c \
 	 i965_render.c \
 	 drmmode_display.c
 
-INTEL_G4A =				\
-	packed_yuv_sf.g4a		\
-	packed_yuv_wm.g4a		\
-	exa_sf.g4a 			\
-	exa_sf_mask.g4a 		\
-	exa_wm_src_affine.g4a 		\
-	exa_wm_src_projective.g4a 	\
-	exa_wm_src_sample_argb.g4a 	\
-	exa_wm_src_sample_a.g4a 	\
-	exa_wm_src_sample_planar.g4a 	\
-	exa_wm_mask_affine.g4a 		\
-	exa_wm_mask_projective.g4a 	\
-	exa_wm_mask_sample_argb.g4a 	\
-	exa_wm_mask_sample_a.g4a 	\
-	exa_wm_noca.g4a			\
-	exa_wm_ca.g4a			\
-	exa_wm_ca_srcalpha.g4a		\
-	exa_wm_write.g4a 		\
-	exa_wm_yuv_rgb.g4a		\
-	exa_wm_xy.g4a
-
-INTEL_G4I =				\
-	exa_wm.g4i			\
-	exa_wm_affine.g4i		\
-	exa_wm_projective.g4i
-
-INTEL_G4B = 				\
-	packed_yuv_sf.g4b		\
-	packed_yuv_wm.g4b		\
-	exa_sf.g4b 			\
-	exa_sf_mask.g4b 		\
-	exa_wm_src_affine.g4b 		\
-	exa_wm_src_projective.g4b 	\
-	exa_wm_src_sample_argb.g4b 	\
-	exa_wm_src_sample_a.g4b 	\
-	exa_wm_src_sample_planar.g4b 	\
-	exa_wm_mask_affine.g4b 		\
-	exa_wm_mask_projective.g4b 	\
-	exa_wm_mask_sample_argb.g4b 	\
-	exa_wm_mask_sample_a.g4b 	\
-	exa_wm_noca.g4b			\
-	exa_wm_ca.g4b			\
-	exa_wm_ca_srcalpha.g4b		\
-	exa_wm_write.g4b 		\
-	exa_wm_yuv_rgb.g4b		\
-	exa_wm_xy.g4b
-
 EXTRA_DIST = 		\
 	$(XMODE_SRCS)	\
-	$(INTEL_G4A)	\
-	$(INTEL_G4I)	\
-	$(INTEL_G4B)	\
 	$(INTEL_DRI_SRCS) \
 	$(INTEL_XVMC_SRCS)
 
-if HAVE_GEN4ASM
-
-SUFFIXES = .g4a .g4b
-.g4a.g4b:
-	m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
-
-$(INTEL_G4B): $(INTEL_G4I)
-
-BUILT_SOURCES= $(INTEL_G4B)
-
-clean-local:
-	-rm -f $(INTEL_G4B)
-endif
-
-if XMODES
-intel_drv_la_SOURCES += \
-	$(XMODE_SRCS)
-endif
-
 if DRI
 intel_drv_la_SOURCES += \
 	$(INTEL_DRI_SRCS)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.in	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,11 +34,15 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,27 +56,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@XSERVER_LIBPCIACCESS_TRUE@am__append_1 = @PCIACCESS_LIBS@
-@XMODES_TRUE@am__append_2 = \
-@XMODES_TRUE@	$(XMODE_SRCS)
-
-@DRI_TRUE@am__append_3 = \
+@DRI_TRUE@am__append_1 = \
 @DRI_TRUE@	$(INTEL_DRI_SRCS)
 
-@DRI_TRUE@am__append_4 = \
+@DRI_TRUE@am__append_2 = \
 @DRI_TRUE@	$(DRI_LIBS)
 
-@XVMC_TRUE@am__append_5 = \
+@XVMC_TRUE@am__append_3 = \
 @XVMC_TRUE@	$(INTEL_XVMC_SRCS)
 
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -86,80 +85,66 @@ intel_drv_laLTLIBRARIES_INSTALL = $(INST
 LTLIBRARIES = $(intel_drv_la_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @DRI_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-intel_drv_la_DEPENDENCIES = ../uxa/libuxa.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2)
+intel_drv_la_DEPENDENCIES = ../uxa/libuxa.la $(am__DEPENDENCIES_2)
 am__intel_drv_la_SOURCES_DIST = brw_defines.h brw_structs.h common.h \
 	i2c_vid.h i810_accel.c i810_common.h i810_cursor.c i810_dga.c \
 	i810_driver.c i810.h i810_io.c i810_memory.c i810_reg.h \
 	i810_ring.h i810_video.c i810_wmark.c i830_3d.c i830_accel.c \
 	i830_bios.c i830_bios.h i830_batchbuffer.c i830_batchbuffer.h \
-	i830_common.h i830_crt.c i830_cursor.c i830_debug.c \
-	i830_debug.h i830_display.c i830_display.h i830_quirks.c \
-	i830_driver.c i830_dvo.c i830.h i830_hdmi.c i830_i2c.c \
-	i830_io.c i830_lvds.c i830_memory.c i830_modes.c i830_video.c \
-	i830_video.h i830_reg.h i830_ring.h i830_sdvo.c i830_sdvo.h \
-	i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h i915_reg.h \
-	i915_video.c i965_video.c i830_exa.c i830_xaa.c i830_render.c \
-	i915_render.c i965_render.c drmmode_display.c \
-	local_xf86Rename.h parser/xf86Parser.h parser/xf86Optrec.h \
-	modes/xf86Modes.h modes/xf86Modes.c modes/xf86cvt.c \
-	modes/xf86Crtc.h modes/xf86Crtc.c modes/xf86Cursors.c \
-	modes/xf86EdidModes.c modes/xf86RandR12.c modes/xf86RandR12.h \
-	modes/xf86Rename.h modes/xf86Rotate.c modes/xf86DiDGA.c \
+	i830_common.h i830_crt.c i830_cursor.c i830_display.c \
+	i830_display.h i830_quirks.c i830_driver.c i830_dvo.c i830.h \
+	i830_hdmi.c i830_i2c.c i830_io.c i830_lvds.c i830_memory.c \
+	i830_modes.c i830_video.c i830_video.h i830_reg.h i830_ring.h \
+	i830_sdvo.c i830_sdvo.h i830_sdvo_regs.h i830_tv.c i915_3d.c \
+	i915_3d.h i915_reg.h i915_video.c i965_video.c i830_uxa.c \
+	i830_render.c i915_render.c i965_render.c drmmode_display.c \
 	i810_dri.c i810_dri.h i830_dri.c i810_hwmc.c i830_dri.h \
-	i830_hwmc.h i830_hwmc.c i915_hwmc.c i915_hwmc.h i965_hwmc.c \
-	i965_hwmc.h
-am__objects_1 = xf86Modes.lo xf86cvt.lo xf86Crtc.lo xf86Cursors.lo \
-	xf86EdidModes.lo xf86RandR12.lo xf86Rotate.lo xf86DiDGA.lo
-@XMODES_TRUE@am__objects_2 = $(am__objects_1)
-am__objects_3 = i810_dri.lo i830_dri.lo i810_hwmc.lo
-@DRI_TRUE@am__objects_4 = $(am__objects_3)
-am__objects_5 = i830_hwmc.lo i915_hwmc.lo i965_hwmc.lo
-@XVMC_TRUE@am__objects_6 = $(am__objects_5)
+	i830_hwmc.h i830_hwmc.c i915_hwmc.h i965_hwmc.h
+am__objects_1 = i810_dri.lo i830_dri.lo i810_hwmc.lo
+@DRI_TRUE@am__objects_2 = $(am__objects_1)
+am__objects_3 = i830_hwmc.lo
+@XVMC_TRUE@am__objects_4 = $(am__objects_3)
 am_intel_drv_la_OBJECTS = i810_accel.lo i810_cursor.lo i810_dga.lo \
 	i810_driver.lo i810_io.lo i810_memory.lo i810_video.lo \
 	i810_wmark.lo i830_3d.lo i830_accel.lo i830_bios.lo \
-	i830_batchbuffer.lo i830_crt.lo i830_cursor.lo i830_debug.lo \
-	i830_display.lo i830_quirks.lo i830_driver.lo i830_dvo.lo \
-	i830_hdmi.lo i830_i2c.lo i830_io.lo i830_lvds.lo \
-	i830_memory.lo i830_modes.lo i830_video.lo i830_sdvo.lo \
-	i830_tv.lo i915_3d.lo i915_video.lo i965_video.lo i830_exa.lo \
-	i830_xaa.lo i830_render.lo i915_render.lo i965_render.lo \
-	drmmode_display.lo $(am__objects_2) $(am__objects_4) \
-	$(am__objects_6)
+	i830_batchbuffer.lo i830_crt.lo i830_cursor.lo i830_display.lo \
+	i830_quirks.lo i830_driver.lo i830_dvo.lo i830_hdmi.lo \
+	i830_i2c.lo i830_io.lo i830_lvds.lo i830_memory.lo \
+	i830_modes.lo i830_video.lo i830_sdvo.lo i830_tv.lo i915_3d.lo \
+	i915_video.lo i965_video.lo i830_uxa.lo i830_render.lo \
+	i915_render.lo i965_render.lo drmmode_display.lo \
+	$(am__objects_2) $(am__objects_4)
 intel_drv_la_OBJECTS = $(am_intel_drv_la_OBJECTS)
-intel_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(intel_drv_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(intel_drv_la_SOURCES)
 DIST_SOURCES = $(am__intel_drv_la_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 \
-	reg_dumper
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -167,41 +152,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -209,12 +211,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -222,13 +223,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -242,26 +238,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -273,13 +270,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -293,7 +288,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -304,46 +298,23 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-@LIBPCIACCESS_TRUE@REGDUMPER = reg_dumper
-SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
+SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 reg_dumper render_program
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa \
-	@XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DI830_USE_UXA
+AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
+	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
 intel_drv_ladir = @moduledir@/drivers
 intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la \
-	$(am__append_1) $(am__append_4)
-XMODE_SRCS = \
-	 local_xf86Rename.h \
-	 parser/xf86Parser.h \
-	 parser/xf86Optrec.h \
-	 modes/xf86Modes.h \
-	 modes/xf86Modes.c \
-	 modes/xf86cvt.c \
-	 modes/xf86Crtc.h \
-	 modes/xf86Crtc.c \
-	 modes/xf86Cursors.c \
-	 modes/xf86EdidModes.c \
-	 modes/xf86RandR12.c \
-	 modes/xf86RandR12.h \
-	 modes/xf86Rename.h \
-	 modes/xf86Rotate.c \
-	 modes/xf86DiDGA.c
-
+	@PCIACCESS_LIBS@ $(am__append_2)
 INTEL_DRI_SRCS = \
          i810_dri.c \
          i810_dri.h \
@@ -354,9 +325,7 @@ INTEL_DRI_SRCS = \
 INTEL_XVMC_SRCS = \
 	 i830_hwmc.h \
 	 i830_hwmc.c \
-         i915_hwmc.c \
          i915_hwmc.h \
-         i965_hwmc.c \
          i965_hwmc.h
 
 intel_drv_la_SOURCES = brw_defines.h brw_structs.h common.h i2c_vid.h \
@@ -364,83 +333,29 @@ intel_drv_la_SOURCES = brw_defines.h brw
 	i810_driver.c i810.h i810_io.c i810_memory.c i810_reg.h \
 	i810_ring.h i810_video.c i810_wmark.c i830_3d.c i830_accel.c \
 	i830_bios.c i830_bios.h i830_batchbuffer.c i830_batchbuffer.h \
-	i830_common.h i830_crt.c i830_cursor.c i830_debug.c \
-	i830_debug.h i830_display.c i830_display.h i830_quirks.c \
-	i830_driver.c i830_dvo.c i830.h i830_hdmi.c i830_i2c.c \
-	i830_io.c i830_lvds.c i830_memory.c i830_modes.c i830_video.c \
-	i830_video.h i830_reg.h i830_ring.h i830_sdvo.c i830_sdvo.h \
-	i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h i915_reg.h \
-	i915_video.c i965_video.c i830_exa.c i830_xaa.c i830_render.c \
-	i915_render.c i965_render.c drmmode_display.c $(am__append_2) \
-	$(am__append_3) $(am__append_5)
-INTEL_G4A = \
-	packed_yuv_sf.g4a		\
-	packed_yuv_wm.g4a		\
-	exa_sf.g4a 			\
-	exa_sf_mask.g4a 		\
-	exa_wm_src_affine.g4a 		\
-	exa_wm_src_projective.g4a 	\
-	exa_wm_src_sample_argb.g4a 	\
-	exa_wm_src_sample_a.g4a 	\
-	exa_wm_src_sample_planar.g4a 	\
-	exa_wm_mask_affine.g4a 		\
-	exa_wm_mask_projective.g4a 	\
-	exa_wm_mask_sample_argb.g4a 	\
-	exa_wm_mask_sample_a.g4a 	\
-	exa_wm_noca.g4a			\
-	exa_wm_ca.g4a			\
-	exa_wm_ca_srcalpha.g4a		\
-	exa_wm_write.g4a 		\
-	exa_wm_yuv_rgb.g4a		\
-	exa_wm_xy.g4a
-
-INTEL_G4I = \
-	exa_wm.g4i			\
-	exa_wm_affine.g4i		\
-	exa_wm_projective.g4i
-
-INTEL_G4B = \
-	packed_yuv_sf.g4b		\
-	packed_yuv_wm.g4b		\
-	exa_sf.g4b 			\
-	exa_sf_mask.g4b 		\
-	exa_wm_src_affine.g4b 		\
-	exa_wm_src_projective.g4b 	\
-	exa_wm_src_sample_argb.g4b 	\
-	exa_wm_src_sample_a.g4b 	\
-	exa_wm_src_sample_planar.g4b 	\
-	exa_wm_mask_affine.g4b 		\
-	exa_wm_mask_projective.g4b 	\
-	exa_wm_mask_sample_argb.g4b 	\
-	exa_wm_mask_sample_a.g4b 	\
-	exa_wm_noca.g4b			\
-	exa_wm_ca.g4b			\
-	exa_wm_ca_srcalpha.g4b		\
-	exa_wm_write.g4b 		\
-	exa_wm_yuv_rgb.g4b		\
-	exa_wm_xy.g4b
-
+	i830_common.h i830_crt.c i830_cursor.c i830_display.c \
+	i830_display.h i830_quirks.c i830_driver.c i830_dvo.c i830.h \
+	i830_hdmi.c i830_i2c.c i830_io.c i830_lvds.c i830_memory.c \
+	i830_modes.c i830_video.c i830_video.h i830_reg.h i830_ring.h \
+	i830_sdvo.c i830_sdvo.h i830_sdvo_regs.h i830_tv.c i915_3d.c \
+	i915_3d.h i915_reg.h i915_video.c i965_video.c i830_uxa.c \
+	i830_render.c i915_render.c i965_render.c drmmode_display.c \
+	$(am__append_1) $(am__append_3)
 EXTRA_DIST = \
 	$(XMODE_SRCS)	\
-	$(INTEL_G4A)	\
-	$(INTEL_G4I)	\
-	$(INTEL_G4B)	\
 	$(INTEL_DRI_SRCS) \
 	$(INTEL_XVMC_SRCS)
 
-@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
-@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .g4a .g4b .c .lo .o .obj
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -466,21 +381,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-intel_drv_laLTLIBRARIES: $(intel_drv_la_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(intel_drv_ladir)" || $(MKDIR_P) "$(DESTDIR)$(intel_drv_ladir)"
+	test -z "$(intel_drv_ladir)" || $(mkdir_p) "$(DESTDIR)$(intel_drv_ladir)"
 	@list='$(intel_drv_la_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(intel_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(intel_drv_ladir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(intel_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(intel_drv_ladir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(intel_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(intel_drv_ladir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(intel_drv_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(intel_drv_ladir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-intel_drv_laLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(intel_drv_la_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(intel_drv_la_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(intel_drv_ladir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(intel_drv_ladir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(intel_drv_ladir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(intel_drv_ladir)/$$p"; \
 	done
 
 clean-intel_drv_laLTLIBRARIES:
@@ -492,7 +407,7 @@ clean-intel_drv_laLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 intel_drv.la: $(intel_drv_la_OBJECTS) $(intel_drv_la_DEPENDENCIES) 
-	$(intel_drv_la_LINK) -rpath $(intel_drv_ladir) $(intel_drv_la_OBJECTS) $(intel_drv_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(intel_drv_ladir) $(intel_drv_la_LDFLAGS) $(intel_drv_la_OBJECTS) $(intel_drv_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -517,12 +432,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_bios.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_crt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_cursor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_debug.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_display.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_dri.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_driver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_dvo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_exa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_hdmi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_hwmc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_i2c.Plo@am__quote@
@@ -534,107 +447,45 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_render.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_sdvo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_tv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_uxa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_video.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_xaa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_3d.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_hwmc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_render.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i915_video.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_hwmc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_render.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_video.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Crtc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Cursors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86DiDGA.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86EdidModes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Modes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86RandR12.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86Rotate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86cvt.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-xf86Modes.lo: modes/xf86Modes.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Modes.lo -MD -MP -MF $(DEPDIR)/xf86Modes.Tpo -c -o xf86Modes.lo `test -f 'modes/xf86Modes.c' || echo '$(srcdir)/'`modes/xf86Modes.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86Modes.Tpo $(DEPDIR)/xf86Modes.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86Modes.c' object='xf86Modes.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Modes.lo `test -f 'modes/xf86Modes.c' || echo '$(srcdir)/'`modes/xf86Modes.c
-
-xf86cvt.lo: modes/xf86cvt.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86cvt.lo -MD -MP -MF $(DEPDIR)/xf86cvt.Tpo -c -o xf86cvt.lo `test -f 'modes/xf86cvt.c' || echo '$(srcdir)/'`modes/xf86cvt.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86cvt.Tpo $(DEPDIR)/xf86cvt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86cvt.c' object='xf86cvt.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86cvt.lo `test -f 'modes/xf86cvt.c' || echo '$(srcdir)/'`modes/xf86cvt.c
-
-xf86Crtc.lo: modes/xf86Crtc.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Crtc.lo -MD -MP -MF $(DEPDIR)/xf86Crtc.Tpo -c -o xf86Crtc.lo `test -f 'modes/xf86Crtc.c' || echo '$(srcdir)/'`modes/xf86Crtc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86Crtc.Tpo $(DEPDIR)/xf86Crtc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86Crtc.c' object='xf86Crtc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Crtc.lo `test -f 'modes/xf86Crtc.c' || echo '$(srcdir)/'`modes/xf86Crtc.c
-
-xf86Cursors.lo: modes/xf86Cursors.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Cursors.lo -MD -MP -MF $(DEPDIR)/xf86Cursors.Tpo -c -o xf86Cursors.lo `test -f 'modes/xf86Cursors.c' || echo '$(srcdir)/'`modes/xf86Cursors.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86Cursors.Tpo $(DEPDIR)/xf86Cursors.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86Cursors.c' object='xf86Cursors.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Cursors.lo `test -f 'modes/xf86Cursors.c' || echo '$(srcdir)/'`modes/xf86Cursors.c
-
-xf86EdidModes.lo: modes/xf86EdidModes.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86EdidModes.lo -MD -MP -MF $(DEPDIR)/xf86EdidModes.Tpo -c -o xf86EdidModes.lo `test -f 'modes/xf86EdidModes.c' || echo '$(srcdir)/'`modes/xf86EdidModes.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86EdidModes.Tpo $(DEPDIR)/xf86EdidModes.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86EdidModes.c' object='xf86EdidModes.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86EdidModes.lo `test -f 'modes/xf86EdidModes.c' || echo '$(srcdir)/'`modes/xf86EdidModes.c
-
-xf86RandR12.lo: modes/xf86RandR12.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86RandR12.lo -MD -MP -MF $(DEPDIR)/xf86RandR12.Tpo -c -o xf86RandR12.lo `test -f 'modes/xf86RandR12.c' || echo '$(srcdir)/'`modes/xf86RandR12.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86RandR12.Tpo $(DEPDIR)/xf86RandR12.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86RandR12.c' object='xf86RandR12.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86RandR12.lo `test -f 'modes/xf86RandR12.c' || echo '$(srcdir)/'`modes/xf86RandR12.c
-
-xf86Rotate.lo: modes/xf86Rotate.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86Rotate.lo -MD -MP -MF $(DEPDIR)/xf86Rotate.Tpo -c -o xf86Rotate.lo `test -f 'modes/xf86Rotate.c' || echo '$(srcdir)/'`modes/xf86Rotate.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86Rotate.Tpo $(DEPDIR)/xf86Rotate.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86Rotate.c' object='xf86Rotate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Rotate.lo `test -f 'modes/xf86Rotate.c' || echo '$(srcdir)/'`modes/xf86Rotate.c
-
-xf86DiDGA.lo: modes/xf86DiDGA.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xf86DiDGA.lo -MD -MP -MF $(DEPDIR)/xf86DiDGA.Tpo -c -o xf86DiDGA.lo `test -f 'modes/xf86DiDGA.c' || echo '$(srcdir)/'`modes/xf86DiDGA.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xf86DiDGA.Tpo $(DEPDIR)/xf86DiDGA.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modes/xf86DiDGA.c' object='xf86DiDGA.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86DiDGA.lo `test -f 'modes/xf86DiDGA.c' || echo '$(srcdir)/'`modes/xf86DiDGA.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -666,7 +517,8 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -710,8 +562,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -736,8 +588,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -747,12 +599,13 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -766,21 +619,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -794,7 +648,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -802,23 +656,19 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+check: check-recursive
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(intel_drv_ladir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
@@ -842,18 +692,16 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@HAVE_GEN4ASM_FALSE@clean-local:
 clean: clean-recursive
 
 clean-am: clean-generic clean-intel_drv_laLTLIBRARIES clean-libtool \
-	clean-local mostlyclean-am
+	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
@@ -867,20 +715,12 @@ info-am:
 
 install-data-am: install-intel_drv_laLTLIBRARIES
 
-install-dvi: install-dvi-recursive
-
 install-exec-am:
 
-install-html: install-html-recursive
-
 install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -901,34 +741,25 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-intel_drv_laLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-intel_drv_laLTLIBRARIES
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic \
-	clean-intel_drv_laLTLIBRARIES clean-libtool clean-local ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-intel_drv_laLTLIBRARIES \
+	clean-libtool clean-recursive ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
+	install-data-am install-exec install-exec-am install-info \
 	install-info-am install-intel_drv_laLTLIBRARIES install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-intel_drv_laLTLIBRARIES
-
-@HAVE_GEN4ASM_TRUE@.g4a.g4b:
-@HAVE_GEN4ASM_TRUE@	m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
-
-@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am uninstall-intel_drv_laLTLIBRARIES
 
-@HAVE_GEN4ASM_TRUE@clean-local:
-@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B)
 # 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 -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/audio.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/audio.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/audio.c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/audio.c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,460 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Zhenyu Wang <zhenyu.z.wang@intel.com>
+ *    Wu Fengguang <fengguang.wu@intel.com>
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <pciaccess.h>
+#include <err.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <getopt.h>
+
+#include "reg_dumper.h"
+#include "../i810_reg.h"
+
+#define dump_reg(reg, desc)					\
+    do {							\
+	    dword = INREG(reg);	  				\
+	    printf("%-18s 0x%08x  %s\n", # reg, dword, desc);	\
+    } while (0)
+
+#define BITSTO(n)		(n >= sizeof(long) * 8 ? ~0 : (1UL << (n)) - 1)
+#define BITMASK(high, low)	(BITSTO(high+1) & ~BITSTO(low))
+#define BITS(reg, high, low)	(((reg) & (BITMASK(high, low))) >> (low))
+#define BIT(reg, n)		BITS(reg, n, n)
+
+#define AUD_CONFIG		0x62000
+#define AUD_DEBUG		0x62010
+#define AUD_VID_DID		0x62020
+#define AUD_RID			0x62024
+#define AUD_SUBN_CNT		0x62028
+#define AUD_FUNC_GRP		0x62040
+#define AUD_SUBN_CNT2		0x62044
+#define AUD_GRP_CAP		0x62048
+#define AUD_PWRST		0x6204c
+#define AUD_SUPPWR		0x62050
+#define AUD_SID			0x62054
+#define AUD_OUT_CWCAP		0x62070
+#define AUD_OUT_PCMSIZE		0x62074
+#define AUD_OUT_STR		0x62078
+#define AUD_OUT_DIG_CNVT	0x6207c
+#define AUD_OUT_CH_STR		0x62080
+#define AUD_OUT_STR_DESC	0x62084
+#define AUD_PINW_CAP		0x620a0
+#define AUD_PIN_CAP		0x620a4
+#define AUD_PINW_CONNLNG	0x620a8
+#define AUD_PINW_CONNLST	0x620ac
+#define AUD_PINW_CNTR		0x620b0
+#define AUD_PINW_UNSOLRESP	0x620b8
+#define AUD_CNTL_ST		0x620b4
+#define AUD_PINW_CONFIG		0x620bc
+#define AUD_HDMIW_STATUS	0x620d4
+#define AUD_HDMIW_HDMIEDID	0x6210c
+#define AUD_HDMIW_INFOFR	0x62118
+#define AUD_CONV_CHCNT 		0x62120
+#define AUD_CTS_ENABLE		0x62128
+
+#define VIDEO_DIP_CTL		0x61170
+#define VIDEO_DIP_ENABLE	(1<<31)
+#define VIDEO_DIP_ENABLE_AVI	(1<<21)
+#define VIDEO_DIP_ENABLE_VENDOR	(1<<22)
+#define VIDEO_DIP_ENABLE_SPD	(1<<24)
+#define VIDEO_DIP_BUF_AVI	(0<<19)
+#define VIDEO_DIP_BUF_VENDOR	(1<<19)
+#define VIDEO_DIP_BUF_SPD	(3<<19)
+#define VIDEO_DIP_TRANS_ONCE	(0<<16)
+#define VIDEO_DIP_TRANS_1	(1<<16)
+#define VIDEO_DIP_TRANS_2	(2<<16)
+
+#define AUDIO_HOTPLUG_EN	(1<<24)
+
+#define min_t(type, x, y) ({                    \
+        type __min1 = (x);                      \
+        type __min2 = (y);                      \
+        __min1 < __min2 ? __min1: __min2; })
+
+#define OPNAME(names, index)   \
+               names[min_t(unsigned int, index, ARRAY_SIZE(names) - 1)]
+
+static char *pixel_clock[] = {
+	[0] = "25.2 / 1.001 MHz",
+	[1] = "25.2 MHz",
+	[2] = "27 MHz",
+	[3] = "27 * 1.001 MHz",
+	[4] = "54 MHz",
+	[5] = "54 * 1.001 MHz",
+	[6] = "74.25 / 1.001 MHz",
+	[7] = "74.25 MHz",
+	[8] = "148.5 / 1.001 MHz",
+	[9] = "148.5 MHz",
+	[10] = "Reserved",
+};
+
+static char *power_state[] = {
+	[0] = "D0",
+	[1] = "D1",
+	[2] = "D2",
+	[3] = "D3",
+};
+
+static char *stream_type[] = {
+	[0] = "default samples",
+	[1] = "one bit stream",
+	[2] = "DST stream",
+	[3] = "MLP stream",
+	[4] = "Reserved",
+};
+
+static char *dip_port[] = {
+	[0] = "Reserved",
+	[1] = "HDMI B",
+	[2] = "HDMI C",
+	[3] = "Reserved",
+};
+
+static char *dip_index[] = {
+	[0] = "Audio DIP",
+	[1] = "ACP DIP",
+	[2] = "ISRC1 DIP",
+	[3] = "ISRC2 DIP",
+	[4] = "Reserved",
+};
+
+static char *dip_trans[] = {
+	[0] = "disabled",
+	[1] = "reserved",
+	[2] = "send once",
+	[3] = "best effort",
+};
+
+static char *video_dip_index[] = {
+	[0] = "AVI DIP",
+	[1] = "Vendor-specific DIP",
+	[2] = "Reserved",
+	[3] = "Source Product Description DIP",
+};
+
+static char *video_dip_trans[] = {
+	[0] = "send once",
+	[1] = "send every vsync",
+	[2] = "send at least every other vsync",
+	[3] = "reserved",
+};
+
+static void do_self_tests(void)
+{
+	if (BIT(1, 0) != 1)
+		exit(1);
+	if (BIT(0x80000000, 31) != 1)
+		exit(2);
+	if (BITS(0xc0000000, 31, 30) != 3)
+		exit(3);
+}
+
+int main(int argc, char **argv)
+{
+	I830Rec i830;
+	I830Ptr pI830 = &i830;
+	uint32_t dword;
+	int i;
+
+	do_self_tests();
+	intel_i830rec_init(pI830);
+
+	/* printf("%-18s   %8s  %s\n\n", "register name", "raw value", "description"); */
+
+#if 0				/* enable HDMI audio bits */
+	dump_reg(SDVOB, "Digital Display Port B Control Register");
+	dword |= SDVO_ENABLE;
+	dword |= SDVO_BORDER_ENABLE;
+	dword |= SDVO_AUDIO_ENABLE;
+	dword |= SDVO_NULL_PACKETS_DURING_VSYNC;
+	OUTREG(SDVOB, dword);
+
+	dump_reg(PORT_HOTPLUG_EN, "Hot Plug Detect Enable");
+	OUTREG(PORT_HOTPLUG_EN, dword | AUDIO_HOTPLUG_EN);
+
+	dump_reg(VIDEO_DIP_CTL, "Video DIP Control");
+	dword &= ~(VIDEO_DIP_ENABLE_AVI |
+		   VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_SPD);
+	OUTREG(VIDEO_DIP_CTL, dword);
+	dword |= VIDEO_DIP_ENABLE;
+	OUTREG(VIDEO_DIP_CTL, dword);
+#endif
+
+#if 0				/* disable HDMI audio bits */
+	dump_reg(SDVOB, "Digital Display Port B Control Register");
+	dword &= ~SDVO_AUDIO_ENABLE;
+	dword &= ~SDVO_NULL_PACKETS_DURING_VSYNC;
+	OUTREG(SDVOB, dword);
+#endif
+
+	dump_reg(VIDEO_DIP_CTL, "Video DIP Control");
+	dump_reg(SDVOB, "Digital Display Port B Control Register");
+	dump_reg(SDVOC, "Digital Display Port C Control Register");
+	dump_reg(PORT_HOTPLUG_EN, "Hot Plug Detect Enable");
+
+	dump_reg(AUD_CONFIG, "Audio Configuration");
+	dump_reg(AUD_DEBUG, "Audio Debug");
+	dump_reg(AUD_VID_DID, "Audio Vendor ID / Device ID");
+	dump_reg(AUD_RID, "Audio Revision ID");
+	dump_reg(AUD_SUBN_CNT, "Audio Subordinate Node Count");
+	dump_reg(AUD_FUNC_GRP, "Audio Function Group Type");
+	dump_reg(AUD_SUBN_CNT2, "Audio Subordinate Node Count");
+	dump_reg(AUD_GRP_CAP, "Audio Function Group Capabilities");
+	dump_reg(AUD_PWRST, "Audio Power State");
+	dump_reg(AUD_SUPPWR, "Audio Supported Power States");
+	dump_reg(AUD_SID, "Audio Root Node Subsystem ID");
+	dump_reg(AUD_OUT_CWCAP, "Audio Output Converter Widget Capabilities");
+	dump_reg(AUD_OUT_PCMSIZE, "Audio PCM Size and Rates");
+	dump_reg(AUD_OUT_STR, "Audio Stream Formats");
+	dump_reg(AUD_OUT_DIG_CNVT, "Audio Digital Converter");
+	dump_reg(AUD_OUT_CH_STR, "Audio Channel ID and Stream ID");
+	dump_reg(AUD_OUT_STR_DESC, "Audio Stream Descriptor Format");
+	dump_reg(AUD_PINW_CAP, "Audio Pin Complex Widget Capabilities");
+	dump_reg(AUD_PIN_CAP, "Audio Pin Capabilities");
+	dump_reg(AUD_PINW_CONNLNG, "Audio Connection List Length");
+	dump_reg(AUD_PINW_CONNLST, "Audio Connection List Entry");
+	dump_reg(AUD_PINW_CNTR, "Audio Pin Widget Control");
+	dump_reg(AUD_PINW_UNSOLRESP, "Audio Unsolicited Response Enable");
+	dump_reg(AUD_CNTL_ST, "Audio Control State Register");
+	dump_reg(AUD_PINW_CONFIG, "Audio Configuration Default");
+	dump_reg(AUD_HDMIW_STATUS, "Audio HDMI Status");
+	dump_reg(AUD_HDMIW_HDMIEDID, "Audio HDMI Data EDID Block");
+	dump_reg(AUD_HDMIW_INFOFR, "Audio HDMI Widget Data Island Packet");
+	dump_reg(AUD_CONV_CHCNT, "Audio Converter Channel Count");
+	dump_reg(AUD_CTS_ENABLE, "Audio CTS Programming Enable");
+
+	printf("\nDetails:\n\n");
+
+	dword = INREG(AUD_VID_DID);
+	printf("AUD_VID_DID vendor id\t\t\t0x%x\n", dword >> 16);
+	printf("AUD_VID_DID device id\t\t\t0x%x\n", dword & 0xffff);
+
+	dword = INREG(AUD_RID);
+	printf("AUD_RID major revision\t\t\t0x%lx\n", BITS(dword, 23, 20));
+	printf("AUD_RID minor revision\t\t\t0x%lx\n", BITS(dword, 19, 16));
+	printf("AUD_RID revision id\t\t\t0x%lx\n", BITS(dword, 15, 8));
+	printf("AUD_RID stepping id\t\t\t0x%lx\n", BITS(dword, 7, 0));
+
+	dword = INREG(SDVOB);
+	printf("SDVOB enable\t\t\t\t%u\n", !!(dword & SDVO_ENABLE));
+	printf("SDVOB HDMI encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_HDMI));
+	printf("SDVOB SDVO encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_SDVO));
+	printf("SDVOB null packets\t\t\t%u\n",
+	       !!(dword & SDVO_NULL_PACKETS_DURING_VSYNC));
+	printf("SDVOB audio enabled\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));
+
+	dword = INREG(SDVOC);
+	printf("SDVOC enable\t\t\t\t%u\n", !!(dword & SDVO_ENABLE));
+	printf("SDVOC HDMI encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_HDMI));
+	printf("SDVOC SDVO encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_SDVO));
+	printf("SDVOC null packets\t\t\t%u\n",
+	       !!(dword & SDVO_NULL_PACKETS_DURING_VSYNC));
+	printf("SDVOC audio enabled\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));
+
+	dword = INREG(PORT_HOTPLUG_EN);
+	printf("PORT_HOTPLUG_EN DisplayPort/HDMI port B\t%ld\n",
+	       BIT(dword, 29)),
+	    printf("PORT_HOTPLUG_EN DisplayPort/HDMI port C\t%ld\n",
+		   BIT(dword, 28)),
+	    printf("PORT_HOTPLUG_EN DisplayPort port D\t%ld\n", BIT(dword, 27)),
+	    printf("PORT_HOTPLUG_EN SDVOB\t\t\t%ld\n", BIT(dword, 26)),
+	    printf("PORT_HOTPLUG_EN SDVOC\t\t\t%ld\n", BIT(dword, 25)),
+	    printf("PORT_HOTPLUG_EN audio\t\t\t%ld\n", BIT(dword, 24)),
+	    printf("PORT_HOTPLUG_EN TV\t\t\t%ld\n", BIT(dword, 23)),
+	    printf("PORT_HOTPLUG_EN CRT\t\t\t%ld\n", BIT(dword, 9)), dword =
+	    INREG(VIDEO_DIP_CTL);
+	printf("VIDEO_DIP_CTL enable graphics DIP\t%ld\n", BIT(dword, 31)),
+	    printf("VIDEO_DIP_CTL port select\t\t[0x%lx] %s\n",
+		   BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
+	printf("VIDEO_DIP_CTL DIP buffer trans active\t%lu\n", BIT(dword, 28));
+	printf("VIDEO_DIP_CTL AVI DIP enabled\t\t%lu\n", BIT(dword, 21));
+	printf("VIDEO_DIP_CTL vendor DIP enabled\t%lu\n", BIT(dword, 22));
+	printf("VIDEO_DIP_CTL SPD DIP enabled\t\t%lu\n", BIT(dword, 24));
+	printf("VIDEO_DIP_CTL DIP buffer index\t\t[0x%lx] %s\n",
+	       BITS(dword, 20, 19), video_dip_index[BITS(dword, 20, 19)]);
+	printf("VIDEO_DIP_CTL DIP trans freq\t\t[0x%lx] %s\n",
+	       BITS(dword, 17, 16), video_dip_trans[BITS(dword, 17, 16)]);
+	printf("VIDEO_DIP_CTL DIP buffer size\t\t%lu\n", BITS(dword, 11, 8));
+	printf("VIDEO_DIP_CTL DIP address\t\t%lu\n", BITS(dword, 3, 0));
+
+	dword = INREG(AUD_CONFIG);
+	printf("AUD_CONFIG pixel clock\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
+	       OPNAME(pixel_clock, BITS(dword, 19, 16)));
+	printf("AUD_CONFIG fabrication enabled\t\t%lu\n", BITS(dword, 2, 2));
+	printf("AUD_CONFIG professional use allowed\t%lu\n", BIT(dword, 1));
+	printf("AUD_CONFIG fuse enabled\t\t\t%lu\n", BIT(dword, 0));
+
+	dword = INREG(AUD_DEBUG);
+	printf("AUD_DEBUG function reset\t\t%lu\n", BIT(dword, 0));
+
+	dword = INREG(AUD_SUBN_CNT);
+	printf("AUD_SUBN_CNT starting node number\t0x%lx\n",
+	       BITS(dword, 23, 16));
+	printf("AUD_SUBN_CNT total number of nodes\t0x%lx\n",
+	       BITS(dword, 7, 0));
+
+	dword = INREG(AUD_SUBN_CNT2);
+	printf("AUD_SUBN_CNT2 starting node number\t0x%lx\n",
+	       BITS(dword, 24, 16));
+	printf("AUD_SUBN_CNT2 total number of nodes\t0x%lx\n",
+	       BITS(dword, 7, 0));
+
+	dword = INREG(AUD_FUNC_GRP);
+	printf("AUD_FUNC_GRP unsol capable\t\t%lu\n", BIT(dword, 8));
+	printf("AUD_FUNC_GRP node type\t\t\t0x%lx\n", BITS(dword, 7, 0));
+
+	dword = INREG(AUD_GRP_CAP);
+	printf("AUD_GRP_CAP beep 0\t\t\t%lu\n", BIT(dword, 16));
+	printf("AUD_GRP_CAP input delay\t\t\t%lu\n", BITS(dword, 11, 8));
+	printf("AUD_GRP_CAP output delay\t\t%lu\n", BITS(dword, 3, 0));
+
+	dword = INREG(AUD_PWRST);
+	printf("AUD_PWRST device power state\t\t%s\n",
+	       power_state[BITS(dword, 5, 4)]);
+	printf("AUD_PWRST device power state setting\t%s\n",
+	       power_state[BITS(dword, 1, 0)]);
+
+	dword = INREG(AUD_SUPPWR);
+	printf("AUD_SUPPWR support D0\t\t\t%lu\n", BIT(dword, 0));
+	printf("AUD_SUPPWR support D1\t\t\t%lu\n", BIT(dword, 1));
+	printf("AUD_SUPPWR support D2\t\t\t%lu\n", BIT(dword, 2));
+	printf("AUD_SUPPWR support D3\t\t\t%lu\n", BIT(dword, 3));
+
+	dword = INREG(AUD_OUT_CWCAP);
+	printf("AUD_OUT_CWCAP widget type\t\t0x%lx\n", BITS(dword, 23, 20));
+	printf("AUD_OUT_CWCAP sample delay\t\t0x%lx\n", BITS(dword, 19, 16));
+	printf("AUD_OUT_CWCAP channel count\t\t%lu\n",
+	       BITS(dword, 15, 13) * 2 + BIT(dword, 0) + 1);
+	printf("AUD_OUT_CWCAP L-R swap\t\t\t%lu\n", BIT(dword, 11));
+	printf("AUD_OUT_CWCAP power control\t\t%lu\n", BIT(dword, 10));
+	printf("AUD_OUT_CWCAP digital\t\t\t%lu\n", BIT(dword, 9));
+	printf("AUD_OUT_CWCAP conn list\t\t\t%lu\n", BIT(dword, 8));
+	printf("AUD_OUT_CWCAP unsol\t\t\t%lu\n", BIT(dword, 7));
+	printf("AUD_OUT_CWCAP mute\t\t\t%lu\n", BIT(dword, 5));
+	printf("AUD_OUT_CWCAP format override\t\t%lu\n", BIT(dword, 4));
+	printf("AUD_OUT_CWCAP amp param override\t%lu\n", BIT(dword, 3));
+	printf("AUD_OUT_CWCAP out amp present\t\t%lu\n", BIT(dword, 2));
+	printf("AUD_OUT_CWCAP in amp present\t\t%lu\n", BIT(dword, 1));
+
+	dword = INREG(AUD_OUT_DIG_CNVT);
+	printf("AUD_OUT_DIG_CNVT SPDIF category\t\t0x%lx\n",
+	       BITS(dword, 14, 8));
+	printf("AUD_OUT_DIG_CNVT SPDIF level\t\t%lu\n", BIT(dword, 7));
+	printf("AUD_OUT_DIG_CNVT professional\t\t%lu\n", BIT(dword, 6));
+	printf("AUD_OUT_DIG_CNVT non PCM\t\t%lu\n", BIT(dword, 5));
+	printf("AUD_OUT_DIG_CNVT copyright asserted\t%lu\n", BIT(dword, 4));
+	printf("AUD_OUT_DIG_CNVT filter preemphasis\t%lu\n", BIT(dword, 3));
+	printf("AUD_OUT_DIG_CNVT validity config\t%lu\n", BIT(dword, 2));
+	printf("AUD_OUT_DIG_CNVT validity flag\t\t%lu\n", BIT(dword, 1));
+	printf("AUD_OUT_DIG_CNVT digital enable\t\t%lu\n", BIT(dword, 0));
+
+	dword = INREG(AUD_OUT_CH_STR);
+	printf("AUD_OUT_CH_STR stream id\t\t0x%lx\n", BITS(dword, 7, 4));
+	printf("AUD_OUT_CH_STR lowest channel\t\t0x%lx\n", BITS(dword, 3, 0));
+
+	dword = INREG(AUD_OUT_STR_DESC);
+	printf("AUD_OUT_STR_DESC stream channels\t0x%lx\n", BITS(dword, 3, 0));
+
+	dword = INREG(AUD_PINW_CAP);
+	printf("AUD_PINW_CAP widget type\t\t0x%lx\n", BITS(dword, 23, 20));
+	printf("AUD_PINW_CAP sample delay\t\t0x%lx\n", BITS(dword, 19, 16));
+	printf("AUD_PINW_CAP channel count\t\t0x%lx\n",
+	       BITS(dword, 15, 13) * 2 + BIT(dword, 0));
+	printf("AUD_PINW_CAP HDCP\t\t\t%lu\n", BIT(dword, 12));
+	printf("AUD_PINW_CAP L-R swap\t\t\t%lu\n", BIT(dword, 11));
+	printf("AUD_PINW_CAP power control\t\t%lu\n", BIT(dword, 10));
+	printf("AUD_PINW_CAP digital\t\t\t%lu\n", BIT(dword, 9));
+	printf("AUD_PINW_CAP conn list\t\t\t%lu\n", BIT(dword, 8));
+	printf("AUD_PINW_CAP unsol\t\t\t%lu\n", BIT(dword, 7));
+	printf("AUD_PINW_CAP mute\t\t\t%lu\n", BIT(dword, 5));
+	printf("AUD_PINW_CAP format override\t\t%lu\n", BIT(dword, 4));
+	printf("AUD_PINW_CAP amp param override\t\t%lu\n", BIT(dword, 3));
+	printf("AUD_PINW_CAP out amp present\t\t%lu\n", BIT(dword, 2));
+	printf("AUD_PINW_CAP in amp present\t\t%lu\n", BIT(dword, 1));
+
+	dword = INREG(AUD_PIN_CAP);
+	printf("AUD_PIN_CAP EAPD\t\t\t%lu\n", BIT(dword, 16));
+	printf("AUD_PIN_CAP HDMI\t\t\t%lu\n", BIT(dword, 7));
+	printf("AUD_PIN_CAP output\t\t\t%lu\n", BIT(dword, 4));
+	printf("AUD_PIN_CAP presence detect\t\t%lu\n", BIT(dword, 2));
+
+	dword = INREG(AUD_PINW_CNTR);
+	printf("AUD_PINW_CNTR mute status\t\t%lu\n", BIT(dword, 8));
+	printf("AUD_PINW_CNTR out enable\t\t%lu\n", BIT(dword, 6));
+	printf("AUD_PINW_CNTR amp mute status\t\t%lu\n", BIT(dword, 8));
+	printf("AUD_PINW_CNTR amp mute status\t\t%lu\n", BIT(dword, 8));
+	printf("AUD_PINW_CNTR stream type\t\t[0x%lx] %s\n",
+	       BITS(dword, 2, 0), OPNAME(stream_type, BITS(dword, 2, 0)));
+
+	dword = INREG(AUD_PINW_UNSOLRESP);
+	printf("AUD_PINW_UNSOLRESP enable unsol resp\t%lu\n", BIT(dword, 31));
+
+	dword = INREG(AUD_CNTL_ST);
+	printf("AUD_CNTL_ST DIP audio enabled\t\t%lu\n", BIT(dword, 21));
+	printf("AUD_CNTL_ST DIP ACP enabled\t\t%lu\n", BIT(dword, 22));
+	printf("AUD_CNTL_ST DIP ISRCx enabled\t\t%lu\n", BIT(dword, 23));
+	printf("AUD_CNTL_ST DIP port select\t\t[0x%lx] %s\n",
+	       BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
+	printf("AUD_CNTL_ST DIP buffer index\t\t[0x%lx] %s\n",
+	       BITS(dword, 20, 18), OPNAME(dip_index, BITS(dword, 20, 18)));
+	printf("AUD_CNTL_ST DIP trans freq\t\t[0x%lx] %s\n",
+	       BITS(dword, 17, 16), dip_trans[BITS(dword, 17, 16)]);
+	printf("AUD_CNTL_ST DIP address\t\t\t%lu\n", BITS(dword, 3, 0));
+	printf("AUD_CNTL_ST CP ready\t\t\t%lu\n", BIT(dword, 15));
+	printf("AUD_CNTL_ST ELD valid\t\t\t%lu\n", BIT(dword, 14));
+	printf("AUD_CNTL_ST ELD ack\t\t\t%lu\n", BIT(dword, 4));
+	printf("AUD_CNTL_ST ELD bufsize\t\t\t%lu\n", BITS(dword, 13, 9));
+	printf("AUD_CNTL_ST ELD address\t\t\t%lu\n", BITS(dword, 8, 5));
+
+	dword = INREG(AUD_HDMIW_STATUS);
+	printf("AUD_HDMIW_STATUS CDCLK/DOTCLK underrun\t%lu\n", BIT(dword, 31));
+	printf("AUD_HDMIW_STATUS CDCLK/DOTCLK overrun\t%lu\n", BIT(dword, 30));
+	printf("AUD_HDMIW_STATUS BCLK/CDCLK underrun\t%lu\n", BIT(dword, 29));
+	printf("AUD_HDMIW_STATUS BCLK/CDCLK overrun\t%lu\n", BIT(dword, 28));
+
+	dword = INREG(AUD_CONV_CHCNT);
+	printf("AUD_CONV_CHCNT HDMI HBR enabled\t\t%lu\n", BITS(dword, 15, 14));
+	printf("AUD_CONV_CHCNT HDMI channel count\t%lu\n",
+	       BITS(dword, 11, 8) + 1);
+
+	printf("AUD_CONV_CHCNT HDMI channel mapping:\n");
+	for (i = 0; i < 8; i++) {
+		OUTREG(AUD_CONV_CHCNT, i);
+		dword = INREG(AUD_CONV_CHCNT);
+		printf("\t\t\t\t\t[0x%x] %u => %lu \n", dword, i,
+		       BITS(dword, 7, 4));
+	}
+
+	return 0;
+}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/gtt.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/gtt.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/gtt.c	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/gtt.c	2011-02-08 11:14:00.000000000 +0100
@@ -52,25 +52,25 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (IS_G4X(pI830))
+	if (IS_G4X(pI830) || IS_IGDNG(pI830))
 		gtt = (unsigned char *)(pI830->mmio + MB(2));
 	else if (IS_I965G(pI830))
 		gtt = (unsigned char *)(pI830->mmio + KB(512));
 	else {
-		/* 915/945 chips has GTT range in bar 3*/
+		/* 915/945 chips has GTT range in bar 3 */
 		int err = 0;
-		err = pci_device_map_range (pI830->pci_dev,
-				pI830->pci_dev->regions[3].base_addr,
-				pI830->pci_dev->regions[3].size,
-				PCI_DEV_MAP_FLAG_WRITABLE,
-				(void **)&gtt);
+		err = pci_device_map_range(pI830->PciInfo,
+					   pI830->PciInfo->regions[3].base_addr,
+					   pI830->PciInfo->regions[3].size,
+					   PCI_DEV_MAP_FLAG_WRITABLE,
+					   (void **)&gtt);
 		if (err != 0) {
 			fprintf(stderr, "mapping GTT bar failed\n");
 			exit(1);
 		}
 	}
 
-	aper_size = pI830->pci_dev->regions[2].size;
+	aper_size = pI830->PciInfo->regions[2].size;
 
 	for (start = 0; start < aper_size; start += KB(4)) {
 		uint32_t start_pte = INGTT(start);
@@ -105,8 +105,7 @@ int main(int argc, char **argv)
 		}
 		if (constant_length > 0) {
 			printf("0x%08x - 0x%08x: constant 0x%08x\n",
-			       start, end - KB(4),
-			       start_pte);
+			       start, end - KB(4), start_pte);
 			start = end - KB(4);
 			continue;
 		}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/hotplug.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/hotplug.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/hotplug.c	2008-08-02 07:12:48.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/hotplug.c	2011-02-08 11:14:00.000000000 +0100
@@ -37,115 +37,90 @@
 #include "../i810_reg.h"
 
 struct idle_flags {
-    uint32_t instdone_flag;
-    char *name;
-    unsigned int count;
+	uint32_t instdone_flag;
+	char *name;
+	unsigned int count;
 };
 
 int main(int argc, char **argv)
 {
-    struct pci_device *dev;
-    I830Rec i830;
-    I830Ptr pI830 = &i830;
-    ScrnInfoRec scrn;
-    int err, mmio_bar;
-    void *mmio;
-    int i;
-
-    err = pci_system_init();
-    if (err != 0) {
-	fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err));
-	exit(1);
-    }
-
-    /* Grab the graphics card */
-    dev = pci_device_find_by_slot(0, 0, 2, 0);
-    if (dev == NULL)
-	errx(1, "Couldn't find graphics card");
-
-    err = pci_device_probe(dev);
-    if (err != 0) {
-	fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
-	exit(1);
-    }
-
-    if (dev->vendor_id != 0x8086)
-	errx(1, "Graphics card is non-intel");
-
-    i830.PciInfo = &i830.pci_info_rec;
-    i830.PciInfo->chipType = dev->device_id;
-
-    i830.pci_dev = dev;
-
-    mmio_bar = IS_I9XX((&i830)) ? 0 : 1;
-
-    err = pci_device_map_range (dev,
-				dev->regions[mmio_bar].base_addr,
-				dev->regions[mmio_bar].size, 
-				PCI_DEV_MAP_FLAG_WRITABLE,
-				&mmio);
-
-    if (err != 0) {
-	fprintf(stderr, "Couldn't map MMIO region: %s\n", strerror(err));
-	exit(1);
-    }
-    i830.mmio = mmio;
-
-    scrn.scrnIndex = 0;
-    scrn.pI830 = &i830;
-
-    OUTREG(SDVOB, (0x0 << 10));
-    OUTREG(SDVOC, (0x0 << 10));
-
-    OUTREG(PORT_HOTPLUG_EN,
-	   (1 << 29) |
-	   (1 << 28) |
-	   (1 << 27) |
-	   SDVOB_HOTPLUG_INT_EN |
-	   SDVOC_HOTPLUG_INT_EN |
-	   (1 << 24) |
-	   CRT_HOTPLUG_INT_EN |
-	   TV_HOTPLUG_INT_EN |
-	   CRT_HOTPLUG_INT_EN);
-
-    for (i = 0;; i++) {
-	OUTREG(PORT_HOTPLUG_STAT,
-	       (1 << 20) |
-	       (1 << 19) |
-	       (1 << 18) |
-	       (1 << 17) |
-	       CRT_HOTPLUG_INT_STATUS |
-	       TV_HOTPLUG_INT_STATUS |
-	       SDVOC_HOTPLUG_INT_STATUS |
-	       SDVOB_HOTPLUG_INT_STATUS);
-	INREG(PORT_HOTPLUG_STAT);
-
-	usleep(500 * 1000);
-
-	printf("%5d: 0x%08x\n", i, INREG(PORT_HOTPLUG_STAT));
-	sleep(1);
-    }
+	struct pci_device *dev;
+	I830Rec i830;
+	I830Ptr pI830 = &i830;
+	ScrnInfoRec scrn;
+	int err, mmio_bar;
+	void *mmio;
+	int i;
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+
+	i830.PciInfo = dev;
+
+	mmio_bar = IS_I9XX((&i830)) ? 0 : 1;
+
+	err = pci_device_map_range(dev,
+				   dev->regions[mmio_bar].base_addr,
+				   dev->regions[mmio_bar].size,
+				   PCI_DEV_MAP_FLAG_WRITABLE, &mmio);
+
+	if (err != 0) {
+		fprintf(stderr, "Couldn't map MMIO region: %s\n",
+			strerror(err));
+		exit(1);
+	}
+	i830.mmio = mmio;
+
+	scrn.scrnIndex = 0;
+	scrn.pI830 = &i830;
+
+	OUTREG(SDVOB, (0x0 << 10));
+	OUTREG(SDVOC, (0x0 << 10));
+
+	OUTREG(PORT_HOTPLUG_EN,
+	       (1 << 29) |
+	       (1 << 28) |
+	       (1 << 27) |
+	       SDVOB_HOTPLUG_INT_EN |
+	       SDVOC_HOTPLUG_INT_EN |
+	       (1 << 24) |
+	       CRT_HOTPLUG_INT_EN | TV_HOTPLUG_INT_EN | CRT_HOTPLUG_INT_EN);
+
+	for (i = 0;; i++) {
+		OUTREG(PORT_HOTPLUG_STAT,
+		       (1 << 20) |
+		       (1 << 19) |
+		       (1 << 18) |
+		       (1 << 17) |
+		       CRT_HOTPLUG_INT_STATUS |
+		       TV_HOTPLUG_INT_STATUS |
+		       SDVOC_HOTPLUG_INT_STATUS | SDVOB_HOTPLUG_INT_STATUS);
+		INREG(PORT_HOTPLUG_STAT);
+
+		usleep(500 * 1000);
+
+		printf("%5d: 0x%08x\n", i, INREG(PORT_HOTPLUG_STAT));
+		sleep(1);
+	}
 
-    return 0;
-}
-
-void xf86DrvMsg(int scrnIndex, int severity, const char *format, ...)
-{
-    va_list va;
-
-    switch (severity) {
-    case X_INFO:
-	printf("(II): ");
-	break;
-    case X_WARNING:
-	printf("(WW): ");
-	break;
-    case X_ERROR:
-	printf("(EE): ");
-	break;
-    }
-
-    va_start(va, format);
-    vprintf(format, va);
-    va_end(va);
+	return 0;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/lid.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/lid.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/lid.c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/lid.c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,146 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Zhenyu Wang <zhenyu.z.wang@intel.com>
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <pciaccess.h>
+#include <err.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "reg_dumper.h"
+#include "../i810_reg.h"
+#include "../i830_bios.h"
+
+enum lid_status {
+	LID_UNKNOWN = -1,
+	LID_OPEN,
+	LID_CLOSE,
+};
+
+#define ACPI_BUTTON "/proc/acpi/button/"
+#define ACPI_LID "/proc/acpi/button/lid/"
+
+static int i830_lvds_acpi_lid_state(void)
+{
+	int fd;
+	DIR *button_dir;
+	DIR *lid_dir;
+	struct dirent *lid_dent;
+	char *state_name;
+	char state[64];
+	enum lid_status ret = LID_UNKNOWN;
+
+	button_dir = opendir(ACPI_BUTTON);
+	/* If acpi button driver is not loaded, bypass ACPI check method */
+	if (button_dir == NULL)
+		goto out;
+	closedir(button_dir);
+
+	lid_dir = opendir(ACPI_LID);
+
+	/* no acpi lid object found */
+	if (lid_dir == NULL)
+		goto out;
+
+	while (1) {
+		lid_dent = readdir(lid_dir);
+		if (lid_dent == NULL) {
+			/* no LID object */
+			closedir(lid_dir);
+			goto out;
+		}
+		if (strcmp(lid_dent->d_name, ".") &&
+		    strcmp(lid_dent->d_name, "..")) {
+			break;
+		}
+	}
+	state_name = malloc(strlen(ACPI_LID) + strlen(lid_dent->d_name) + 7);
+	memset(state_name, 0, sizeof(state_name));
+	strcat(state_name, ACPI_LID);
+	strcat(state_name, lid_dent->d_name);
+	strcat(state_name, "/state");
+
+	closedir(lid_dir);
+
+	if ((fd = open(state_name, O_RDONLY)) == -1) {
+		free(state_name);
+		goto out;
+	}
+	free(state_name);
+	if (read(fd, state, 64) == -1) {
+		close(fd);
+		goto out;
+	}
+	close(fd);
+	if (strstr(state, "open"))
+		ret = LID_OPEN;
+	else if (strstr(state, "closed"))
+		ret = LID_CLOSE;
+	else			/* "unsupported" */
+		ret = LID_UNKNOWN;
+
+out:
+	return ret;
+}
+
+int main(int argc, char **argv)
+{
+	I830Rec i830;
+	I830Ptr pI830 = &i830;
+	int swf14, acpi_lid;
+
+	intel_i830rec_init(pI830);
+
+	while (1) {
+		swf14 = INREG(SWF14);
+
+		printf("Intel LVDS Lid status:\n");
+		printf("\tSWF14(0x%x) : %s\n", swf14,
+		       swf14 & SWF14_LID_SWITCH_EN ? "close" : "open");
+
+		acpi_lid = i830_lvds_acpi_lid_state();
+		switch (acpi_lid) {
+		case LID_UNKNOWN:
+			printf("\tACPI Lid state : unknown\n");
+			break;
+		case LID_OPEN:
+			printf("\tACPI Lid state : open\n");
+			break;
+		case LID_CLOSE:
+			printf("\tACPI Lid state : close\n");
+			break;
+		}
+		sleep(2);
+	}
+	return 0;
+}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/main.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/main.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/main.c	2008-08-02 07:12:48.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/main.c	2011-02-08 11:14:00.000000000 +0100
@@ -29,83 +29,81 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <pciaccess.h>
 #include <err.h>
 
 #include "reg_dumper.h"
 
 int main(int argc, char **argv)
 {
-    struct pci_device *dev;
-    I830Rec i830;
-    ScrnInfoRec scrn;
-    int err, mmio_bar;
-    void *mmio;
-
-    err = pci_system_init();
-    if (err != 0) {
-	fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err));
-	exit(1);
-    }
-
-    /* Grab the graphics card */
-    dev = pci_device_find_by_slot(0, 0, 2, 0);
-    if (dev == NULL)
-	errx(1, "Couldn't find graphics card");
-
-    err = pci_device_probe(dev);
-    if (err != 0) {
-	fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
-	exit(1);
-    }
-
-    if (dev->vendor_id != 0x8086)
-	errx(1, "Graphics card is non-intel");
-
-    i830.PciInfo = &i830.pci_info_rec;
-    i830.PciInfo->chipType = dev->device_id;
-
-    i830.pci_dev = dev;
-
-    mmio_bar = IS_I9XX((&i830)) ? 0 : 1;
-
-    err = pci_device_map_range (dev,
-				dev->regions[mmio_bar].base_addr,
-				dev->regions[mmio_bar].size, 
-				PCI_DEV_MAP_FLAG_WRITABLE,
-				&mmio);
-    
-    if (err != 0) {
-	fprintf(stderr, "Couldn't map MMIO region: %s\n", strerror(err));
-	exit(1);
-    }
-    i830.mmio = mmio;
+	struct pci_device *dev;
+	I830Rec i830;
+	ScrnInfoRec scrn;
+	int err, mmio_bar;
+	void *mmio;
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+
+	i830.PciInfo = dev;
+
+	mmio_bar = IS_I9XX((&i830)) ? 0 : 1;
+
+	err = pci_device_map_range(dev,
+				   dev->regions[mmio_bar].base_addr,
+				   dev->regions[mmio_bar].size,
+				   PCI_DEV_MAP_FLAG_WRITABLE, &mmio);
+
+	if (err != 0) {
+		fprintf(stderr, "Couldn't map MMIO region: %s\n",
+			strerror(err));
+		exit(1);
+	}
+	i830.mmio = mmio;
 
-    scrn.scrnIndex = 0;
-    scrn.pI830 = &i830;
+	scrn.scrnIndex = 0;
+	scrn.pI830 = &i830;
 
-    i830DumpRegs(&scrn);
+	i830DumpRegs(&scrn);
 
-    return 0;
+	return 0;
 }
 
 void xf86DrvMsg(int scrnIndex, int severity, const char *format, ...)
 {
-    va_list va;
+	va_list va;
 
-    switch (severity) {
-    case X_INFO:
-	printf("(II): ");
-	break;
-    case X_WARNING:
-	printf("(WW): ");
-	break;
-    case X_ERROR:
-	printf("(EE): ");
-	break;
-    }
-
-    va_start(va, format);
-    vprintf(format, va);
-    va_end(va);
+	switch (severity) {
+	case X_INFO:
+		printf("(II): ");
+		break;
+	case X_WARNING:
+		printf("(WW): ");
+		break;
+	case X_ERROR:
+		printf("(EE): ");
+		break;
+	}
+
+	va_start(va, format);
+	vprintf(format, va);
+	va_end(va);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.am	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -1,48 +1,41 @@
-noinst_PROGRAMS = intel_reg_dumper \
+noinst_PROGRAMS = \
 	intel_gtt \
-	intel_idle \
-	intel_stepping \
 	intel_statuspage \
-	intel_hotplug
-
-intel_reg_dumper_SOURCES = \
-	main.c \
-	reg_dumper.h \
-	xprintf.c \
-	../i830_debug.c
+	intel_hotplug \
+	intel_lid \
+	intel_audio
 
 intel_gtt_SOURCES = \
 	gtt.c \
 	reg_dumper.h \
 	util.c
 
-intel_idle_SOURCES = \
-	idle.c \
-	reg_dumper.h \
-	xprintf.c \
-	../i830_debug.c
-
 intel_hotplug_SOURCES = \
 	hotplug.c \
 	reg_dumper.h \
-	xprintf.c \
-	../i830_debug.c
-
-intel_stepping_SOURCES = \
-	stepping.c
+	xprintf.c
 
 intel_statuspage_SOURCES = \
 	statuspage.c \
 	reg_dumper.h \
 	util.c
 
+intel_lid_SOURCES = \
+	lid.c \
+	reg_dumper.h \
+	util.c
+
+intel_audio_SOURCES = \
+	audio.c \
+	reg_dumper.h \
+	util.c
+
 intel_hotplug_LDADD = $(PCIACCESS_LIBS)
-intel_reg_dumper_LDADD = $(PCIACCESS_LIBS)
 intel_gtt_LDADD = $(PCIACCESS_LIBS)
-intel_idle_LDADD = $(PCIACCESS_LIBS)
-intel_stepping_LDADD = $(PCIACCESS_LIBS)
 intel_statuspage_LDADD = $(PCIACCESS_LIBS)
+intel_lid_LDADD = $(PCIACCESS_LIBS)
+intel_audio_LDADD = $(PCIACCESS_LIBS)
 
-AM_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
+AM_CFLAGS = $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
 	-I$(srcdir)/.. -DREG_DUMPER
 
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.in	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -32,64 +36,61 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = intel_reg_dumper$(EXEEXT) intel_gtt$(EXEEXT) \
-	intel_idle$(EXEEXT) intel_stepping$(EXEEXT) \
-	intel_statuspage$(EXEEXT) intel_hotplug$(EXEEXT)
+noinst_PROGRAMS = intel_gtt$(EXEEXT) intel_statuspage$(EXEEXT) \
+	intel_hotplug$(EXEEXT) intel_lid$(EXEEXT) intel_audio$(EXEEXT)
 subdir = src/reg_dumper
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
+am_intel_audio_OBJECTS = audio.$(OBJEXT) util.$(OBJEXT)
+intel_audio_OBJECTS = $(am_intel_audio_OBJECTS)
+am__DEPENDENCIES_1 =
+intel_audio_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_intel_gtt_OBJECTS = gtt.$(OBJEXT) util.$(OBJEXT)
 intel_gtt_OBJECTS = $(am_intel_gtt_OBJECTS)
-am__DEPENDENCIES_1 =
 intel_gtt_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_intel_hotplug_OBJECTS = hotplug.$(OBJEXT) xprintf.$(OBJEXT) \
-	i830_debug.$(OBJEXT)
+am_intel_hotplug_OBJECTS = hotplug.$(OBJEXT) xprintf.$(OBJEXT)
 intel_hotplug_OBJECTS = $(am_intel_hotplug_OBJECTS)
 intel_hotplug_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_intel_idle_OBJECTS = idle.$(OBJEXT) xprintf.$(OBJEXT) \
-	i830_debug.$(OBJEXT)
-intel_idle_OBJECTS = $(am_intel_idle_OBJECTS)
-intel_idle_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_intel_reg_dumper_OBJECTS = main.$(OBJEXT) xprintf.$(OBJEXT) \
-	i830_debug.$(OBJEXT)
-intel_reg_dumper_OBJECTS = $(am_intel_reg_dumper_OBJECTS)
-intel_reg_dumper_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_intel_lid_OBJECTS = lid.$(OBJEXT) util.$(OBJEXT)
+intel_lid_OBJECTS = $(am_intel_lid_OBJECTS)
+intel_lid_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_intel_statuspage_OBJECTS = statuspage.$(OBJEXT) util.$(OBJEXT)
 intel_statuspage_OBJECTS = $(am_intel_statuspage_OBJECTS)
 intel_statuspage_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_intel_stepping_OBJECTS = stepping.$(OBJEXT)
-intel_stepping_OBJECTS = $(am_intel_stepping_OBJECTS)
-intel_stepping_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(intel_gtt_SOURCES) $(intel_hotplug_SOURCES) \
-	$(intel_idle_SOURCES) $(intel_reg_dumper_SOURCES) \
-	$(intel_statuspage_SOURCES) $(intel_stepping_SOURCES)
-DIST_SOURCES = $(intel_gtt_SOURCES) $(intel_hotplug_SOURCES) \
-	$(intel_idle_SOURCES) $(intel_reg_dumper_SOURCES) \
-	$(intel_statuspage_SOURCES) $(intel_stepping_SOURCES)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(intel_audio_SOURCES) $(intel_gtt_SOURCES) \
+	$(intel_hotplug_SOURCES) $(intel_lid_SOURCES) \
+	$(intel_statuspage_SOURCES)
+DIST_SOURCES = $(intel_audio_SOURCES) $(intel_gtt_SOURCES) \
+	$(intel_hotplug_SOURCES) $(intel_lid_SOURCES) \
+	$(intel_statuspage_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -97,41 +98,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -139,12 +157,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -152,13 +169,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -172,26 +184,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -203,13 +216,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -223,7 +234,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -234,50 +244,39 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-intel_reg_dumper_SOURCES = \
-	main.c \
-	reg_dumper.h \
-	xprintf.c \
-	../i830_debug.c
-
 intel_gtt_SOURCES = \
 	gtt.c \
 	reg_dumper.h \
 	util.c
 
-intel_idle_SOURCES = \
-	idle.c \
-	reg_dumper.h \
-	xprintf.c \
-	../i830_debug.c
-
 intel_hotplug_SOURCES = \
 	hotplug.c \
 	reg_dumper.h \
-	xprintf.c \
-	../i830_debug.c
-
-intel_stepping_SOURCES = \
-	stepping.c
+	xprintf.c
 
 intel_statuspage_SOURCES = \
 	statuspage.c \
 	reg_dumper.h \
 	util.c
 
+intel_lid_SOURCES = \
+	lid.c \
+	reg_dumper.h \
+	util.c
+
+intel_audio_SOURCES = \
+	audio.c \
+	reg_dumper.h \
+	util.c
+
 intel_hotplug_LDADD = $(PCIACCESS_LIBS)
-intel_reg_dumper_LDADD = $(PCIACCESS_LIBS)
 intel_gtt_LDADD = $(PCIACCESS_LIBS)
-intel_idle_LDADD = $(PCIACCESS_LIBS)
-intel_stepping_LDADD = $(PCIACCESS_LIBS)
 intel_statuspage_LDADD = $(PCIACCESS_LIBS)
-AM_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
+intel_lid_LDADD = $(PCIACCESS_LIBS)
+intel_audio_LDADD = $(PCIACCESS_LIBS)
+AM_CFLAGS = $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
 	-I$(srcdir)/.. -DREG_DUMPER
 
 all: all-am
@@ -288,8 +287,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -320,24 +319,21 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+intel_audio$(EXEEXT): $(intel_audio_OBJECTS) $(intel_audio_DEPENDENCIES) 
+	@rm -f intel_audio$(EXEEXT)
+	$(LINK) $(intel_audio_LDFLAGS) $(intel_audio_OBJECTS) $(intel_audio_LDADD) $(LIBS)
 intel_gtt$(EXEEXT): $(intel_gtt_OBJECTS) $(intel_gtt_DEPENDENCIES) 
 	@rm -f intel_gtt$(EXEEXT)
-	$(LINK) $(intel_gtt_OBJECTS) $(intel_gtt_LDADD) $(LIBS)
+	$(LINK) $(intel_gtt_LDFLAGS) $(intel_gtt_OBJECTS) $(intel_gtt_LDADD) $(LIBS)
 intel_hotplug$(EXEEXT): $(intel_hotplug_OBJECTS) $(intel_hotplug_DEPENDENCIES) 
 	@rm -f intel_hotplug$(EXEEXT)
-	$(LINK) $(intel_hotplug_OBJECTS) $(intel_hotplug_LDADD) $(LIBS)
-intel_idle$(EXEEXT): $(intel_idle_OBJECTS) $(intel_idle_DEPENDENCIES) 
-	@rm -f intel_idle$(EXEEXT)
-	$(LINK) $(intel_idle_OBJECTS) $(intel_idle_LDADD) $(LIBS)
-intel_reg_dumper$(EXEEXT): $(intel_reg_dumper_OBJECTS) $(intel_reg_dumper_DEPENDENCIES) 
-	@rm -f intel_reg_dumper$(EXEEXT)
-	$(LINK) $(intel_reg_dumper_OBJECTS) $(intel_reg_dumper_LDADD) $(LIBS)
+	$(LINK) $(intel_hotplug_LDFLAGS) $(intel_hotplug_OBJECTS) $(intel_hotplug_LDADD) $(LIBS)
+intel_lid$(EXEEXT): $(intel_lid_OBJECTS) $(intel_lid_DEPENDENCIES) 
+	@rm -f intel_lid$(EXEEXT)
+	$(LINK) $(intel_lid_LDFLAGS) $(intel_lid_OBJECTS) $(intel_lid_LDADD) $(LIBS)
 intel_statuspage$(EXEEXT): $(intel_statuspage_OBJECTS) $(intel_statuspage_DEPENDENCIES) 
 	@rm -f intel_statuspage$(EXEEXT)
-	$(LINK) $(intel_statuspage_OBJECTS) $(intel_statuspage_LDADD) $(LIBS)
-intel_stepping$(EXEEXT): $(intel_stepping_OBJECTS) $(intel_stepping_DEPENDENCIES) 
-	@rm -f intel_stepping$(EXEEXT)
-	$(LINK) $(intel_stepping_OBJECTS) $(intel_stepping_LDADD) $(LIBS)
+	$(LINK) $(intel_statuspage_LDFLAGS) $(intel_statuspage_OBJECTS) $(intel_statuspage_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -345,64 +341,52 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hotplug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i830_debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statuspage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stepping.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xprintf.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-i830_debug.o: ../i830_debug.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i830_debug.o -MD -MP -MF $(DEPDIR)/i830_debug.Tpo -c -o i830_debug.o `test -f '../i830_debug.c' || echo '$(srcdir)/'`../i830_debug.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/i830_debug.Tpo $(DEPDIR)/i830_debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../i830_debug.c' object='i830_debug.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i830_debug.o `test -f '../i830_debug.c' || echo '$(srcdir)/'`../i830_debug.c
-
-i830_debug.obj: ../i830_debug.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i830_debug.obj -MD -MP -MF $(DEPDIR)/i830_debug.Tpo -c -o i830_debug.obj `if test -f '../i830_debug.c'; then $(CYGPATH_W) '../i830_debug.c'; else $(CYGPATH_W) '$(srcdir)/../i830_debug.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/i830_debug.Tpo $(DEPDIR)/i830_debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../i830_debug.c' object='i830_debug.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i830_debug.obj `if test -f '../i830_debug.c'; then $(CYGPATH_W) '../i830_debug.c'; else $(CYGPATH_W) '$(srcdir)/../i830_debug.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -414,8 +398,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -425,12 +409,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -444,21 +429,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -506,7 +492,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -520,20 +506,12 @@ info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -554,22 +532,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/README.OpenBSD new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/README.OpenBSD
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/README.OpenBSD	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/README.OpenBSD	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,5 @@
+To use the reg dumper program on a running X server you need :
+
+- to build a kernel with 'options INSECURE' and reboot in it
+- to set 'securelevel=-1' in /etc/rc.securelevel
+- to run intel_reg_dumper as root. 
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/reg_dumper.h new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/reg_dumper.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/reg_dumper.h	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/reg_dumper.h	2011-02-08 11:14:00.000000000 +0100
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <pciaccess.h>
 #include "common.h"
 
 /** @file
@@ -45,27 +46,21 @@ typedef char Bool;
 #define X_WARNING 1
 #define X_ERROR 2
 
-struct pci_info_rec {
-    uint16_t chipType;
-};
-
 typedef struct _i830 {
-    /* Fields in common with the real pI830 */
-    struct pci_info_rec *PciInfo;
-    Bool use_drm_mode;
-
-    /* Fields used for setting up reg_dumper */
-    struct pci_device *pci_dev;
-    struct pci_info_rec pci_info_rec;
-    volatile unsigned char *mmio;
+	/* Fields in common with the real pI830 */
+	struct pci_device *PciInfo;
+	Bool use_drm_mode;
+
+	/* Fields used for setting up reg_dumper */
+	volatile unsigned char *mmio;
 } I830Rec, *I830Ptr;
 
 typedef struct _scrn {
-    /* Fields in common with the real pScrn */
-    int scrnIndex;
+	/* Fields in common with the real pScrn */
+	int scrnIndex;
 
-    /* Fields used for setting up reg_dumper */
-    I830Ptr pI830;
+	/* Fields used for setting up reg_dumper */
+	I830Ptr pI830;
 } ScrnInfoRec, *ScrnInfoPtr;
 
 #define I830PTR(pScrn) (pScrn->pI830)
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/statuspage.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/statuspage.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/statuspage.c	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/statuspage.c	2011-02-08 11:14:00.000000000 +0100
@@ -41,41 +41,41 @@
 
 int main(int argc, char **argv)
 {
-    I830Rec i830;
-    I830Ptr pI830 = &i830;
-    int devmem;
-    uint32_t hws_offset;
-    volatile uint32_t *hws;
+	I830Rec i830;
+	I830Ptr pI830 = &i830;
+	int devmem;
+	uint32_t hws_offset;
+	volatile uint32_t *hws;
 
-    intel_i830rec_init(pI830);
+	intel_i830rec_init(pI830);
 
-    if (HWS_NEED_GFX(pI830))
-	errx(1, "status page in graphics virtual unsupported.\n");
+	if (HWS_NEED_GFX(pI830))
+		errx(1, "status page in graphics virtual unsupported.\n");
 
-    hws_offset = INREG(HWS_PGA);
+	hws_offset = INREG(HWS_PGA);
 
-    devmem = open("/dev/mem", O_RDWR, 0);
-    if (devmem == -1)
-	err(1, "Couldn't open /dev/mem");
+	devmem = open("/dev/mem", O_RDWR, 0);
+	if (devmem == -1)
+		err(1, "Couldn't open /dev/mem");
 
-    hws = mmap(NULL, 4096, PROT_READ, MAP_SHARED, devmem, hws_offset);
-    if (hws == MAP_FAILED)
-	err(1, "Couldn't map /dev/mem at 0x%08x", hws_offset);
+	hws = mmap(NULL, 4096, PROT_READ, MAP_SHARED, devmem, hws_offset);
+	if (hws == MAP_FAILED)
+		err(1, "Couldn't map /dev/mem at 0x%08x", hws_offset);
 
-    close(devmem);
+	close(devmem);
 
-    for (;;) {
-	int i;
+	for (;;) {
+		int i;
 
-	printf("\n");
+		printf("\n");
 
-	for (i = 0; i < 64; i += 4) {
-	    printf("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i * 4,
-		   hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);
-	}
+		for (i = 0; i < 64; i += 4) {
+			printf("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i * 4,
+			       hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);
+		}
 
-	sleep(1);
-    }
+		sleep(1);
+	}
 
-    return 0;
+	return 0;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/util.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/util.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/util.c	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/util.c	2011-02-08 11:14:00.000000000 +0100
@@ -41,46 +41,45 @@
  */
 void intel_i830rec_init(I830Ptr pI830)
 {
-    struct pci_device *dev;
-    int err, mmio_bar;
-    void *mmio;
-
-    err = pci_system_init();
-    if (err != 0) {
-	fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err));
-	exit(1);
-    }
-
-    /* Grab the graphics card */
-    dev = pci_device_find_by_slot(0, 0, 2, 0);
-    if (dev == NULL)
-	errx(1, "Couldn't find graphics card");
-
-    err = pci_device_probe(dev);
-    if (err != 0) {
-	fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
-	exit(1);
-    }
-
-    if (dev->vendor_id != 0x8086)
-	errx(1, "Graphics card is non-intel");
-
-    pI830->PciInfo = &pI830->pci_info_rec;
-    pI830->PciInfo->chipType = dev->device_id;
-
-    pI830->pci_dev = dev;
-
-    mmio_bar = IS_I9XX(pI830) ? 0 : 1;
-
-    err = pci_device_map_range (dev,
-				dev->regions[mmio_bar].base_addr,
-				dev->regions[mmio_bar].size,
-				PCI_DEV_MAP_FLAG_WRITABLE,
-				&mmio);
-
-    if (err != 0) {
-	fprintf(stderr, "Couldn't map MMIO region: %s\n", strerror(err));
-	exit(1);
-    }
-    pI830->mmio = mmio;
+	struct pci_device *dev;
+	int err, mmio_bar;
+	void *mmio;
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+
+	pI830->PciInfo = dev;
+
+	mmio_bar = IS_I9XX(pI830) ? 0 : 1;
+
+	err = pci_device_map_range(dev,
+				   dev->regions[mmio_bar].base_addr,
+				   dev->regions[mmio_bar].size,
+				   PCI_DEV_MAP_FLAG_WRITABLE, &mmio);
+
+	if (err != 0) {
+		fprintf(stderr, "Couldn't map MMIO region: %s\n",
+			strerror(err));
+		exit(1);
+	}
+	pI830->mmio = mmio;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/xprintf.c new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/xprintf.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/xprintf.c	2008-08-02 07:12:48.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper/xprintf.c	2011-02-08 11:14:00.000000000 +0100
@@ -28,33 +28,31 @@
 #include <stdarg.h>
 #include "reg_dumper.h"
 
-static char *
-XNFvprintf(const char *format, va_list va)
+static char *XNFvprintf(const char *format, va_list va)
 {
-    char *ret;
-    int size;
-    va_list va2;
+	char *ret;
+	int size;
+	va_list va2;
 
-    va_copy(va2, va);
-    size = vsnprintf(NULL, 0, format, va2);
-    va_end(va2);
+	va_copy(va2, va);
+	size = vsnprintf(NULL, 0, format, va2);
+	va_end(va2);
 
-    ret = (char *)malloc(size + 1);
-    if (ret == NULL)
-        return NULL;
+	ret = (char *)malloc(size + 1);
+	if (ret == NULL)
+		return NULL;
 
-    vsnprintf(ret, size + 1, format, va);
-    ret[size] = 0;
-    return ret;
+	vsnprintf(ret, size + 1, format, va);
+	ret[size] = 0;
+	return ret;
 }
 
-char *
-XNFprintf(const char *format, ...)
+char *XNFprintf(const char *format, ...)
 {
-    char *ret;
-    va_list va;
-    va_start(va, format);
-    ret = XNFvprintf(format, va);
-    va_end(va);
-    return ret;
+	char *ret;
+	va_list va;
+	va_start(va, format);
+	ret = XNFvprintf(format, va);
+	va_end(va);
+	return ret;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Packard <keithp@keithp.com>
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+/*
+ * Inputs (note all sub-register addresses are bytes, not float indices)
+ *
+ * Note that the vertices will have been reordered:
+ *
+ * V0 is topmost (leftmost among topmost) (upper left)
+ * V1 is next clockwise (lower right)
+ * V2 is remaining (lower left)
+ *
+ *  V0 ...................... XX
+ *  |                          .
+ *  |                          .
+ *  |                          .
+ *  V2------------------------V1
+ *
+ *  G0	    thread state -- just pass along
+ *
+ *  G1 and G2 are fixed by SF spec
+ *
+ *  G1.0    reserved
+ *  G1.4    Provoking vertex
+ *  G1.8    Determinant
+ *  G1.12   X1 - X0
+ *  G1.16   X2 - X0
+ *  G1.20   Y1 - Y0
+ *  G1.24   Y2 - Y0
+ *  G1.30   reserved
+ *
+ *  G2.0    Z0
+ *  G2.4    1/W0
+ *  G2.8    Z1
+ *  G2.12   1/W1
+ *  G2.16   Z2
+ *  G2.20   1/W2
+ *  G2.24   reserved
+ *  G2.30   reserved
+ *
+ *  G3 is V0 Vertex Attribute Data from URB (upper left)
+ *
+ *  G3.0    u0
+ *  G3.4    v0
+ *
+ *  G4 is V1 Vertex Attribute Data from URB (lower right)
+ *
+ *  G4.0    u1
+ *  G4.4    v1
+ *
+ *  G5 is V2 Vertex Attribute Data from URB (lower left)
+ *
+ */
+
+/* Compute inverses of the input deltas */
+send (4) 0 g6<1>F g1.12<4,4,1>F math inv mlen 1 rlen 1 { align1 };
+
+/* texture location at V0 */
+mov (4) m3<1>F g3<4,4,1>F { align1 };
+
+/* compute V1 - V2 (motion in X) for texture coordinates */
+add (4) g7<1>F g4<4,4,1>F -g5<4,4,1>F { align1 };
+
+/* multiply by 1/dx */
+mul (4) m1<1>F g7<4,4,1>F g6.0<0,1,0>F { align1 };
+
+/* Compute V2 - V0 (motion in Y) for texture coordinates */
+add (4) g7<1>F g5<4,4,1>F -g3<4,4,1>F { align1 };
+
+/* multiply by 1/dy */
+mul (4) m2<1>F g7<4,4,1>F g6.8<0,1,0>F {align1 };
+
+/* and we're done */
+send (8) 0 null g0<8,8,1>F urb 0 transpose used complete mlen 4 rlen 0 { align1 EOT };
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00400031, 0x20c01fbd, 0x0069002c, 0x01110001 },
+   { 0x00400001, 0x206003be, 0x00690060, 0x00000000 },
+   { 0x00400040, 0x20e077bd, 0x00690080, 0x006940a0 },
+   { 0x00400041, 0x202077be, 0x006900e0, 0x000000c0 },
+   { 0x00400040, 0x20e077bd, 0x006900a0, 0x00694060 },
+   { 0x00400041, 0x204077be, 0x006900e0, 0x000000c8 },
+   { 0x00600031, 0x20001fbc, 0x008d0000, 0x8640c800 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00400031, 0x20c01fbd, 0x1069002c, 0x02100001 },
+   { 0x00400001, 0x206003be, 0x00690060, 0x00000000 },
+   { 0x00400040, 0x20e077bd, 0x00690080, 0x006940a0 },
+   { 0x00400041, 0x202077be, 0x006900e0, 0x000000c0 },
+   { 0x00400040, 0x20e077bd, 0x006900a0, 0x00694060 },
+   { 0x00400041, 0x204077be, 0x006900e0, 0x000000c8 },
+   { 0x00600031, 0x20001fbc, 0x648d0000, 0x8808c800 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Packard <keithp@keithp.com>
+ *    Eric Anholt <eric@anholt.net>
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ */
+
+/*
+ * Inputs (note all sub-register addresses are bytes, not float indices)
+ *
+ * Note that the vertices will have been reordered:
+ *
+ * V0 is topmost (leftmost among topmost) (upper left)
+ * V1 is next clockwise (lower right)
+ * V2 is remaining (lower left)
+ *
+ *  V0 ...................... XX
+ *  |                          .
+ *  |                          .
+ *  |                          .
+ *  V2------------------------V1
+ *
+ *  G0	    thread state -- just pass along
+ *
+ *  G1 and G2 are fixed by SF spec
+ *
+ *  G1.0    reserved
+ *  G1.4    Provoking vertex
+ *  G1.8    Determinant
+ *  G1.12   X1 - X0
+ *  G1.16   X2 - X0
+ *  G1.20   Y1 - Y0
+ *  G1.24   Y2 - Y0
+ *  G1.30   reserved
+ *
+ *  G2.0    Z0
+ *  G2.4    1/W0
+ *  G2.8    Z1
+ *  G2.12   1/W1
+ *  G2.16   Z2
+ *  G2.20   1/W2
+ *  G2.24   reserved
+ *  G2.30   reserved
+ *
+ *  G3 is V0 Vertex Attribute Data from URB (upper left)
+ *
+ *  G3.0    u0
+ *  G3.4    v0
+ *
+ *  G4 is V1 Vertex Attribute Data from URB (lower right)
+ *
+ *  G4.0    u1
+ *  G4.4    v1
+ *
+ *  G5 is V2 Vertex Attribute Data from URB (lower left)
+ *
+ */
+
+/* Compute inverses of the input deltas */
+send (4) 0 g6<1>F g1.12<4,4,1>F math inv mlen 1 rlen 1 { align1 };
+
+/* texture location at V0 */
+mov (8) m3<1>F g3<8,8,1>F { align1 };
+
+/* compute V1 - V2 (motion in X) for texture coordinates */
+add (8) g7<1>F g4<8,8,1>F -g5<8,8,1>F { align1 };
+
+/* multiply by 1/dx */
+mul (8) m1<1>F g7<8,8,1>F g6.0<0,1,0>F { align1 };
+
+/* Compute V2 - V0 (motion in Y) for texture coordinates */
+add (8) g7<1>F g5<8,8,1>F -g3<8,8,1>F { align1 };
+
+/* multiply by 1/dy */
+mul (8) m2<1>F g7<8,8,1>F g6.8<0,1,0>F {align1 };
+
+/* and we're done */
+send (8) 0 null g0<8,8,1>F urb 0 transpose used complete mlen 4 rlen 0 { align1 EOT };
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00400031, 0x20c01fbd, 0x0069002c, 0x01110001 },
+   { 0x00600001, 0x206003be, 0x008d0060, 0x00000000 },
+   { 0x00600040, 0x20e077bd, 0x008d0080, 0x008d40a0 },
+   { 0x00600041, 0x202077be, 0x008d00e0, 0x000000c0 },
+   { 0x00600040, 0x20e077bd, 0x008d00a0, 0x008d4060 },
+   { 0x00600041, 0x204077be, 0x008d00e0, 0x000000c8 },
+   { 0x00600031, 0x20001fbc, 0x008d0000, 0x8640c800 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00400031, 0x20c01fbd, 0x1069002c, 0x02100001 },
+   { 0x00600001, 0x206003be, 0x008d0060, 0x00000000 },
+   { 0x00600040, 0x20e077bd, 0x008d0080, 0x008d40a0 },
+   { 0x00600041, 0x202077be, 0x008d00e0, 0x000000c0 },
+   { 0x00600040, 0x20e077bd, 0x008d00a0, 0x008d4060 },
+   { 0x00600041, 0x204077be, 0x008d00e0, 0x000000c8 },
+   { 0x00600031, 0x20001fbc, 0x648d0000, 0x8808c800 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_affine.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_affine.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_affine.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_affine.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/*
+ * Fragment to compute src u/v values under an affine transform
+ */
+
+/********** Compute u *************/
+
+mul (16)	temp_x<1>F	dst_x<8,8,1>F	du_dx		{ compr align1 };
+mul (16)	temp_y<1>F	dst_y<8,8,1>F	du_dy		{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	temp_y<8,8,1>F	{ compr align1 };
+add (16)	u<1>F		temp_x<8,8,1>F	uo		{ compr align1 };
+
+/********** Compute v *************/
+
+mul (16)	temp_x<1>F	dst_x<8,8,1>F	dv_dx		{ compr align1 };
+mul (16)	temp_y<1>F	dst_y<8,8,1>F	dv_dy		{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	temp_y<8,8,1>F	{ compr align1 };
+add (16)	v<1>F		temp_x<8,8,1>F	vo		{ compr align1 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+ 
+/*
+ * Composite src and mask together, no component alpha
+ */
+
+include(`exa_wm.g4i')
+
+/* mul mask rgba channels to src */
+mul (16)    src_sample_r_01<1>F	src_sample_r_01<8,8,1>F	mask_sample_r_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_g_01<1>F src_sample_g_01<8,8,1>F	mask_sample_g_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_b_01<1>F src_sample_b_01<8,8,1>F	mask_sample_b_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_a_01<1>F src_sample_a_01<8,8,1>F	mask_sample_a_01<8,8,1>F { compr align1 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00802041, 0x21c077bd, 0x008d01c0, 0x008d02c0 },
+   { 0x00802041, 0x220077bd, 0x008d0200, 0x008d0300 },
+   { 0x00802041, 0x224077bd, 0x008d0240, 0x008d0340 },
+   { 0x00802041, 0x228077bd, 0x008d0280, 0x008d0380 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00802041, 0x21c077bd, 0x008d01c0, 0x008d02c0 },
+   { 0x00802041, 0x220077bd, 0x008d0200, 0x008d0300 },
+   { 0x00802041, 0x224077bd, 0x008d0240, 0x008d0340 },
+   { 0x00802041, 0x228077bd, 0x008d0280, 0x008d0380 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+ 
+/*
+ * Composite src and mask together, no component alpha
+ */
+
+include(`exa_wm.g4i')
+
+mul (16)    src_sample_r_01<1>F mask_sample_r_01<8,8,1>F src_sample_a_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_g_01<1>F mask_sample_g_01<8,8,1>F src_sample_a_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_b_01<1>F mask_sample_b_01<8,8,1>F src_sample_a_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_a_01<1>F mask_sample_a_01<8,8,1>F src_sample_a_01<8,8,1>F { compr align1 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00802041, 0x21c077bd, 0x008d02c0, 0x008d0280 },
+   { 0x00802041, 0x220077bd, 0x008d0300, 0x008d0280 },
+   { 0x00802041, 0x224077bd, 0x008d0340, 0x008d0280 },
+   { 0x00802041, 0x228077bd, 0x008d0380, 0x008d0280 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca_srcalpha.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00802041, 0x21c077bd, 0x008d02c0, 0x008d0280 },
+   { 0x00802041, 0x220077bd, 0x008d0300, 0x008d0280 },
+   { 0x00802041, 0x224077bd, 0x008d0340, 0x008d0280 },
+   { 0x00802041, 0x228077bd, 0x008d0380, 0x008d0280 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,156 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+ 
+/*
+ * Input parameters
+ */
+
+/* Destination X/Y */
+define(`dst_x_uw',  `g1.8<2,4,0>UW')
+define(`dst_y_uw',  `g1.10<2,4,0>UW')
+define(`screen_x0', `g1.0<0,1,0>F')
+define(`screen_y0', `g1.4<0,1,0>F')
+
+/* Source transformation parameters */
+define(`src_du_dx', `g3.0<0,1,0>F')
+define(`src_du_dy', `g3.4<0,1,0>F')
+define(`src_uo',    `g3.12<0,1,0>F')
+define(`src_dv_dx', `g3.16<0,1,0>F')
+define(`src_dv_dy', `g3.20<0,1,0>F')
+define(`src_vo',    `g3.28<0,1,0>F')
+define(`src_dw_dx', `g4.0<0,1,0>F')
+define(`src_dw_dy', `g4.4<0,1,0>F')
+define(`src_wo',    `g4.12<0,1,0>F')
+
+define(`mask_du_dx', `g5.0<0,1,0>F')
+define(`mask_du_dy', `g5.4<0,1,0>F')
+define(`mask_uo',    `g5.12<0,1,0>F')
+define(`mask_dv_dx', `g5.16<0,1,0>F')
+define(`mask_dv_dy', `g5.20<0,1,0>F')
+define(`mask_vo',    `g5.28<0,1,0>F')
+define(`mask_dw_dx', `g6.0<0,1,0>F')
+define(`mask_dw_dy', `g6.4<0,1,0>F')
+define(`mask_wo',    `g6.12<0,1,0>F')
+
+/*
+ * Local variables. Pairs must be aligned on even reg boundry
+ */
+
+/* this holds the X dest coordinates */
+define(`dst_x',	    `g8')
+define(`dst_x_0',   `dst_x')
+define(`dst_x_1',   `g9')
+
+/* this holds the Y dest coordinates */
+define(`dst_y',	    `g10')
+define(`dst_y_0',   `dst_y')
+define(`dst_y_1',   `g11')
+
+/* When computing x * dn/dx, use this */
+define(`temp_x',    `g30')
+define(`temp_x_0',  `temp_x')
+define(`temp_x_1',  `g31')
+
+/* When computing y * dn/dy, use this */
+define(`temp_y',    `g28')
+define(`temp_y_0',  temp_y)
+define(`temp_y_1',  `g29')
+
+/* when loading x/y, use these to hold them in UW format */
+define(`temp_x_uw', temp_x)
+define(`temp_y_uw', temp_y)
+
+/* compute source and mask u/v to this pair to send to sampler */
+define(`src_msg',   `m1')
+define(`src_msg_ind',`1')
+define(`src_u',	    `m2')
+define(`src_v',	    `m4')
+define(`src_w',	    `g12')
+define(`src_w_0',   `src_w')
+define(`src_w_1',   `g13')
+
+define(`mask_msg',  `m7')
+define(`mask_msg_ind',`7')
+define(`mask_u',    `m8')
+define(`mask_v',    `m10')
+define(`mask_w',    `src_w')
+define(`mask_w_0',  `src_w_0')
+define(`mask_w_1',  `src_w_1')
+
+/* sample src to these registers */
+define(`src_sample_base',	`g14')
+
+define(`src_sample_r',		`g14')
+define(`src_sample_r_01',	`g14')
+define(`src_sample_r_23',	`g15')
+
+define(`src_sample_g',		`g16')
+define(`src_sample_g_01',	`g16')
+define(`src_sample_g_23',	`g17')
+
+define(`src_sample_b',		`g18')
+define(`src_sample_b_01',	`g18')
+define(`src_sample_b_23',	`g19')
+
+define(`src_sample_a',		`g20')
+define(`src_sample_a_01',	`g20')
+define(`src_sample_a_23',	`g21')
+
+/* sample mask to these registers */
+define(`mask_sample_base',	`g22')
+    
+define(`mask_sample_r',		`g22')
+define(`mask_sample_r_01',	`g22')
+define(`mask_sample_r_23',	`g23')
+    
+define(`mask_sample_g',		`g24')
+define(`mask_sample_g_01',	`g24')
+define(`mask_sample_g_23',	`g25')
+    
+define(`mask_sample_b',		`g26')
+define(`mask_sample_b_01',	`g26')
+define(`mask_sample_b_23',	`g27')
+    
+define(`mask_sample_a',		`g28')
+define(`mask_sample_a_01',	`g28')
+define(`mask_sample_a_23',	`g29')
+
+/* data port SIMD16 send registers */
+
+define(`data_port_msg_0',	`m0')
+define(`data_port_msg_0_ind',	`0')
+define(`data_port_msg_1',	`m1')
+define(`data_port_r_01',	`m2')
+define(`data_port_g_01',	`m3')
+define(`data_port_b_01',	`m4')
+define(`data_port_a_01',	`m5')
+
+define(`data_port_r_23',	`m6')
+define(`data_port_g_23',	`m7')
+define(`data_port_b_23',	`m8')
+define(`data_port_a_23',	`m9')
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+include(`exa_wm.g4i')
+
+define(`du_dx',	`mask_du_dx')
+define(`du_dy',	`mask_du_dy')
+define(`uo',	`mask_uo')
+
+define(`dv_dx',	`mask_dv_dx')
+define(`dv_dy',	`mask_dv_dy')
+define(`vo',	`mask_vo')
+
+define(`u',	`mask_u')
+define(`v',	`mask_v')
+
+include(`exa_wm_affine.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,8 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000a0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000a4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x210077be, 0x008d03c0, 0x000000ac },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000b0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000b4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x214077be, 0x008d03c0, 0x000000bc },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,8 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000a0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000a4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x210077be, 0x008d03c0, 0x000000ac },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000b0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000b4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x214077be, 0x008d03c0, 0x000000bc },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+include(`exa_wm.g4i')
+
+define(`du_dx',	`mask_du_dx')
+define(`du_dy',	`mask_du_dy')
+define(`uo',	`mask_uo')
+
+define(`dv_dx',	`mask_dv_dx')
+define(`dv_dy',	`mask_dv_dy')
+define(`vo',	`mask_vo')
+
+define(`dw_dx',	`mask_dw_dx')
+define(`dw_dy',	`mask_dw_dy')
+define(`wo',	`mask_wo')
+
+define(`u',	`mask_u')
+define(`v',	`mask_v')
+define(`w',	`mask_w')
+
+define(`u_0',	`mask_u_0')
+define(`v_0',	`mask_v_0')
+define(`u_1',	`mask_u_1')
+define(`v_1',	`mask_v_1')
+define(`w_0',	`mask_w_0')
+define(`w_1',	`mask_w_1')
+
+include(`exa_wm_projective.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,16 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000c0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000c4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x000000cc },
+   { 0x00600031, 0x21801fbd, 0x008d03c0, 0x01110001 },
+   { 0x00600031, 0x21a01fbd, 0x008d03e0, 0x01110001 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000a0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000a4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x000000ac },
+   { 0x00802041, 0x210077be, 0x008d03c0, 0x008d0180 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000b0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000b4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x000000bc },
+   { 0x00802041, 0x214077be, 0x008d03c0, 0x008d0180 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,16 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000c0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000c4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x000000cc },
+   { 0x00600031, 0x21801fbd, 0x108d03c0, 0x02100001 },
+   { 0x00600031, 0x21a01fbd, 0x108d03e0, 0x02100001 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000a0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000a4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x000000ac },
+   { 0x00802041, 0x210077be, 0x008d03c0, 0x008d0180 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x000000b0 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x000000b4 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x000000bc },
+   { 0x00802041, 0x214077be, 0x008d03c0, 0x008d0180 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/* Sample the mask surface */
+
+include(`exa_wm.g4i')
+
+/* prepare sampler read back gX register, which would be written back to output */
+
+/* use simd16 sampler, param 0 is u, param 1 is v. */
+/* 'payload' loading, assuming tex coord start from g4 */
+
+/* load only alpha */
+mov (1) g0.8<1>UD	0x00007000UD { align1 mask_disable };
+
+/* mask_msg will be copied with g0, as it contains send desc */
+/* emit sampler 'send' cmd */
+send (16) mask_msg_ind		/* msg reg index */
+	mask_sample_a_01<1>UW 	/* readback */
+	g0<8,8,1>UW		/* copy to msg start reg*/
+	sampler (2,1,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+				/* here(src->dst) we should use src_sampler and src_surface */
+	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00007000 },
+   { 0x07800031, 0x23801d29, 0x008d0000, 0x02520102 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00007000 },
+   { 0x07800031, 0x23801d29, 0x208d0000, 0x0a2a0102 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/* Sample the mask surface */
+
+include(`exa_wm.g4i')
+
+/* prepare sampler read back gX register, which would be written back to output */
+
+/* use simd16 sampler, param 0 is u, param 1 is v. */
+/* 'payload' loading, assuming tex coord start from g4 */
+
+/* load argb */
+mov (1) g0.8<1>UD	0x00000000UD { align1 mask_disable };
+
+/* mask_msg will be copied with g0, as it contains send desc */
+/* emit sampler 'send' cmd */
+send (16) mask_msg_ind		/* msg reg index */
+	mask_sample_base<1>UW 	/* readback */
+	g0<8,8,1>UW		/* copy to msg start reg*/
+	sampler (2,1,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+				/* here(src->dst) we should use src_sampler and src_surface */
+	mlen 5 rlen 8 { align1 };   /* required message len 5, readback len 8 */
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
+   { 0x07800031, 0x22c01d29, 0x008d0000, 0x02580102 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
+   { 0x07800031, 0x22c01d29, 0x208d0000, 0x0a8a0102 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+ 
+/*
+ * Composite src and mask together, no component alpha
+ */
+
+include(`exa_wm.g4i')
+/* mul mask's alpha channel to src */
+
+mul (16)    src_sample_r_01<1>F	src_sample_r_01<8,8,1>F	mask_sample_a_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_g_01<1>F src_sample_g_01<8,8,1>F	mask_sample_a_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_b_01<1>F src_sample_b_01<8,8,1>F	mask_sample_a_01<8,8,1>F { compr align1 };
+mul (16)    src_sample_a_01<1>F src_sample_a_01<8,8,1>F	mask_sample_a_01<8,8,1>F { compr align1 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00802041, 0x21c077bd, 0x008d01c0, 0x008d0380 },
+   { 0x00802041, 0x220077bd, 0x008d0200, 0x008d0380 },
+   { 0x00802041, 0x224077bd, 0x008d0240, 0x008d0380 },
+   { 0x00802041, 0x228077bd, 0x008d0280, 0x008d0380 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_noca.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00802041, 0x21c077bd, 0x008d01c0, 0x008d0380 },
+   { 0x00802041, 0x220077bd, 0x008d0200, 0x008d0380 },
+   { 0x00802041, 0x224077bd, 0x008d0240, 0x008d0380 },
+   { 0x00802041, 0x228077bd, 0x008d0280, 0x008d0380 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_projective.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_projective.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_projective.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_projective.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/********** Compute w *************/
+
+mul (16)	temp_x<1>F	dst_x<8,8,1>F	dw_dx		{ compr align1 };
+mul (16)	temp_y<1>F	dst_y<8,8,1>F	dw_dy		{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	temp_y<8,8,1>F	{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	wo		{ compr align1 };
+send (8) 0	w_0<1>F		temp_x_0<8,8,1>F math inv mlen 1 rlen 1	{ align1 };
+send (8) 0	w_1<1>F		temp_x_1<8,8,1>F math inv mlen 1 rlen 1	{ sechalf align1 };
+
+/********** Compute u *************/
+
+mul (16)	temp_x<1>F	dst_x<8,8,1>F	du_dx		{ compr align1 };
+mul (16)	temp_y<1>F	dst_y<8,8,1>F	du_dy		{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	temp_y<8,8,1>F	{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	uo		{ compr align1 };
+mul (16)	u<1>F		temp_x<8,8,1>F	w<8,8,1>F	{ compr align1 };
+
+/********** Compute v *************/
+
+mul (16)	temp_x<1>F	dst_x<8,8,1>F	dv_dx		{ compr align1 };
+mul (16)	temp_y<1>F	dst_y<8,8,1>F	dv_dy		{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	temp_y<8,8,1>F	{ compr align1 };
+add (16)	temp_x<1>F	temp_x<8,8,1>F	vo		{ compr align1 };
+mul (16)	v<1>F		temp_x<8,8,1>F	w<8,8,1>F	{ compr align1 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/*
+ * Fragment to compute src u/v values under an affine transform
+ */
+
+include(`exa_wm.g4i')
+
+define(`du_dx',	`src_du_dx')
+define(`du_dy',	`src_du_dy')
+define(`uo',	`src_uo')
+
+define(`dv_dx',	`src_dv_dx')
+define(`dv_dy',	`src_dv_dy')
+define(`vo',	`src_vo')
+
+define(`u',	`src_u')
+define(`v',	`src_v')
+
+include(`exa_wm_affine.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,8 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000060 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000064 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x204077be, 0x008d03c0, 0x0000006c },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000070 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000074 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x208077be, 0x008d03c0, 0x0000007c },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,8 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000060 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000064 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x204077be, 0x008d03c0, 0x0000006c },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000070 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000074 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x208077be, 0x008d03c0, 0x0000007c },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+
+include(`exa_wm.g4i')
+define(`du_dx',	`src_du_dx')
+define(`du_dy',	`src_du_dy')
+define(`uo',	`src_uo')
+define(`dv_dx',	`src_dv_dx')
+define(`dv_dy',	`src_dv_dy')
+define(`vo',	`src_vo')
+define(`dw_dx',	`src_dw_dx')
+define(`dw_dy',	`src_dw_dy')
+define(`wo',	`src_wo')
+define(`u',	`src_u')
+define(`v',	`src_v')
+define(`w',	`src_w')
+define(`u_0',	`src_u_0')
+define(`v_0',	`src_v_0')
+define(`u_1',	`src_u_1')
+define(`v_1',	`src_v_1')
+define(`w_0',	`src_w_0')
+define(`w_1',	`src_w_1')
+
+include(`exa_wm_projective.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,16 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000080 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000084 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x0000008c },
+   { 0x00600031, 0x21801fbd, 0x008d03c0, 0x01110001 },
+   { 0x00600031, 0x21a01fbd, 0x008d03e0, 0x01110001 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000060 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000064 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x0000006c },
+   { 0x00802041, 0x204077be, 0x008d03c0, 0x008d0180 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000070 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000074 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x0000007c },
+   { 0x00802041, 0x208077be, 0x008d03c0, 0x008d0180 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,16 @@
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000080 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000084 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x0000008c },
+   { 0x00600031, 0x21801fbd, 0x108d03c0, 0x02100001 },
+   { 0x00600031, 0x21a01fbd, 0x108d03e0, 0x02100001 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000060 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000064 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x0000006c },
+   { 0x00802041, 0x204077be, 0x008d03c0, 0x008d0180 },
+   { 0x00802041, 0x23c077bd, 0x008d0100, 0x00000070 },
+   { 0x00802041, 0x238077bd, 0x008d0140, 0x00000074 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x008d0380 },
+   { 0x00802040, 0x23c077bd, 0x008d03c0, 0x0000007c },
+   { 0x00802041, 0x208077be, 0x008d03c0, 0x008d0180 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/* Sample the src surface */
+
+include(`exa_wm.g4i')
+
+/* prepare sampler read back gX register, which would be written back to output */
+
+/* use simd16 sampler, param 0 is u, param 1 is v. */
+/* 'payload' loading, assuming tex coord start from g4 */
+
+/* load alpha */
+mov (1) g0.8<1>UD	0x00007000UD { align1 mask_disable };
+
+/* src_msg will be copied with g0, as it contains send desc */
+/* emit sampler 'send' cmd */
+send (16) src_msg_ind		/* msg reg index */
+	src_sample_a_01<1>UW 	/* readback */
+	g0<8,8,1>UW		/* copy to msg start reg*/
+	sampler (1,0,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+				/* here(src->dst) we should use src_sampler and src_surface */
+	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00007000 },
+   { 0x01800031, 0x22801d29, 0x008d0000, 0x02520001 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00007000 },
+   { 0x01800031, 0x22801d29, 0x208d0000, 0x0a2a0001 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/* Sample the src surface */
+
+include(`exa_wm.g4i')
+
+/* prepare sampler read back gX register, which would be written back to output */
+
+/* use simd16 sampler, param 0 is u, param 1 is v. */
+/* 'payload' loading, assuming tex coord start from g4 */
+
+/* load argb */
+mov (1) g0.8<1>UD	0x00000000UD { align1 mask_disable };
+
+/* src_msg will be copied with g0, as it contains send desc */
+/* emit sampler 'send' cmd */
+send (16) src_msg_ind		/* msg reg index */
+	src_sample_base<1>UW 	/* readback */
+	g0<8,8,1>UW		/* copy to msg start reg*/
+	sampler (1,0,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+				/* here(src->dst) we should use src_sampler and src_surface */
+	mlen 5 rlen 8 { align1 };   /* required message len 5, readback len 8 */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
+   { 0x01800031, 0x21c01d29, 0x008d0000, 0x02580001 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
+   { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a8a0001 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+/* Sample the src surface in planar format */
+
+include(`exa_wm.g4i')
+
+/* prepare sampler read back gX register, which would be written back to output */
+
+/* use simd16 sampler, param 0 is u, param 1 is v. */
+/* 'payload' loading, assuming tex coord start from g4 */
+
+/* load r */
+mov (1) g0.8<1>UD	0x0000e000UD { align1 mask_disable };
+
+/* src_msg will be copied with g0, as it contains send desc */
+/* emit sampler 'send' cmd */
+
+/* sample Y */
+send (16) src_msg_ind		/* msg reg index */
+	src_sample_g<1>UW 	/* readback */
+	g0<8,8,1>UW		/* copy to msg start reg*/
+	sampler (1,0,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+				/* here(src->dst) we should use src_sampler and src_surface */
+	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
+	
+/* sample U (Cr) */
+send (16) src_msg_ind		/* msg reg index */
+	src_sample_r<1>UW 	/* readback */
+	g0<8,8,1>UW		/* copy to msg start reg*/
+	sampler (3,0,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+				/* here(src->dst) we should use src_sampler and src_surface */
+	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
+	
+/* sample V (Cb) */
+send (16) src_msg_ind		/* msg reg index */
+	src_sample_b<1>UW 	/* readback */
+	g0<8,8,1>UW		/* copy to msg start reg*/
+	sampler (5,0,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+				/* here(src->dst) we should use src_sampler and src_surface */
+	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
+   { 0x01800031, 0x22001d29, 0x008d0000, 0x02520001 },
+   { 0x01800031, 0x21c01d29, 0x008d0000, 0x02520003 },
+   { 0x01800031, 0x22401d29, 0x008d0000, 0x02520005 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
+   { 0x01800031, 0x22001d29, 0x208d0000, 0x0a2a0001 },
+   { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a2a0003 },
+   { 0x01800031, 0x22401d29, 0x208d0000, 0x0a2a0005 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+
+include(`exa_wm.g4i')
+
+/*
+ * Prepare data in m2-m5 for subspan(1,0), m6-m9 for subspan(3,2),
+ *
+ * Note that the SIMD16 write message takes data for the first
+ * two sub-spans followed by the data for the second two sub-spans
+ * instead of having the two sub-spans interleaved by channel. Weird.
+ */
+
+mov (8) data_port_r_01<1>F	src_sample_r_01<8,8,1>F { align1 };
+mov (8) data_port_g_01<1>F	src_sample_g_01<8,8,1>F { align1 };
+mov (8) data_port_b_01<1>F	src_sample_b_01<8,8,1>F { align1 };
+mov (8) data_port_a_01<1>F	src_sample_a_01<8,8,1>F { align1 };
+
+mov (8) data_port_r_23<1>F	src_sample_r_23<8,8,1>F { sechalf align1 };
+mov (8) data_port_g_23<1>F	src_sample_g_23<8,8,1>F { sechalf align1 };
+mov (8) data_port_b_23<1>F	src_sample_b_23<8,8,1>F { sechalf align1 };
+mov (8) data_port_a_23<1>F 	src_sample_a_23<8,8,1>F { sechalf align1 };
+
+/* m0, m1 are all direct passed by PS thread payload */
+mov (8) data_port_msg_1<1>UD	g1<8,8,1>UD		{ mask_disable align1 };
+
+/* write */
+send (16) 
+	data_port_msg_0_ind 
+	acc0<1>UW 
+	g0<8,8,1>UW 
+	write (
+	       0,  /* binding_table */
+	       8,  /* pixel scordboard clear, msg type simd16 single source */
+	       4,  /* render target write */
+	       0   /* no write commit message */
+	) 
+	mlen 10
+	rlen 0
+	{ align1 EOT };
+
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
+nop;
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,18 @@
+   { 0x00600001, 0x204003be, 0x008d01c0, 0x00000000 },
+   { 0x00600001, 0x206003be, 0x008d0200, 0x00000000 },
+   { 0x00600001, 0x208003be, 0x008d0240, 0x00000000 },
+   { 0x00600001, 0x20a003be, 0x008d0280, 0x00000000 },
+   { 0x00601001, 0x20c003be, 0x008d01e0, 0x00000000 },
+   { 0x00601001, 0x20e003be, 0x008d0220, 0x00000000 },
+   { 0x00601001, 0x210003be, 0x008d0260, 0x00000000 },
+   { 0x00601001, 0x212003be, 0x008d02a0, 0x00000000 },
+   { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x85a04800 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,18 @@
+   { 0x00600001, 0x204003be, 0x008d01c0, 0x00000000 },
+   { 0x00600001, 0x206003be, 0x008d0200, 0x00000000 },
+   { 0x00600001, 0x208003be, 0x008d0240, 0x00000000 },
+   { 0x00600001, 0x20a003be, 0x008d0280, 0x00000000 },
+   { 0x00601001, 0x20c003be, 0x008d01e0, 0x00000000 },
+   { 0x00601001, 0x20e003be, 0x008d0220, 0x00000000 },
+   { 0x00601001, 0x210003be, 0x008d0260, 0x00000000 },
+   { 0x00601001, 0x212003be, 0x008d02a0, 0x00000000 },
+   { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x548d0000, 0x94084800 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Wang Zhenyu <zhenyu.z.wang@intel.com>
+ *    Keith Packard <keithp@keithp.com>
+ */
+ 
+/*
+ * Register assignments:
+ *
+ *  x		    g6/g7
+ *  y		    g8/g9
+ *
+ *  temp x	    g10/g11
+ *  temp y	    g12/g13
+ *
+ *  src w	    g14/g15
+ *  src u	    m1/m2
+ *  src v	    m3/m4
+ */
+ 
+/* Fragment to compute per-pixel XY values */
+
+include(`exa_wm.g4i')
+    
+    /* Load X and Y coordinates and compute per-pixel coordinates */
+add (16)	temp_x_uw<1>UW	dst_x_uw		0x10101010V	{ align1 };
+add (16)	temp_y_uw<1>UW	dst_y_uw		0x11001100V	{ align1 };
+
+    /* subtract screen-space origin of vertex 0 */
+add (16)	dst_x<1>F	temp_x_uw<8,8,1>UW	-screen_x0	{ compr align1 };
+add (16)	dst_y<1>F	temp_y_uw<8,8,1>UW	-screen_y0	{ compr align1 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00800040, 0x23c06d29, 0x00480028, 0x10101010 },
+   { 0x00800040, 0x23806d29, 0x0048002a, 0x11001100 },
+   { 0x00802040, 0x2100753d, 0x008d03c0, 0x00004020 },
+   { 0x00802040, 0x2140753d, 0x008d0380, 0x00004024 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,4 @@
+   { 0x00800040, 0x23c06d29, 0x00480028, 0x10101010 },
+   { 0x00800040, 0x23806d29, 0x0048002a, 0x11001100 },
+   { 0x00802040, 0x2100753d, 0x008d03c0, 0x00004020 },
+   { 0x00802040, 0x2140753d, 0x008d0380, 0x00004024 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2006 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Packard <keithp@keithp.com>
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+include(`exa_wm.g4i')
+
+define(`YCbCr_base',	`src_sample_base')
+
+define(`Cr',		`src_sample_r')
+define(`Cr_01',		`src_sample_r_01')
+define(`Cr_23',		`src_sample_r_23')
+
+define(`Y',		`src_sample_g')
+define(`Y_01',		`src_sample_g_01')
+define(`Y_23',		`src_sample_g_23')
+
+define(`Cb',		`src_sample_b')
+define(`Cb_01',		`src_sample_b_01')
+define(`Cb_23',		`src_sample_b_23')
+
+define(`Crn',		`mask_sample_r')
+define(`Crn_01',	`mask_sample_r_01')
+define(`Crn_23',	`mask_sample_r_23')
+
+define(`Yn',		`mask_sample_g')
+define(`Yn_01',		`mask_sample_g_01')
+define(`Yn_23',		`mask_sample_g_23')
+
+define(`Cbn',		`mask_sample_b')
+define(`Cbn_01',	`mask_sample_b_01')
+define(`Cbn_23',	`mask_sample_b_23')
+
+    /* color space conversion function:
+     * R = Clamp ( 1.164(Y-16/255) + 1.596(Cr-128/255), 0, 1)
+     * G = Clamp ( 1.164(Y-16/255) - 0.813(Cr-128/255) - 0.392(Cb-128/255), 0, 1)
+     * B = Clamp ( 1.164(Y-16/255) + 2.017(Cb-128/255), 0, 1)
+     */
+
+    /* Normalize Y, Cb and Cr:
+     *
+     * Yn = (Y - 16/255) * 1.164
+     * Crn = Cr - 128 / 255
+     * Cbn = Cb - 128 / 255
+     */
+add (16)    Yn<1>F		Y<8,8,1>F	-0.0627451F { compr align1 };
+mul (16)    Yn<1>F		Yn<8,8,1>F	1.164F	    { compr align1 };
+
+add (16)    Crn<1>F		Cr<8,8,1>F	-0.501961F  { compr align1 };
+
+add (16)    Cbn<1>F		Cb<8,8,1>F	-0.501961F  { compr align1 };
+
+    /* 
+     * R = Y + Cr * 1.596
+     */
+mov (16)    acc0<1>F		Yn<8,8,1>F		    { compr align1 };
+mac.sat(16) src_sample_r<1>F	Crn<8,8,1>F	1.596F	    { compr align1 };
+     
+    /*
+     * G = Crn * -0.813 + Cbn * -0.392 + Y
+     */
+mov (16)    acc0<1>F		Yn<8,8,1>F		    { compr align1 };
+mac (16)    acc0<1>F		Crn<8,8,1>F    	-0.813F	    { compr align1 };
+mac.sat(16) src_sample_g<1>F	Cbn<8,8,1>F    	-0.392F	    { compr align1 };
+
+    /*
+     * B = Cbn * 2.017 + Y
+     */
+mov (16)    acc0<1>F	        Yn<8,8,1>F		    { compr align1 };
+mac.sat(16) src_sample_b<1>F	Cbn<8,8,1>F     2.017F	    { compr align1 };
+
+    /*
+     * A = 1.0
+     */
+mov (16)    src_sample_a<1>F	1.0F			    { compr align1 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,12 @@
+   { 0x00802040, 0x23007fbd, 0x008d0200, 0xbd808081 },
+   { 0x00802041, 0x23007fbd, 0x008d0300, 0x3f94fdf4 },
+   { 0x00802040, 0x22c07fbd, 0x008d01c0, 0xbf008084 },
+   { 0x00802040, 0x23407fbd, 0x008d0240, 0xbf008084 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x80802048, 0x21c07fbd, 0x008d02c0, 0x3fcc49ba },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x00802048, 0x24007fbc, 0x008d02c0, 0xbf5020c5 },
+   { 0x80802048, 0x22007fbd, 0x008d0340, 0xbec8b439 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x80802048, 0x22407fbd, 0x008d0340, 0x40011687 },
+   { 0x00802001, 0x228003fd, 0x00000000, 0x3f800000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,12 @@
+   { 0x00802040, 0x23007fbd, 0x008d0200, 0xbd808081 },
+   { 0x00802041, 0x23007fbd, 0x008d0300, 0x3f94fdf4 },
+   { 0x00802040, 0x22c07fbd, 0x008d01c0, 0xbf008084 },
+   { 0x00802040, 0x23407fbd, 0x008d0240, 0xbf008084 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x80802048, 0x21c07fbd, 0x008d02c0, 0x3fcc49ba },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x00802048, 0x24007fbc, 0x008d02c0, 0xbf5020c5 },
+   { 0x80802048, 0x22007fbd, 0x008d0340, 0xbec8b439 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x80802048, 0x22407fbd, 0x008d0340, 0x40011687 },
+   { 0x00802001, 0x228003fd, 0x00000000, 0x3f800000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,82 @@
+INTEL_G4A =				\
+	exa_sf.g4a 			\
+	exa_sf_mask.g4a 		\
+	exa_wm_src_affine.g4a 		\
+	exa_wm_src_projective.g4a 	\
+	exa_wm_src_sample_argb.g4a 	\
+	exa_wm_src_sample_a.g4a 	\
+	exa_wm_src_sample_planar.g4a 	\
+	exa_wm_mask_affine.g4a 		\
+	exa_wm_mask_projective.g4a 	\
+	exa_wm_mask_sample_argb.g4a 	\
+	exa_wm_mask_sample_a.g4a 	\
+	exa_wm_noca.g4a			\
+	exa_wm_ca.g4a			\
+	exa_wm_ca_srcalpha.g4a		\
+	exa_wm_write.g4a 		\
+	exa_wm_yuv_rgb.g4a		\
+	exa_wm_xy.g4a
+
+INTEL_G4I =				\
+	exa_wm.g4i			\
+	exa_wm_affine.g4i		\
+	exa_wm_projective.g4i
+
+INTEL_G4B = 				\
+	exa_sf.g4b 			\
+	exa_sf_mask.g4b 		\
+	exa_wm_src_affine.g4b 		\
+	exa_wm_src_projective.g4b 	\
+	exa_wm_src_sample_argb.g4b 	\
+	exa_wm_src_sample_a.g4b 	\
+	exa_wm_src_sample_planar.g4b 	\
+	exa_wm_mask_affine.g4b 		\
+	exa_wm_mask_projective.g4b 	\
+	exa_wm_mask_sample_argb.g4b 	\
+	exa_wm_mask_sample_a.g4b 	\
+	exa_wm_noca.g4b			\
+	exa_wm_ca.g4b			\
+	exa_wm_ca_srcalpha.g4b		\
+	exa_wm_write.g4b 		\
+	exa_wm_yuv_rgb.g4b		\
+	exa_wm_xy.g4b
+
+
+INTEL_G4B_GEN5 = 				\
+	exa_sf.g4b.gen5 			\
+	exa_sf_mask.g4b.gen5 			\
+	exa_wm_src_affine.g4b.gen5 		\
+	exa_wm_src_projective.g4b.gen5 		\
+	exa_wm_src_sample_argb.g4b.gen5 	\
+	exa_wm_src_sample_a.g4b.gen5 		\
+	exa_wm_src_sample_planar.g4b.gen5 	\
+	exa_wm_mask_affine.g4b.gen5 		\
+	exa_wm_mask_projective.g4b.gen5 	\
+	exa_wm_mask_sample_argb.g4b.gen5 	\
+	exa_wm_mask_sample_a.g4b.gen5 		\
+	exa_wm_noca.g4b.gen5			\
+	exa_wm_ca.g4b.gen5			\
+	exa_wm_ca_srcalpha.g4b.gen5		\
+	exa_wm_write.g4b.gen5 			\
+	exa_wm_yuv_rgb.g4b.gen5			\
+	exa_wm_xy.g4b.gen5
+
+EXTRA_DIST = 		\
+	$(INTEL_G4A)	\
+	$(INTEL_G4I)	\
+	$(INTEL_G4B)	\
+	$(INTEL_G4B_GEN5)
+
+if HAVE_GEN4ASM
+
+SUFFIXES = .g4a .g4b
+.g4a.g4b:
+	m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
+
+$(INTEL_G4B): $(INTEL_G4I)
+
+BUILT_SOURCES= $(INTEL_G4B)
+
+clean-local:
+	-rm -f $(INTEL_G4B) $(INTEL_G4B_GEN5)
+endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,457 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/render_program
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRIVER_NAME = @DRIVER_NAME@
+DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
+DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
+DRM_CFLAGS = @DRM_CFLAGS@
+DRM_LIBS = @DRM_LIBS@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
+GREP = @GREP@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+INTEL_G4A = \
+	exa_sf.g4a 			\
+	exa_sf_mask.g4a 		\
+	exa_wm_src_affine.g4a 		\
+	exa_wm_src_projective.g4a 	\
+	exa_wm_src_sample_argb.g4a 	\
+	exa_wm_src_sample_a.g4a 	\
+	exa_wm_src_sample_planar.g4a 	\
+	exa_wm_mask_affine.g4a 		\
+	exa_wm_mask_projective.g4a 	\
+	exa_wm_mask_sample_argb.g4a 	\
+	exa_wm_mask_sample_a.g4a 	\
+	exa_wm_noca.g4a			\
+	exa_wm_ca.g4a			\
+	exa_wm_ca_srcalpha.g4a		\
+	exa_wm_write.g4a 		\
+	exa_wm_yuv_rgb.g4a		\
+	exa_wm_xy.g4a
+
+INTEL_G4I = \
+	exa_wm.g4i			\
+	exa_wm_affine.g4i		\
+	exa_wm_projective.g4i
+
+INTEL_G4B = \
+	exa_sf.g4b 			\
+	exa_sf_mask.g4b 		\
+	exa_wm_src_affine.g4b 		\
+	exa_wm_src_projective.g4b 	\
+	exa_wm_src_sample_argb.g4b 	\
+	exa_wm_src_sample_a.g4b 	\
+	exa_wm_src_sample_planar.g4b 	\
+	exa_wm_mask_affine.g4b 		\
+	exa_wm_mask_projective.g4b 	\
+	exa_wm_mask_sample_argb.g4b 	\
+	exa_wm_mask_sample_a.g4b 	\
+	exa_wm_noca.g4b			\
+	exa_wm_ca.g4b			\
+	exa_wm_ca_srcalpha.g4b		\
+	exa_wm_write.g4b 		\
+	exa_wm_yuv_rgb.g4b		\
+	exa_wm_xy.g4b
+
+INTEL_G4B_GEN5 = \
+	exa_sf.g4b.gen5 			\
+	exa_sf_mask.g4b.gen5 			\
+	exa_wm_src_affine.g4b.gen5 		\
+	exa_wm_src_projective.g4b.gen5 		\
+	exa_wm_src_sample_argb.g4b.gen5 	\
+	exa_wm_src_sample_a.g4b.gen5 		\
+	exa_wm_src_sample_planar.g4b.gen5 	\
+	exa_wm_mask_affine.g4b.gen5 		\
+	exa_wm_mask_projective.g4b.gen5 	\
+	exa_wm_mask_sample_argb.g4b.gen5 	\
+	exa_wm_mask_sample_a.g4b.gen5 		\
+	exa_wm_noca.g4b.gen5			\
+	exa_wm_ca.g4b.gen5			\
+	exa_wm_ca_srcalpha.g4b.gen5		\
+	exa_wm_write.g4b.gen5 			\
+	exa_wm_yuv_rgb.g4b.gen5			\
+	exa_wm_xy.g4b.gen5
+
+EXTRA_DIST = \
+	$(INTEL_G4A)	\
+	$(INTEL_G4I)	\
+	$(INTEL_G4B)	\
+	$(INTEL_G4B_GEN5)
+
+@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
+@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .g4a .g4b
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/render_program/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  src/render_program/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+@HAVE_GEN4ASM_FALSE@clean-local:
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-info-am
+
+@HAVE_GEN4ASM_TRUE@.g4a.g4b:
+@HAVE_GEN4ASM_TRUE@	m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
+
+@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
+
+@HAVE_GEN4ASM_TRUE@clean-local:
+@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B) $(INTEL_G4B_GEN5)
+# 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 -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock.5c new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock.5c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock.5c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock.5c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,40 @@
+int p2 = 14;
+int min_p, max_p;
+
+if (p2 == 7 || p2 == 14) {
+	/* LVDS */
+	min_p = 7;
+	max_p = 98;
+} else {
+	/* SDVO/DAC */
+	min_p = 5;
+	max_p = 80;
+}
+
+for (int m1 = 10; m1 <= 22; m1++) {
+	for (int m2 = 5; m2 <= 9; m2++) {
+		for (int n = 1; n <= 6; n++) {
+			for (int p1 = 1; p1 <= 8; p1++) {
+				int ref = 96000000;
+				int m = 5 * (m1 + 2) + (m2 + 2);
+				int p = p1 * p2;
+				int vco = floor(ref * m / (n + 2));
+				int clock = floor(vco / p);
+
+				if (p < min_p || p > max_p)
+					continue;
+				if (m < 70 || m > 120)
+					continue;
+				if (m2 > m1)
+					continue; /* won't happen */
+				if (vco < 1400000000 ||
+				    vco > 2800000000)
+					continue;
+
+				printf("clock: %d (%d,%d),%d,(%d,%d)\n",
+					floor(clock / 1000),
+					m1, m2, n, p1, p2);
+			}
+		}
+	}
+}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock-graph.5c new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock-graph.5c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock-graph.5c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/clock-graph.5c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,174 @@
+autoload Cairo;
+import Cairo;
+library "examples/sort.5c";
+import Sort;
+
+int width = 1000, height = 200;
+int min_vco = 1400000000;
+int max_vco = 2800000000;
+int min = 0xffffffff;
+int max = 0;
+
+int max_clocks = 2000;
+int[4][max_clocks] clocks;
+int[4][max_clocks] vcos;
+int[4] clock_count = {0...};
+
+int[4] p2vals = {5,10,7,14};
+
+cairo_t cr = Cairo::new(width, height);
+
+void calc_p2(int p2i)
+{
+	int p2 = p2vals[p2i];
+	int min_p, max_p;
+
+	clocks[p2i] = (int [max_clocks]){0...};
+
+		if (p2 == 7 || p2 == 14) {
+		/* LVDS */
+		min_p = 7;
+		max_p = 98;
+	} else {
+		/* SDVO/DAC */
+		min_p = 5;
+		max_p = 80;
+	}
+
+	for (int m1 = 10; m1 <= 22; m1++) {
+		for (int m2 = 5; m2 <= 9; m2++) {
+			for (int n = 1; n <= 5; n++) {
+				for (int p1 = 1; p1 <= 8; p1++) {
+					int ref = 96000000;
+					int m = 5 * (m1 + 2) + (m2 + 2);
+					int p = p1 * p2;
+					int vco = floor(ref * m / (n + 2));
+					int clock = floor(vco / p);
+
+					if (p < min_p || p > max_p)
+						continue;
+					if (m < 70 || m > 120)
+						continue;
+					if (m2 > m1)
+						continue; /* won't happen */
+					if (vco < min_vco || vco > max_vco)
+						continue;
+
+/*
+					printf("clock: %d (%d,%d), %d, "
+						"(%d,%d)\n",
+						floor(clock / 1000),
+						m1, m2, n, p1, p2);
+*/
+
+					clocks[p2i][clock_count[p2i]] = clock;
+					vcos[p2i][clock_count[p2i]] = vco;
+					clock_count[p2i]++;
+				}
+			}
+		}
+	}
+}
+
+bool sort_p2(poly a, poly b)
+{
+	return a > b;
+}
+
+int min_rate = 25000 * 1000;
+int max_rate = 200000 * 1000;
+
+real scale_x(real clock)
+{
+	int min_x = 75, max_x = width - 50;
+
+	real frac = (clock - min_rate) / (max_rate - min_rate);
+
+	return min_x + frac * (max_x - min_x);
+}
+
+for (p2i = 0; p2i < dim(p2vals); p2i++) {
+	int p2 = p2vals[p2i]; 
+	calc_p2(p2i);
+	real row_y1 = (p2i + 1) / (dim(p2vals) + 1) * height;
+	real row_y2 = p2i / (dim(p2vals) + 1) * height;
+
+	/*qsort(&p2vals[p2i], sort_p2);*/
+
+	switch (p2) {
+	case 5:
+		set_source_rgb(cr, 1,0,0);
+		break;
+	case 10:
+		set_source_rgb(cr, 0,1,0);
+		break;
+	case 7:
+		set_source_rgb(cr, 0,0,1);
+		break;
+	case 14:
+		set_source_rgb(cr, 0,0,0);
+		break;
+	}
+
+	/* draw the line for the clock */
+	for (int i = 0; i < clock_count[p2i]; i++) {
+		int clock = clocks[p2i][i];
+		real xpos;
+
+		if (clock < min_rate || clock > max_rate)
+			continue;
+
+		xpos = scale_x(clock);
+		move_to(cr, xpos, row_y1);
+		line_to(cr, xpos, row_y2);
+		stroke(cr);
+	}
+
+	set_source_rgb(cr, 1, 1, 1);
+	/* add a mark for the vco value of the clocks at each location */
+	for (int i = 0; i < clock_count[p2i]; i++) {
+		int clock = clocks[p2i][i];
+		int vco = vcos[p2i][i];
+		real mark_center;
+
+		if (clock < min_rate || clock > max_rate)
+			continue;
+
+		real xpos = scale_x(clock);
+		real vcofrac = (vco - min_vco) / (max_vco - min_vco);
+		real mark_height = (row_y1 + vcofrac * (row_y2 - row_y1));
+
+		move_to(cr, xpos, mark_height - 1);
+		line_to(cr, xpos, mark_height + 1);
+		stroke(cr);
+	}
+
+	set_source_rgb(cr, 0, 0, 0);
+	string p2label = sprintf("p2 = %d", p2);
+	move_to(cr, 5, (p2i + .5) / (dim(p2vals) + 1) * height + 4);
+	show_text(cr, p2label);
+}
+
+void label_clock(real clock) {
+	real center_x = scale_x(clock);
+	string label = sprintf("%d", floor((clock + 500) / 1000000));
+		text_extents_t e = text_extents(cr, label);
+	real left_x = center_x - e.x_advance / 2;
+	save(cr);
+	move_to(cr, left_x, height - 20);
+	show_text(cr, label);
+	restore(cr);
+}
+
+label_clock(min_rate);
+label_clock(max_rate);
+label_clock(140 * 1000 * 1000);
+label_clock(115 * 1000 * 1000);
+label_clock(100 * 1000 * 1000);
+label_clock(82 * 1000 * 1000);
+
+string xlabel = "Clock in Mhz";
+text_extents_t e = text_extents(cr, xlabel);
+move_to(cr, width / 2 - e.x_advance / 2, height - 5);
+show_text(cr, xlabel);
+sleep(10);
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/fix.5c new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/fix.5c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/fix.5c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/fix.5c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,14 @@
+/*
+ * Convert CSC fix point values to floats
+ */
+
+real fixval (int fix)
+{
+    int exp = fix >> 9;
+    int mant = fix & ((1 << 9) - 1);
+    real ret;
+    if (exp == 0x7)
+	return 1.0;
+    ret = (2 ** -exp) * mant / (1 << 9);
+    return ret;
+}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/tv.5c new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/tv.5c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/scripts/tv.5c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/scripts/tv.5c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,128 @@
+/*
+ * tv.5c
+ *
+ * Compute tv encoder subcarrier dda constants
+ *
+ * The TV encoder subcarrier must be set precisely to the
+ * required frequency or the cumulative phase errors will be
+ * quite visible in the output. To accomplish this, the TV encoder
+ * has a complex circuit that takes a fixed clock, generated by the PLL
+ * and generates a precise subcarrier clock from that using the following
+ * formula:
+ *
+ *  subcarrier = pixel_clock * (S1 + (S2 + (S3/Z3)) / Z2) / 4096
+ *
+ * Careful selection of the constants will provide the necessarily
+ * precise clock.
+ *
+ * In the code below, S1 is represented by dda1, S2/Z2 by dda2 and S3/Z3
+ * by dda3.
+ */
+
+typedef struct {
+    int	step;
+    int	size;
+} term_t;
+
+/*
+ * Find the approximation closest, but no larger than 'v', where
+ * 0 <= v < 1, and the result denominator must be less than 30000.
+ */
+term_t approx (rational v)
+{
+    rational	best_dist = 1.0;
+    term_t	best;
+
+    for (int den = 20000; den < 30000; den++)
+    {
+	int num = floor (v * den);
+	term_t	    approx = { step = num, size = den };
+	rational    dist = v - approx.step/approx.size;
+	if (dist >= 0 && dist < best_dist)
+	{
+	    best_dist = dist;
+	    best = approx;
+	}
+    }
+    return best;
+}
+
+typedef struct {
+    rational	subcarrier;
+    rational	pixel;
+    rational	result;
+    term_t	dda1;
+    term_t	dda2;
+    term_t	dda3;
+} dda;
+
+/*
+ * Compute the dda constants for the given pixel clock and
+ * desired subcarrier frequency
+ */
+
+dda find_dda (rational pixel, rational subcarrier)
+{
+    dda	d;
+
+    d.subcarrier = subcarrier;
+    d.pixel = pixel;
+    
+    rational	dda1 = subcarrier / pixel * 4096;
+    d.dda1 = (term_t) { step = floor (dda1), size = 4096 };
+    
+    rational	dda2 = dda1 - d.dda1.step;
+    d.dda2 = approx (dda2);
+    
+    rational	dda3 = dda2 * d.dda2.size - d.dda2.step;
+    d.dda3 = approx (dda3);
+
+    /* Compute the resulting pixel clock to compare */
+    d.result = d.pixel * (d.dda1.step +
+			  (d.dda2.step + d.dda3.step/d.dda3.size) /
+			  d.dda2.size) / d.dda1.size;
+    return d;
+}
+
+/*
+ * Print out the computed constants
+ */
+void print_dda (dda d)
+{
+    printf ("\t/* desired %9.7f actual %9.7f clock %g */\n",
+	    d.subcarrier, d.result, d.pixel);
+    printf ("\t.dda1_inc\t= %6d,\n", d.dda1.step);
+    printf ("\t.dda2_inc\t= %6d,\t.dda2_size\t= %6d,\n",
+	    d.dda2.step, d.dda2.step != 0 ? d.dda2.size : 0);
+    printf ("\t.dda3_inc\t= %6d,\t.dda3_size\t= %6d,\n",
+	    d.dda3.step, d.dda3.step != 0 ? d.dda3.size : 0);
+}
+
+/*
+ * These are all of the required subcarrier frequencies
+ */
+rational[]    subcarriers = {
+    /* these are the values we use; for some reason, this generates
+     * a more stable image (at least for NTSC) */
+    3.580, 4.434, 3.582, 3.576, 4.430,
+    
+    /* these are the values pulled out of the various specs */
+    3.579545, 4.433618, 3.582056, 3.575611, 4.433618
+};
+
+/*
+ * We fix the pixel clock to a value which the hardware can
+ * generate exactly
+ */
+rational    pixel = 107.520;
+
+void main ()
+{
+    for (int i = 0; i < dim(subcarriers); i++)
+    {
+	dda d = find_dda (pixel, subcarriers[i]);
+	print_dda (d);
+    }
+}
+
+main ();
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.am	2008-08-02 07:12:45.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 sil164_la_LTLIBRARIES = sil164.la
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.in	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/sil164/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +39,10 @@ host_triplet = @host@
 subdir = src/sil164
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,18 +57,17 @@ LTLIBRARIES = $(sil164_la_LTLIBRARIES)
 sil164_la_LIBADD =
 am_sil164_la_OBJECTS = sil164.lo sil164_module.lo
 sil164_la_OBJECTS = $(am_sil164_la_OBJECTS)
-sil164_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(sil164_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(sil164_la_SOURCES)
 DIST_SOURCES = $(sil164_la_SOURCES)
 ETAGS = etags
@@ -74,7 +76,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -82,41 +87,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -124,12 +146,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -137,13 +158,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -157,26 +173,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -188,13 +205,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -208,7 +223,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -219,19 +233,15 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 sil164_la_LTLIBRARIES = sil164.la
@@ -251,8 +261,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -278,21 +288,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-sil164_laLTLIBRARIES: $(sil164_la_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(sil164_ladir)" || $(MKDIR_P) "$(DESTDIR)$(sil164_ladir)"
+	test -z "$(sil164_ladir)" || $(mkdir_p) "$(DESTDIR)$(sil164_ladir)"
 	@list='$(sil164_la_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sil164_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(sil164_ladir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sil164_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(sil164_ladir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(sil164_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(sil164_ladir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(sil164_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(sil164_ladir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-sil164_laLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(sil164_la_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(sil164_la_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(sil164_ladir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(sil164_ladir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(sil164_ladir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(sil164_ladir)/$$p"; \
 	done
 
 clean-sil164_laLTLIBRARIES:
@@ -304,7 +314,7 @@ clean-sil164_laLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 sil164.la: $(sil164_la_OBJECTS) $(sil164_la_DEPENDENCIES) 
-	$(sil164_la_LINK) -rpath $(sil164_ladir) $(sil164_la_OBJECTS) $(sil164_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(sil164_ladir) $(sil164_la_LDFLAGS) $(sil164_la_OBJECTS) $(sil164_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -316,22 +326,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sil164_module.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -342,13 +352,17 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -360,8 +374,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -371,12 +385,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -390,21 +405,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -420,7 +436,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(sil164_ladir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -455,7 +471,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -469,20 +485,12 @@ info-am:
 
 install-data-am: install-sil164_laLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -503,23 +511,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-sil164_laLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-sil164_laLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-sil164_laLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-sil164_laLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-sil164_laLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-sil164_laLTLIBRARIES
 
 # 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.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/sil164/sil164.c new/xsrc/external/mit/xf86-video-intel/dist/src/sil164/sil164.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/sil164/sil164.c	2010-11-23 09:53:05.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/sil164/sil164.c	2011-02-08 11:14:00.000000000 +0100
@@ -39,8 +39,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 
 #include "../i2c_vid.h"
 #include "sil164.h"
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.am	2008-08-02 07:12:45.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 tfp410_la_LTLIBRARIES = tfp410.la
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.in	2009-06-09 04:54:34.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +39,10 @@ host_triplet = @host@
 subdir = src/tfp410
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,18 +57,17 @@ LTLIBRARIES = $(tfp410_la_LTLIBRARIES)
 tfp410_la_LIBADD =
 am_tfp410_la_OBJECTS = tfp410.lo tfp410_module.lo
 tfp410_la_OBJECTS = $(am_tfp410_la_OBJECTS)
-tfp410_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(tfp410_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(tfp410_la_SOURCES)
 DIST_SOURCES = $(tfp410_la_SOURCES)
 ETAGS = etags
@@ -74,7 +76,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -82,41 +87,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -124,12 +146,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -137,13 +158,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -157,26 +173,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -188,13 +205,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -208,7 +223,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -219,19 +233,15 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
 tfp410_la_LTLIBRARIES = tfp410.la
@@ -251,8 +261,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -278,21 +288,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-tfp410_laLTLIBRARIES: $(tfp410_la_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(tfp410_ladir)" || $(MKDIR_P) "$(DESTDIR)$(tfp410_ladir)"
+	test -z "$(tfp410_ladir)" || $(mkdir_p) "$(DESTDIR)$(tfp410_ladir)"
 	@list='$(tfp410_la_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tfp410_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(tfp410_ladir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tfp410_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(tfp410_ladir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(tfp410_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(tfp410_ladir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(tfp410_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(tfp410_ladir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-tfp410_laLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(tfp410_la_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(tfp410_la_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(tfp410_ladir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(tfp410_ladir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(tfp410_ladir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(tfp410_ladir)/$$p"; \
 	done
 
 clean-tfp410_laLTLIBRARIES:
@@ -304,7 +314,7 @@ clean-tfp410_laLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 tfp410.la: $(tfp410_la_OBJECTS) $(tfp410_la_DEPENDENCIES) 
-	$(tfp410_la_LINK) -rpath $(tfp410_ladir) $(tfp410_la_OBJECTS) $(tfp410_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(tfp410_ladir) $(tfp410_la_LDFLAGS) $(tfp410_la_OBJECTS) $(tfp410_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -316,22 +326,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfp410_module.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -342,13 +352,17 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -360,8 +374,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -371,12 +385,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -390,21 +405,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -420,7 +436,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(tfp410_ladir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -455,7 +471,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -469,20 +485,12 @@ info-am:
 
 install-data-am: install-tfp410_laLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -503,23 +511,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-tfp410_laLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-tfp410_laLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-tfp410_laLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-strip install-tfp410_laLTLIBRARIES installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-tfp410_laLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-tfp410_laLTLIBRARIES
 
 # 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.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/tfp410.c new/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/tfp410.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/tfp410.c	2010-11-23 09:53:05.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/tfp410/tfp410.c	2011-02-08 11:14:00.000000000 +0100
@@ -38,8 +38,13 @@
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 
 #include "../i2c_vid.h"
 #include "tfp410.h"
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.c new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.c	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.c	2011-02-08 11:14:00.000000000 +0100
@@ -33,7 +33,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
 **
 **
 ***************************************************************************/
-/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.c,v 1.10 2002/10/30 12:52:01 alanh Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.h new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.h	2008-08-02 07:12:46.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/I810XvMC.h	2011-02-08 11:14:00.000000000 +0100
@@ -32,7 +32,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
  *
  *
  ***************************************************************************/
-/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.3 2002/10/30 12:52:02 alanh Exp $ */
 
 
 #ifndef I810XVMC_H
@@ -365,106 +364,3 @@ void i810_free_privContext(i810XvMCConte
 void dp(unsigned int *address, unsigned int i);
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_program.h new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_program.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_program.h	2008-08-02 07:12:46.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_program.h	2011-02-08 11:14:00.000000000 +0100
@@ -1,33 +1,33 @@
 #ifndef _I915_PROGRAM_H
 #define _I915_PROGRAM_H
 
-#define REG_TYPE_R                 0    /* temporary regs, no need to
-                                         * dcl, must be written before
-                                         * read -- Preserved between
-                                         * phases.
-                                         */
-#define REG_TYPE_T                 1    /* Interpolated values, must be
-                                         * dcl'ed before use.
-                                         *
-                                         * 0..7: texture coord,
-                                         * 8: diffuse spec,
-                                         * 9: specular color,
-                                         * 10: fog parameter in w.
-                                         */
-#define REG_TYPE_CONST             2    /* Restriction: only one const
-                                         * can be referenced per
-                                         * instruction, though it may be
-                                         * selected for multiple inputs.
-                                         * Constants not initialized
-                                         * default to zero.
-                                         */
-#define REG_TYPE_S                 3    /* sampler */
-#define REG_TYPE_OC                4    /* output color (rgba) */
-#define REG_TYPE_OD                5    /* output depth (w), xyz are
-                                         * temporaries.  If not written,
-                                         * interpolated depth is used?
-                                         */
-#define REG_TYPE_U                 6    /* unpreserved temporaries */
+#define REG_TYPE_R                 0	/* temporary regs, no need to
+					 * dcl, must be written before
+					 * read -- Preserved between
+					 * phases.
+					 */
+#define REG_TYPE_T                 1	/* Interpolated values, must be
+					 * dcl'ed before use.
+					 *
+					 * 0..7: texture coord,
+					 * 8: diffuse spec,
+					 * 9: specular color,
+					 * 10: fog parameter in w.
+					 */
+#define REG_TYPE_CONST             2	/* Restriction: only one const
+					 * can be referenced per
+					 * instruction, though it may be
+					 * selected for multiple inputs.
+					 * Constants not initialized
+					 * default to zero.
+					 */
+#define REG_TYPE_S                 3	/* sampler */
+#define REG_TYPE_OC                4	/* output color (rgba) */
+#define REG_TYPE_OD                5	/* output depth (w), xyz are
+					 * temporaries.  If not written,
+					 * interpolated depth is used?
+					 */
+#define REG_TYPE_U                 6	/* unpreserved temporaries */
 #define REG_TYPE_MASK              0x7
 #define REG_NR_MASK                0xf
 
@@ -43,34 +43,34 @@
 #define T_TEX7     7
 #define T_DIFFUSE  8
 #define T_SPECULAR 9
-#define T_FOG_W    10           /* interpolated fog is in W coord */
+#define T_FOG_W    10		/* interpolated fog is in W coord */
 
 /* Arithmetic instructions */
 
 /* .replicate_swizzle == selection and replication of a particular
  * scalar channel, ie., .xxxx, .yyyy, .zzzz or .wwww
  */
-#define A0_NOP    (0x0<<24)     /* no operation */
-#define A0_ADD    (0x1<<24)     /* dst = src0 + src1 */
-#define A0_MOV    (0x2<<24)     /* dst = src0 */
-#define A0_MUL    (0x3<<24)     /* dst = src0 * src1 */
-#define A0_MAD    (0x4<<24)     /* dst = src0 * src1 + src2 */
-#define A0_DP2ADD (0x5<<24)     /* dst.xyzw = src0.xy dot src1.xy + src2.replicate_swizzle */
-#define A0_DP3    (0x6<<24)     /* dst.xyzw = src0.xyz dot src1.xyz */
-#define A0_DP4    (0x7<<24)     /* dst.xyzw = src0.xyzw dot src1.xyzw */
-#define A0_FRC    (0x8<<24)     /* dst = src0 - floor(src0) */
-#define A0_RCP    (0x9<<24)     /* dst.xyzw = 1/(src0.replicate_swizzle) */
-#define A0_RSQ    (0xa<<24)     /* dst.xyzw = 1/(sqrt(abs(src0.replicate_swizzle))) */
-#define A0_EXP    (0xb<<24)     /* dst.xyzw = exp2(src0.replicate_swizzle) */
-#define A0_LOG    (0xc<<24)     /* dst.xyzw = log2(abs(src0.replicate_swizzle)) */
-#define A0_CMP    (0xd<<24)     /* dst = (src0 >= 0.0) ? src1 : src2 */
-#define A0_MIN    (0xe<<24)     /* dst = (src0 < src1) ? src0 : src1 */
-#define A0_MAX    (0xf<<24)     /* dst = (src0 >= src1) ? src0 : src1 */
-#define A0_FLR    (0x10<<24)    /* dst = floor(src0) */
-#define A0_MOD    (0x11<<24)    /* dst = src0 fmod 1.0 */
-#define A0_TRC    (0x12<<24)    /* dst = int(src0) */
-#define A0_SGE    (0x13<<24)    /* dst = src0 >= src1 ? 1.0 : 0.0 */
-#define A0_SLT    (0x14<<24)    /* dst = src0 < src1 ? 1.0 : 0.0 */
+#define A0_NOP    (0x0<<24)	/* no operation */
+#define A0_ADD    (0x1<<24)	/* dst = src0 + src1 */
+#define A0_MOV    (0x2<<24)	/* dst = src0 */
+#define A0_MUL    (0x3<<24)	/* dst = src0 * src1 */
+#define A0_MAD    (0x4<<24)	/* dst = src0 * src1 + src2 */
+#define A0_DP2ADD (0x5<<24)	/* dst.xyzw = src0.xy dot src1.xy + src2.replicate_swizzle */
+#define A0_DP3    (0x6<<24)	/* dst.xyzw = src0.xyz dot src1.xyz */
+#define A0_DP4    (0x7<<24)	/* dst.xyzw = src0.xyzw dot src1.xyzw */
+#define A0_FRC    (0x8<<24)	/* dst = src0 - floor(src0) */
+#define A0_RCP    (0x9<<24)	/* dst.xyzw = 1/(src0.replicate_swizzle) */
+#define A0_RSQ    (0xa<<24)	/* dst.xyzw = 1/(sqrt(abs(src0.replicate_swizzle))) */
+#define A0_EXP    (0xb<<24)	/* dst.xyzw = exp2(src0.replicate_swizzle) */
+#define A0_LOG    (0xc<<24)	/* dst.xyzw = log2(abs(src0.replicate_swizzle)) */
+#define A0_CMP    (0xd<<24)	/* dst = (src0 >= 0.0) ? src1 : src2 */
+#define A0_MIN    (0xe<<24)	/* dst = (src0 < src1) ? src0 : src1 */
+#define A0_MAX    (0xf<<24)	/* dst = (src0 >= src1) ? src0 : src1 */
+#define A0_FLR    (0x10<<24)	/* dst = floor(src0) */
+#define A0_MOD    (0x11<<24)	/* dst = src0 fmod 1.0 */
+#define A0_TRC    (0x12<<24)	/* dst = int(src0) */
+#define A0_SGE    (0x13<<24)	/* dst = src0 >= src1 ? 1.0 : 0.0 */
+#define A0_SLT    (0x14<<24)	/* dst = src0 < src1 ? 1.0 : 0.0 */
 #define A0_DEST_SATURATE                 (1<<22)
 #define A0_DEST_TYPE_SHIFT                19
 /* Allow: R, OC, OD, U */
@@ -126,9 +126,9 @@
 #define A2_SRC2_CHANNEL_W_SHIFT          0
 
 /* Declaration instructions */
-#define D0_DCL       (0x19<<24) /* Declare a t (interpolated attrib)
-                                 * register or an s (sampler)
-                                 * register. */
+#define D0_DCL       (0x19<<24)	/* Declare a t (interpolated attrib)
+				 * register or an s (sampler)
+				 * register. */
 #define D0_SAMPLE_TYPE_SHIFT              22
 #define D0_SAMPLE_TYPE_2D                 (0x0<<22)
 #define D0_SAMPLE_TYPE_CUBE               (0x1<<22)
@@ -160,23 +160,23 @@
 #define D2_MBZ                          0
 
 /* Texture instructions */
-#define T0_TEXLD     (0x15<<24) /* Sample texture using predeclared
-                                 * sampler and address, and output
-                                 * filtered texel data to destination
-                                 * register */
-#define T0_TEXLDP    (0x16<<24) /* Same as texld but performs a
-                                 * perspective divide of the texture
-                                 * coordinate .xyz values by .w before
-                                 * sampling. */
-#define T0_TEXLDB    (0x17<<24) /* Same as texld but biases the
-                                 * computed LOD by w.  Only S4.6 two's
-                                 * comp is used.  This implies that a
-                                 * float to fixed conversion is
-                                 * done. */
-#define T0_TEXKILL   (0x18<<24) /* Does not perform a sampling
-                                 * operation.  Simply kills the pixel
-                                 * if any channel of the address
-                                 * register is < 0.0. */
+#define T0_TEXLD     (0x15<<24)	/* Sample texture using predeclared
+				 * sampler and address, and output
+				 * filtered texel data to destination
+				 * register */
+#define T0_TEXLDP    (0x16<<24)	/* Same as texld but performs a
+				 * perspective divide of the texture
+				 * coordinate .xyz values by .w before
+				 * sampling. */
+#define T0_TEXLDB    (0x17<<24)	/* Same as texld but biases the
+				 * computed LOD by w.  Only S4.6 two's
+				 * comp is used.  This implies that a
+				 * float to fixed conversion is
+				 * done. */
+#define T0_TEXKILL   (0x18<<24)	/* Does not perform a sampling
+				 * operation.  Simply kills the pixel
+				 * if any channel of the address
+				 * register is < 0.0. */
 #define T0_DEST_TYPE_SHIFT                19
 /* Allow: R, OC, OD, U */
 /* Note: U (unpreserved) regs do not retain their values between
@@ -188,15 +188,14 @@
  */
 #define T0_DEST_NR_SHIFT                 14
 /* Allow R: 0..15, OC,OD: 0..0, U: 0..2 */
-#define T0_SAMPLER_NR_SHIFT              0      /* This field ignored for TEXKILL */
+#define T0_SAMPLER_NR_SHIFT              0	/* This field ignored for TEXKILL */
 #define T0_SAMPLER_NR_MASK               (0xf<<0)
 
-#define T1_ADDRESS_REG_TYPE_SHIFT        24     /* Reg to use as texture coord */
+#define T1_ADDRESS_REG_TYPE_SHIFT        24	/* Reg to use as texture coord */
 /* Allow R, T, OC, OD -- R, OC, OD are 'dependent' reads, new program phase */
 #define T1_ADDRESS_REG_NR_SHIFT          17
 #define T2_MBZ                           0
 
-
 /* Having zero and one in here makes the definition of swizzle a lot
  * easier.
  */
@@ -215,7 +214,7 @@
 #define UREG_CHANNEL_ONE_NEGATE_MBZ   1
 #define UREG_CHANNEL_ONE_SHIFT        0
 
-#define UREG_BAD          0xffffffff    /* not a valid ureg */
+#define UREG_BAD          0xffffffff	/* not a valid ureg */
 
 #define X    SRC_X
 #define Y    SRC_Y
@@ -258,7 +257,6 @@
 #define T1_ADDRESS_REG( reg ) ((GET_UREG_NR(reg) << T1_ADDRESS_REG_NR_SHIFT) | \
                                (GET_UREG_TYPE(reg) << T1_ADDRESS_REG_TYPE_SHIFT))
 
-
 /* Macros for translating UREG's into the various register fields used
  * by the I915 programmable unit.
  */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_structs.h new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_structs.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_structs.h	2008-08-02 07:12:47.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_structs.h	2011-02-08 11:14:00.000000000 +0100
@@ -30,66 +30,47 @@
 
 #include <stdint.h>
 
-/* MI_INSTRUCTION */
-#define CMD_MI          0x00
-
-#define OPC_MI_FLUSH                            (0x04)
-
-struct i915_mi_flush
-{
-    struct {
-        unsigned map_cache_invalidate : 1;
-        unsigned pad0 : 1;
-        unsigned render_cache_flush_inhibit : 1;
-        unsigned scene_count : 1;
-        unsigned end_scene : 1;
-        unsigned pad1 : 18;
-        unsigned opcode : 6;
-        unsigned type : 3;
-    } dw0;
-};
-
 /* BLT */
 #define CMD_2D          0x02
 #define OPC_COLOR_BLT                           (0x40)
 
-struct i915_color_blt
-{
-    struct {
-        unsigned length : 5;
-        unsigned pad0 : 15;
-        unsigned bpp_mask : 2;
-        unsigned opcode : 7;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned pitch : 16;
-        unsigned rop : 8;
-        unsigned color_depth : 2;
-        unsigned pad0 : 6;
-    } dw1;
-
-    struct {
-        unsigned width : 16;
-        unsigned height : 16;
-    } dw2;
-
-    struct {
-        unsigned address;
-    } dw3;
-
-    struct {
-        unsigned pattern;
-    } dw4;
+struct i915_color_blt {
+	struct {
+		unsigned length:5;
+		unsigned pad0:15;
+		unsigned bpp_mask:2;
+		unsigned opcode:7;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned pitch:16;
+		unsigned rop:8;
+		unsigned color_depth:2;
+		unsigned pad0:6;
+	} dw1;
+
+	struct {
+		unsigned width:16;
+		unsigned height:16;
+	} dw2;
+
+	struct {
+		unsigned address;
+	} dw3;
+
+	struct {
+		unsigned pattern;
+	} dw4;
 };
 
 /* 3D_INSTRUCTION */
 #define CMD_3D          0x03
+#define OPCODE_3D(x)	(CMD_3D << 29 | (x) << 16)
 
 #define OPC_3DMPEG_MACROBLOCK_IPICTURE          (0x01 + (0x1e << 5))
 #define OPC_3DMPEG_SET_ORIGIN                   (0x10 + (0x1e << 5))
-#define OPC_3DMPEG_MACROBLOCK                   (0x11 + (0x1e << 5))        
+#define OPC_3DMPEG_MACROBLOCK                   (0x11 + (0x1e << 5))
 #define OPC_3DMPEG_SLICE                        (0x12 + (0x1e << 5))
 #define OPC_3DMPEG_QM_PALETTE_LOAD              (0x13 + (0x1e << 5))
 
@@ -98,9 +79,11 @@ struct i915_color_blt
 #define OPC_3DSTATE_MAP_STATE                   (0x00 + (0x1d << 8))
 #define OPC_3DSTATE_SAMPLER_STATE               (0x01 + (0x1d << 8))
 #define OPC_3DSTATE_LOAD_STATE_IMMEDIATE_1      (0x04 + (0x1d << 8))
+#define OP_3D_LOAD_STATE_IMMEDIATE_1      	OPCODE_3D(OPC_3DSTATE_LOAD_STATE_IMMEDIATE_1)
 #define OPC_3DSTATE_PIXEL_SHADER_PROGRAM        (0x05 + (0x1d << 8))
 #define OPC_3DSTATE_PIXEL_SHADER_CONSTANTS      (0x06 + (0x1d << 8))
 #define OPC_3DSTATE_LOAD_INDIRECT               (0x07 + (0x1d << 8))
+#define OP_3D_LOAD_INDIRECT               	OPCODE_3D(OPC_3DSTATE_LOAD_INDIRECT)
 
 #define OPC_3DSTATE_MODES_5                     (0x0c)
 #define OPC_3DSTATE_COORD_SET_BINDINGS          (0x16)
@@ -115,128 +98,118 @@ struct i915_color_blt
 /*
  * 3DMPEG instructions
  */
-struct i915_3dmpeg_macroblock_header
-{
-    struct {
-        unsigned length : 19;
-        unsigned opcode : 10;
-        unsigned type : 3;
-    } dw0;
-    
-    struct {
-        unsigned mb_intra : 1;
-        unsigned forward : 1;
-        unsigned backward : 1;
-        unsigned h263_4mv : 1;
-        unsigned pad0 : 1;
-        unsigned dct_type : 1;
-        unsigned pad1 : 2;
-        unsigned motion_type : 2;
-        unsigned pad2 : 2;
-        unsigned vertical_field_select : 4;
-        unsigned coded_block_pattern : 6;
-        unsigned pad3 : 2;
-        unsigned skipped_macroblocks : 7;
-        unsigned pad4 : 1;
-    } dw1;
-};
-
-struct i915_3dmpeg_macroblock_0mv
-{
-    struct i915_3dmpeg_macroblock_header header;
-};
-
-struct i915_3dmpeg_macroblock_1fbmv
-{
-    struct i915_3dmpeg_macroblock_header header;    
-    unsigned dw2;
-    unsigned dw3;
-};
-struct i915_3dmpeg_macroblock_2fbmv
-{
-    struct i915_3dmpeg_macroblock_header header;
-    unsigned dw2;
-    unsigned dw3;
-    unsigned dw4;
-    unsigned dw5;
-};
-
-struct i915_3dmpeg_macroblock_5fmv
-{
-    struct i915_3dmpeg_macroblock_header header;
-    unsigned dw2;
-    unsigned dw3;
-    unsigned dw4;
-    unsigned dw5;
-    unsigned dw6;
-};
-  
-struct i915_3dmpeg_macroblock_ipicture
-{
-    struct {
-        unsigned pad0 : 5;
-        unsigned dct_type : 1;
-        unsigned pad1 : 13;
-        unsigned opcode : 10;
-        unsigned type : 3;
-    } dw0;
-};
-
-struct i915_3dmpeg_set_origin
-{
-    struct {
-        unsigned length : 19;
-        unsigned opcode : 10;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned v_origin : 7;
-        unsigned pad0 : 1;
-        unsigned h_origin : 7;
-        unsigned pad1 : 17;
-    } dw1;
-};
-      
-struct i915_3dmpeg_slice
-{
-    struct {
-        unsigned length : 19;
-        unsigned opcode : 10;
-        unsigned type : 3;
-    } dw0;
-    
-    struct {
-        unsigned fst_mb_bit_off : 3;
-        unsigned pad0 : 5;
-        unsigned mb_count : 7;
-        unsigned pad1 : 1;
-        unsigned v_position : 7;
-        unsigned pad2 : 1;
-        unsigned h_position : 7;
-        unsigned pad3 : 1;
-    } dw1;
-
-    struct {
-        unsigned length_minus_one : 17;
-        unsigned pad0 : 7;
-        unsigned qt_scale_code : 5;
-        unsigned pad1 : 3;
-    } dw2;
-};
-
-struct i915_3dmpeg_qm_palette_load
-{
-    struct {
-        unsigned length : 4;
-        unsigned pad0 : 15;
-        unsigned opcode : 10;
-        unsigned type : 3;
-    } dw0;
-    
-    unsigned quantmatrix[16];    
-};        
+struct i915_3dmpeg_macroblock_header {
+	struct {
+		unsigned length:19;
+		unsigned opcode:10;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned mb_intra:1;
+		unsigned forward:1;
+		unsigned backward:1;
+		unsigned h263_4mv:1;
+		unsigned pad0:1;
+		unsigned dct_type:1;
+		unsigned pad1:2;
+		unsigned motion_type:2;
+		unsigned pad2:2;
+		unsigned vertical_field_select:4;
+		unsigned coded_block_pattern:6;
+		unsigned pad3:2;
+		unsigned skipped_macroblocks:7;
+		unsigned pad4:1;
+	} dw1;
+};
+
+struct i915_3dmpeg_macroblock_0mv {
+	struct i915_3dmpeg_macroblock_header header;
+};
+
+struct i915_3dmpeg_macroblock_1fbmv {
+	struct i915_3dmpeg_macroblock_header header;
+	unsigned dw2;
+	unsigned dw3;
+};
+struct i915_3dmpeg_macroblock_2fbmv {
+	struct i915_3dmpeg_macroblock_header header;
+	unsigned dw2;
+	unsigned dw3;
+	unsigned dw4;
+	unsigned dw5;
+};
+
+struct i915_3dmpeg_macroblock_5fmv {
+	struct i915_3dmpeg_macroblock_header header;
+	unsigned dw2;
+	unsigned dw3;
+	unsigned dw4;
+	unsigned dw5;
+	unsigned dw6;
+};
+
+struct i915_3dmpeg_macroblock_ipicture {
+	struct {
+		unsigned pad0:5;
+		unsigned dct_type:1;
+		unsigned pad1:13;
+		unsigned opcode:10;
+		unsigned type:3;
+	} dw0;
+};
+
+struct i915_3dmpeg_set_origin {
+	struct {
+		unsigned length:19;
+		unsigned opcode:10;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned v_origin:7;
+		unsigned pad0:1;
+		unsigned h_origin:7;
+		unsigned pad1:17;
+	} dw1;
+};
+
+struct i915_3dmpeg_slice {
+	struct {
+		unsigned length:19;
+		unsigned opcode:10;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned fst_mb_bit_off:3;
+		unsigned pad0:5;
+		unsigned mb_count:7;
+		unsigned pad1:1;
+		unsigned v_position:7;
+		unsigned pad2:1;
+		unsigned h_position:7;
+		unsigned pad3:1;
+	} dw1;
+
+	struct {
+		unsigned length_minus_one:17;
+		unsigned pad0:7;
+		unsigned qt_scale_code:5;
+		unsigned pad1:3;
+	} dw2;
+};
+
+struct i915_3dmpeg_qm_palette_load {
+	struct {
+		unsigned length:4;
+		unsigned pad0:15;
+		unsigned opcode:10;
+		unsigned type:3;
+	} dw0;
 
+	unsigned quantmatrix[16];
+};
 
 /*
  * 3DSTATE instruction
@@ -249,31 +222,30 @@ struct i915_3dmpeg_qm_palette_load
 #define TILEWALK_XMAJOR         0
 #define TILEWALK_YMAJOR         1
 
-struct i915_3dstate_buffer_info
-{
-    struct {
-        unsigned length : 16;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned pad0 : 2;
-        unsigned pitch : 12;
-        unsigned pad1 : 7;
-        unsigned walk : 1;
-        unsigned tiled_surface : 1;
-        unsigned fence_regs : 1;
-        unsigned buffer_id : 4;
-        unsigned aux_id : 1;
-        unsigned pad2 : 3;
-    } dw1;
-
-    struct {
-        unsigned pad0 : 2;
-        unsigned base_address : 27;
-        unsigned pad1 : 3;
-    } dw2;
+struct i915_3dstate_buffer_info {
+	struct {
+		unsigned length:16;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned pad0:2;
+		unsigned pitch:12;
+		unsigned pad1:7;
+		unsigned walk:1;
+		unsigned tiled_surface:1;
+		unsigned fence_regs:1;
+		unsigned buffer_id:4;
+		unsigned aux_id:1;
+		unsigned pad2:3;
+	} dw1;
+
+	struct {
+		unsigned pad0:2;
+		unsigned base_address:27;
+		unsigned pad1:3;
+	} dw2;
 };
 
 #define COLORBUFFER_8BIT         0x00
@@ -288,33 +260,31 @@ struct i915_3dstate_buffer_info
 #define COLORBUFFER_A1R5G5B5     0x09
 #define COLORBUFFER_A2R10G10B10  0x0a
 
-
-struct i915_3dstate_dest_buffer_variables
-{
-    struct {
-        unsigned length : 16;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-    
-    struct {
-        unsigned v_ls_offset : 1;
-        unsigned v_ls : 1;
-        unsigned depth_fmt : 2;
-        unsigned pad0 : 4;
-        unsigned color_fmt : 4;
-        unsigned yuv422_select : 3;
-        unsigned pad1 : 1;
-        unsigned dest_v_bias : 4;
-        unsigned dest_h_bias : 4;
-        unsigned dither_enhancement : 1;
-        unsigned linear_gamma : 1;
-        unsigned dither_pattern : 2;
-        unsigned lod_preclamp : 1;
-        unsigned edt_zone : 1;          /* early depth test in zone rendering */
-        unsigned texture_default_color : 1;
-        unsigned edt_classic : 1;       /* early depth test in classic mode */
-    } dw1;
+struct i915_3dstate_dest_buffer_variables {
+	struct {
+		unsigned length:16;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned v_ls_offset:1;
+		unsigned v_ls:1;
+		unsigned depth_fmt:2;
+		unsigned pad0:4;
+		unsigned color_fmt:4;
+		unsigned yuv422_select:3;
+		unsigned pad1:1;
+		unsigned dest_v_bias:4;
+		unsigned dest_h_bias:4;
+		unsigned dither_enhancement:1;
+		unsigned linear_gamma:1;
+		unsigned dither_pattern:2;
+		unsigned lod_preclamp:1;
+		unsigned edt_zone:1;	/* early depth test in zone rendering */
+		unsigned texture_default_color:1;
+		unsigned edt_classic:1;	/* early depth test in classic mode */
+	} dw1;
 };
 
 #define MPEG_DECODE_MC          0
@@ -331,56 +301,55 @@ struct i915_3dstate_dest_buffer_variable
 #define MC_SUB_1V               0
 #define MC_SUB_2V               1
 
-struct i915_3dstate_dest_buffer_variables_mpeg
-{
-    struct {
-        unsigned length : 16;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned picture_width : 7;
-        unsigned pad0 : 1;
-        unsigned v_subsample_factor : 2;
-        unsigned h_subsample_factor : 2;
-        unsigned tff : 1;
-        unsigned mismatch : 1;
-        unsigned pad1 : 1;
-        unsigned intra8 : 1;
-        unsigned abort_on_error : 8;
-        unsigned pad2 : 4;
-        unsigned bidir_avrg_control : 1;
-        unsigned rcontrol : 1;
-        unsigned decode_mode : 2;
-    } dw1;
-
-    struct {
-        unsigned pad0 : 1;
-        unsigned picture_coding_type : 2;
-        unsigned pad1 : 2;
-        unsigned scan_order : 1;
-        unsigned pad2 : 2;
-        unsigned q_scale_type : 1;
-        unsigned concealment : 1;
-        unsigned fpf_dct : 1;
-        unsigned pad3 : 2;
-        unsigned intra_dc : 2;
-        unsigned intra_vlc : 1;
-        unsigned f_code00 : 4;
-        unsigned f_code01 : 4;
-        unsigned f_code10 : 4;
-        unsigned f_code11 : 4;
-    } dw2;
+struct i915_3dstate_dest_buffer_variables_mpeg {
+	struct {
+		unsigned length:16;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned picture_width:7;
+		unsigned pad0:1;
+		unsigned v_subsample_factor:2;
+		unsigned h_subsample_factor:2;
+		unsigned tff:1;
+		unsigned mismatch:1;
+		unsigned pad1:1;
+		unsigned intra8:1;
+		unsigned abort_on_error:8;
+		unsigned pad2:4;
+		unsigned bidir_avrg_control:1;
+		unsigned rcontrol:1;
+		unsigned decode_mode:2;
+	} dw1;
+
+	struct {
+		unsigned pad0:1;
+		unsigned picture_coding_type:2;
+		unsigned pad1:2;
+		unsigned scan_order:1;
+		unsigned pad2:2;
+		unsigned q_scale_type:1;
+		unsigned concealment:1;
+		unsigned fpf_dct:1;
+		unsigned pad3:2;
+		unsigned intra_dc:2;
+		unsigned intra_vlc:1;
+		unsigned f_code00:4;
+		unsigned f_code01:4;
+		unsigned f_code10:4;
+		unsigned f_code11:4;
+	} dw2;
 };
 
 struct i915_mc_static_indirect_state_buffer {
-    struct i915_3dstate_buffer_info dest_y;
-    struct i915_3dstate_buffer_info dest_u;
-    struct i915_3dstate_buffer_info dest_v;
-    struct i915_3dstate_dest_buffer_variables dest_buf;
-    struct i915_3dstate_dest_buffer_variables_mpeg dest_buf_mpeg;
-    struct i915_3dstate_buffer_info corr;
+	struct i915_3dstate_buffer_info dest_y;
+	struct i915_3dstate_buffer_info dest_u;
+	struct i915_3dstate_buffer_info dest_v;
+	struct i915_3dstate_dest_buffer_variables dest_buf;
+	struct i915_3dstate_dest_buffer_variables_mpeg dest_buf_mpeg;
+	struct i915_3dstate_buffer_info corr;
 };
 
 #define MAP_MAP0        0x0001
@@ -400,61 +369,59 @@ struct i915_mc_static_indirect_state_buf
 #define MAP_MAP14       0x4000
 #define MAP_MAP15       0x8000
 
-struct texture_map
-{
-    struct {
-        unsigned v_ls_offset : 1;
-        unsigned v_ls : 1;
-        unsigned base_address : 27;
-        unsigned pad0 : 2;
-        unsigned untrusted : 1;
-    } tm0;
-
-    struct {
-        unsigned tile_walk : 1;
-        unsigned tiled_surface : 1;
-        unsigned utilize_fence_regs : 1;
-        unsigned texel_fmt : 4;
-        unsigned surface_fmt : 3;
-        unsigned width : 11;
-        unsigned height : 11;
-    } tm1;
-    
-    struct {
-        unsigned depth : 8;
-        unsigned mipmap_layout : 1;
-        unsigned max_lod : 6;
-        unsigned cube_face : 6;
-        unsigned pitch : 11;
-    } tm2;
-};
-
-struct i915_3dstate_map_state
-{
-    struct {
-        unsigned length : 6;
-        unsigned pad0 : 9;
-        unsigned retain : 1;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned map_mask : 16;
-        unsigned pad0 : 16;
-    } dw1;
+struct texture_map {
+	struct {
+		unsigned v_ls_offset:1;
+		unsigned v_ls:1;
+		unsigned base_address:27;
+		unsigned pad0:2;
+		unsigned untrusted:1;
+	} tm0;
+
+	struct {
+		unsigned tile_walk:1;
+		unsigned tiled_surface:1;
+		unsigned utilize_fence_regs:1;
+		unsigned texel_fmt:4;
+		unsigned surface_fmt:3;
+		unsigned width:11;
+		unsigned height:11;
+	} tm1;
+
+	struct {
+		unsigned depth:8;
+		unsigned mipmap_layout:1;
+		unsigned max_lod:6;
+		unsigned cube_face:6;
+		unsigned pitch:11;
+	} tm2;
+};
+
+struct i915_3dstate_map_state {
+	struct {
+		unsigned length:6;
+		unsigned pad0:9;
+		unsigned retain:1;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned map_mask:16;
+		unsigned pad0:16;
+	} dw1;
 };
 
 struct i915_mc_map_state {
-    struct i915_3dstate_map_state y_map;
-    struct texture_map y_forward;
-    struct texture_map y_backward;
-    struct i915_3dstate_map_state u_map;
-    struct texture_map u_forward;
-    struct texture_map u_backward;
-    struct i915_3dstate_map_state v_map;
-    struct texture_map v_forward;
-    struct texture_map v_backward;
+	struct i915_3dstate_map_state y_map;
+	struct texture_map y_forward;
+	struct texture_map y_backward;
+	struct i915_3dstate_map_state u_map;
+	struct texture_map u_forward;
+	struct texture_map u_backward;
+	struct i915_3dstate_map_state v_map;
+	struct texture_map v_forward;
+	struct texture_map v_backward;
 };
 
 #define SAMPLER_SAMPLER0        0x0001
@@ -505,209 +472,202 @@ struct i915_mc_map_state {
 #define TEXCOORDMODE_CLAMP_BORDER       4
 #define TEXCOORDMODE_MIRROR_ONCE        5
 
-struct texture_sampler
-{
-    struct {
-        unsigned shadow_function : 3;
-        unsigned max_anisotropy : 1;
-        unsigned shadow_enable : 1;
-        unsigned lod_bias : 9;
-        unsigned min_filter : 3;
-        unsigned mag_filter : 3;
-        unsigned mip_filter : 2;
-        unsigned base_level : 5;
-        unsigned chromakey_index : 2;
-        unsigned color_conversion : 1;
-        unsigned planar2packet : 1;
-        unsigned reverse_gamma : 1;
-    } ts0;
-
-    struct {
-        unsigned east_deinterlacer : 1;
-        unsigned map_index : 4;
-        unsigned normalized_coor : 1;
-        unsigned tcz_control : 3;
-        unsigned tcy_control : 3;
-        unsigned tcx_control : 3;
-        unsigned chromakey_enable : 1;
-        unsigned keyed_texture_filter : 1;
-        unsigned kill_pixel : 1;
-        unsigned pad0 : 6;
-        unsigned min_lod : 8;
-    } ts1;
-
-    struct {
-        unsigned default_color;
-    } ts2;
-};
-
-struct i915_3dstate_sampler_state
-{
-    struct {
-        unsigned length : 6;
-        unsigned pad0 : 10;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned sampler_masker : 16;
-        unsigned pad0 : 16;
-    } dw1;
-    /* we always use two samplers for mc */
-    struct texture_sampler sampler0;
-    struct texture_sampler sampler1;
-};
-
-struct arithmetic_inst
-{
-    struct {
-        unsigned pad0 : 2;
-        unsigned src0_reg : 5;
-        unsigned src0_reg_t : 3;
-        unsigned dest_channel_mask : 4;
-        unsigned dest_reg : 4;
-        unsigned pad1 : 1;
-        unsigned dest_reg_t: 3;
-        unsigned dest_saturate : 1;
-        unsigned pad2 : 1;
-        unsigned opcode : 5;
-        unsigned pad3 : 3;
-    } dw0;
-
-    struct {
-        unsigned src1_y_select : 3;
-        unsigned src1_y_negate : 1;
-        unsigned src1_x_select : 3;
-        unsigned src1_x_negate : 1;
-        unsigned src1_reg : 5;
-        unsigned src1_reg_t : 3;
-        unsigned src0_w_select : 3;
-        unsigned src0_w_negate : 1;
-        unsigned src0_z_select : 3;
-        unsigned src0_z_negate : 1;
-        unsigned src0_y_select : 3;
-        unsigned src0_y_negate : 1;
-        unsigned src0_x_select : 3;
-        unsigned src0_x_negate : 1;
-    } dw1;
-
-    struct {
-        unsigned src2_w_select : 3;
-        unsigned src2_w_negate : 1;
-        unsigned src2_z_select : 3;
-        unsigned src2_z_negate : 1;
-        unsigned src2_y_select : 3;
-        unsigned src2_y_negate : 1;
-        unsigned src2_x_select : 3;
-        unsigned src2_x_negate : 1;
-        unsigned src2_reg : 5;
-        unsigned src2_reg_t : 3;
-        unsigned src1_w_select : 3;
-        unsigned src1_w_negate : 1;
-        unsigned src1_z_select : 3;
-        unsigned src1_z_negate : 1;
-    } dw2;
-};
-
-struct texture_inst
-{
-    struct {
-        unsigned sampler_reg : 4;
-        unsigned pad0 : 10;
-        unsigned dest_reg : 4;
-        unsigned pad1 : 1;
-        unsigned dest_reg_t : 3;
-        unsigned pad2 : 2;
-        unsigned opcode : 5;
-        unsigned pad3 : 3;
-    } dw0;
-
-    struct {
-        unsigned pad0 : 16;
-        unsigned address_reg : 5;
-        unsigned pad1 : 3;
-        unsigned address_reg_t : 3;
-        unsigned pad2 : 5;
-    } dw1;
-
-    struct {
-        unsigned pad0;
-    } dw2;
-};
-
-struct declaration_inst
-{
-    struct {
-        unsigned pad0 : 10;
-        unsigned decl_channel_mask : 4;
-        unsigned decl_reg : 4;
-        unsigned pad1 : 1;
-        unsigned decl_reg_t : 2;
-        unsigned pad2 : 1;
-        unsigned sampler_type : 2;
-        unsigned opcode : 5;
-        unsigned pad3 : 3;
-    } dw0;
-
-    struct {
-        unsigned pad0;
-    } dw1;
-
-    struct {
-        unsigned pad0;
-    } dw2;
-};
-
-union shader_inst 
-{
-    struct arithmetic_inst a;
-    struct texture_inst t;
-    struct declaration_inst d;
+struct texture_sampler {
+	struct {
+		unsigned shadow_function:3;
+		unsigned max_anisotropy:1;
+		unsigned shadow_enable:1;
+		unsigned lod_bias:9;
+		unsigned min_filter:3;
+		unsigned mag_filter:3;
+		unsigned mip_filter:2;
+		unsigned base_level:5;
+		unsigned chromakey_index:2;
+		unsigned color_conversion:1;
+		unsigned planar2packet:1;
+		unsigned reverse_gamma:1;
+	} ts0;
+
+	struct {
+		unsigned east_deinterlacer:1;
+		unsigned map_index:4;
+		unsigned normalized_coor:1;
+		unsigned tcz_control:3;
+		unsigned tcy_control:3;
+		unsigned tcx_control:3;
+		unsigned chromakey_enable:1;
+		unsigned keyed_texture_filter:1;
+		unsigned kill_pixel:1;
+		unsigned pad0:6;
+		unsigned min_lod:8;
+	} ts1;
+
+	struct {
+		unsigned default_color;
+	} ts2;
+};
+
+struct i915_3dstate_sampler_state {
+	struct {
+		unsigned length:6;
+		unsigned pad0:10;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned sampler_masker:16;
+		unsigned pad0:16;
+	} dw1;
+	/* we always use two samplers for mc */
+	struct texture_sampler sampler0;
+	struct texture_sampler sampler1;
+};
+
+struct arithmetic_inst {
+	struct {
+		unsigned pad0:2;
+		unsigned src0_reg:5;
+		unsigned src0_reg_t:3;
+		unsigned dest_channel_mask:4;
+		unsigned dest_reg:4;
+		unsigned pad1:1;
+		unsigned dest_reg_t:3;
+		unsigned dest_saturate:1;
+		unsigned pad2:1;
+		unsigned opcode:5;
+		unsigned pad3:3;
+	} dw0;
+
+	struct {
+		unsigned src1_y_select:3;
+		unsigned src1_y_negate:1;
+		unsigned src1_x_select:3;
+		unsigned src1_x_negate:1;
+		unsigned src1_reg:5;
+		unsigned src1_reg_t:3;
+		unsigned src0_w_select:3;
+		unsigned src0_w_negate:1;
+		unsigned src0_z_select:3;
+		unsigned src0_z_negate:1;
+		unsigned src0_y_select:3;
+		unsigned src0_y_negate:1;
+		unsigned src0_x_select:3;
+		unsigned src0_x_negate:1;
+	} dw1;
+
+	struct {
+		unsigned src2_w_select:3;
+		unsigned src2_w_negate:1;
+		unsigned src2_z_select:3;
+		unsigned src2_z_negate:1;
+		unsigned src2_y_select:3;
+		unsigned src2_y_negate:1;
+		unsigned src2_x_select:3;
+		unsigned src2_x_negate:1;
+		unsigned src2_reg:5;
+		unsigned src2_reg_t:3;
+		unsigned src1_w_select:3;
+		unsigned src1_w_negate:1;
+		unsigned src1_z_select:3;
+		unsigned src1_z_negate:1;
+	} dw2;
+};
+
+struct texture_inst {
+	struct {
+		unsigned sampler_reg:4;
+		unsigned pad0:10;
+		unsigned dest_reg:4;
+		unsigned pad1:1;
+		unsigned dest_reg_t:3;
+		unsigned pad2:2;
+		unsigned opcode:5;
+		unsigned pad3:3;
+	} dw0;
+
+	struct {
+		unsigned pad0:16;
+		unsigned address_reg:5;
+		unsigned pad1:3;
+		unsigned address_reg_t:3;
+		unsigned pad2:5;
+	} dw1;
+
+	struct {
+		unsigned pad0;
+	} dw2;
+};
+
+struct declaration_inst {
+	struct {
+		unsigned pad0:10;
+		unsigned decl_channel_mask:4;
+		unsigned decl_reg:4;
+		unsigned pad1:1;
+		unsigned decl_reg_t:2;
+		unsigned pad2:1;
+		unsigned sampler_type:2;
+		unsigned opcode:5;
+		unsigned pad3:3;
+	} dw0;
+
+	struct {
+		unsigned pad0;
+	} dw1;
+
+	struct {
+		unsigned pad0;
+	} dw2;
+};
+
+union shader_inst {
+	struct arithmetic_inst a;
+	struct texture_inst t;
+	struct declaration_inst d;
 };
 
 struct i915_3dstate_pixel_shader_header {
-    unsigned length : 9;
-    unsigned pad0 : 6;
-    unsigned retain : 1;
-    unsigned opcode : 13;
-    unsigned type : 3;
-};
-
-struct i915_3dstate_pixel_shader_program
-{
-    struct i915_3dstate_pixel_shader_header shader0;
-    /* mov oC, c0.0000 */
-    uint32_t inst0[3];
-
-    struct i915_3dstate_pixel_shader_header shader1;
-    /* dcl t0.xy */
-    /* dcl t1.xy */
-    /* dcl_2D s0 */
-    /* texld r0, t0, s0 */
-    /* mov oC, r0 */
-    uint32_t inst1[3*5];
-
-    struct i915_3dstate_pixel_shader_header shader2;
-    /* dcl t2.xy */
-    /* dcl t3.xy */
-    /* dcl_2D s1 */
-    /* texld r0, t2, s1 */
-    /* mov oC, r0 */
-    uint32_t inst2[3*5];
-
-    struct i915_3dstate_pixel_shader_header shader3;
-    /* dcl t0.xy */
-    /* dcl t1.xy */
-    /* dcl t2.xy */
-    /* dcl t3.xy */
-    /* dcl_2D s0 */
-    /* dcl_2D s1 */
-    /* texld r0, t0, s0 */
-    /* texld r0, t2, s1 */
-    /* add r0, r0, r1*/
-    /* mov oC, r0 */
-    uint32_t inst3[3*10];
+	unsigned length:9;
+	unsigned pad0:6;
+	unsigned retain:1;
+	unsigned opcode:13;
+	unsigned type:3;
+};
+
+struct i915_3dstate_pixel_shader_program {
+	struct i915_3dstate_pixel_shader_header shader0;
+	/* mov oC, c0.0000 */
+	uint32_t inst0[3];
+
+	struct i915_3dstate_pixel_shader_header shader1;
+	/* dcl t0.xy */
+	/* dcl t1.xy */
+	/* dcl_2D s0 */
+	/* texld r0, t0, s0 */
+	/* mov oC, r0 */
+	uint32_t inst1[3 * 5];
+
+	struct i915_3dstate_pixel_shader_header shader2;
+	/* dcl t2.xy */
+	/* dcl t3.xy */
+	/* dcl_2D s1 */
+	/* texld r0, t2, s1 */
+	/* mov oC, r0 */
+	uint32_t inst2[3 * 5];
+
+	struct i915_3dstate_pixel_shader_header shader3;
+	/* dcl t0.xy */
+	/* dcl t1.xy */
+	/* dcl t2.xy */
+	/* dcl t3.xy */
+	/* dcl_2D s0 */
+	/* dcl_2D s1 */
+	/* texld r0, t0, s0 */
+	/* texld r0, t2, s1 */
+	/* add r0, r0, r1 */
+	/* mov oC, r0 */
+	uint32_t inst3[3 * 10];
 };
 
 #define REG_CR0         0x00000001
@@ -743,28 +703,26 @@ struct i915_3dstate_pixel_shader_program
 #define REG_CR30        0x40000000
 #define REG_CR31        0x80000000
 
-struct shader_constant
-{
-    float x;
-    float y;
-    float z;
-    float w;
-};
-
-struct i915_3dstate_pixel_shader_constants
-{
-    struct {
-        unsigned length : 8;
-        unsigned pad0 : 8;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned reg_mask;
-    } dw1;
-    /* we only need one constant */
-    struct shader_constant value;
+struct shader_constant {
+	float x;
+	float y;
+	float z;
+	float w;
+};
+
+struct i915_3dstate_pixel_shader_constants {
+	struct {
+		unsigned length:8;
+		unsigned pad0:8;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned reg_mask;
+	} dw1;
+	/* we only need one constant */
+	struct shader_constant value;
 };
 
 #define BLOCK_SIS       0x01
@@ -773,42 +731,36 @@ struct i915_3dstate_pixel_shader_constan
 #define BLOCK_MSB       0x08
 #define BLOCK_PSP       0x10
 #define BLOCK_PSC       0x20
+#define BLOCK_MASK_SHIFT 8
 
-typedef struct _state_ddword
-{
-    struct {
-        unsigned valid : 1;
-        unsigned force : 1;
-        unsigned buffer_address : 30;
-    } dw0;
-
-    struct {
-        unsigned length : 9;
-        unsigned pad0 : 23;
-    } dw1;
-} sis_state, ssb_state, msb_state, psp_state, psc_state;
-
-typedef struct _state_dword
-{
-    struct {
-        unsigned valid : 1;
-        unsigned reset : 1;
-        unsigned buffer_address : 30;
-    } dw0;
-} dis_state;
-
-struct i915_3dstate_load_indirect
-{
-    struct {
-        unsigned length : 8;
-        unsigned block_mask : 6;
-        unsigned mem_select : 1;
-        unsigned pad0 : 1;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
+typedef struct _state_ddword {
+	struct {
+		unsigned valid:1;
+		unsigned force:1;
+		unsigned buffer_address:30;
+	} dw0;
+
+	struct {
+		unsigned length:9;
+		unsigned pad0:23;
+	} dw1;
+} sis_state, msb_state;
+#define STATE_VALID	0x1
+#define STATE_FORCE	0x2
+
+struct i915_3dstate_load_indirect {
+	struct {
+		unsigned length:8;
+		unsigned block_mask:6;
+		unsigned mem_select:1;
+		unsigned pad0:1;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
 };
 
+#define OP_3D_LOAD_INDIRECT_GFX_ADDR (1 << 14)
+
 #define TEXCOORDFMT_2FP       0x00
 #define TEXCOORDFMT_3FP       0x01
 #define TEXCOORDFMT_4FP       0x02
@@ -816,53 +768,25 @@ struct i915_3dstate_load_indirect
 #define TEXCOORDFMT_2FP_16    0x04
 #define TEXCOORDFMT_4FP_16    0x05
 #define TEXCOORDFMT_NOT_PRESENT  0x0f
-struct s2_dword
-{
-    unsigned set0_texcoord_fmt : 4;
-    unsigned set1_texcoord_fmt : 4;
-    unsigned set2_texcoord_fmt : 4;
-    unsigned set3_texcoord_fmt : 4;
-    unsigned set4_texcoord_fmt : 4;
-    unsigned set5_texcoord_fmt : 4;
-    unsigned set6_texcoord_fmt : 4;
-    unsigned set7_texcoord_fmt : 4;
-};
-
-struct s3_dword
-{
-    unsigned set0_pcd : 1;
-    unsigned set0_ws_tcz : 1;
-    unsigned set0_ws_tcy : 1;
-    unsigned set0_ws_tcx : 1;
-    unsigned set1_pcd : 1;
-    unsigned set1_ws_tcz : 1;
-    unsigned set1_ws_tcy : 1;
-    unsigned set1_ws_tcx : 1;
-    unsigned set2_pcd : 1;
-    unsigned set2_ws_tcz : 1;
-    unsigned set2_ws_tcy : 1;
-    unsigned set2_ws_tcx : 1;
-    unsigned set3_pcd : 1;
-    unsigned set3_ws_tcz : 1;
-    unsigned set3_ws_tcy : 1;
-    unsigned set3_ws_tcx : 1;
-    unsigned set4_pcd : 1;
-    unsigned set4_ws_tcz : 1;
-    unsigned set4_ws_tcy : 1;
-    unsigned set4_ws_tcx : 1;
-    unsigned set5_pcd : 1;
-    unsigned set5_ws_tcz : 1;
-    unsigned set5_ws_tcy : 1;
-    unsigned set5_ws_tcx : 1;
-    unsigned set6_pcd : 1;
-    unsigned set6_ws_tcz : 1;
-    unsigned set6_ws_tcy : 1;
-    unsigned set6_ws_tcx : 1;
-    unsigned set7_pcd : 1;
-    unsigned set7_ws_tcz : 1;
-    unsigned set7_ws_tcy : 1;
-    unsigned set7_ws_tcx : 1;
-};
+struct s2_dword {
+	unsigned set0_texcoord_fmt:4;
+	unsigned set1_texcoord_fmt:4;
+	unsigned set2_texcoord_fmt:4;
+	unsigned set3_texcoord_fmt:4;
+	unsigned set4_texcoord_fmt:4;
+	unsigned set5_texcoord_fmt:4;
+	unsigned set6_texcoord_fmt:4;
+	unsigned set7_texcoord_fmt:4;
+};
+
+#define S3_SET0_PCD (1 << 0*4)
+#define S3_SET1_PCD (1 << 1*4)
+#define S3_SET2_PCD (1 << 2*4)
+#define S3_SET3_PCD (1 << 3*4)
+#define S3_SET4_PCD (1 << 4*4)
+#define S3_SET5_PCD (1 << 5*4)
+#define S3_SET6_PCD (1 << 6*4)
+#define S3_SET7_PCD (1 << 7*4)
 
 #define VERTEXHAS_XYZ      1
 #define VERTEXHAS_XYZW     2
@@ -876,103 +800,78 @@ struct s3_dword
 
 #define SHADEMODE_LINEAR   0
 #define SHADEMODE_FLAT     1
-struct s4_dword
-{
-    unsigned anti_aliasing_enable : 1;
-    unsigned sprite_point_enable : 1;
-    unsigned fog_parameter_present : 1;
-    unsigned local_depth_offset_enable : 1;
-    unsigned force_specular_diffuse_color : 1;
-    unsigned force_default_diffuse_color : 1;
-    unsigned position_mask : 3;
-    unsigned local_depth_offset_present : 1;
-    unsigned diffuse_color_presetn : 1;
-    unsigned specular_color_fog_factor_present : 1;
-    unsigned point_width_present : 1;
-    unsigned cull_mode : 2;
-    unsigned color_shade_mode : 1;
-    unsigned specular_shade_mode : 1;
-    unsigned fog_shade_mode : 1;
-    unsigned alpha_shade_mode : 1;
-    unsigned line_width : 4;
-    unsigned point_width : 9;
-};
-
-struct s5_dword 
-{
-    unsigned logic_op_enable : 1;
-    unsigned color_dither_enable  : 1;
-    unsigned stencil_test_enable : 1;
-    unsigned stencil_buffer_write_enable : 1;
-    unsigned stencil_pass_depth_pass_op : 3;
-    unsigned stencil_pass_depth_fail_op : 3;
-    unsigned stencil_fail_op : 3;
-    unsigned stencil_test_function : 3;
-    unsigned stencil_reference_value : 8;
-    unsigned fog_enable : 1;
-    unsigned global_depth_offset_enable : 1;
-    unsigned last_pixel_enable : 1;
-    unsigned force_default_point_width : 1;
-    unsigned color_buffer_component_write_disable : 4;
-};
-
-struct s6_dword
-{
-    unsigned triangle_pv : 2;
-    unsigned color_buffer_write : 1;
-    unsigned depth_buffer_write : 1;
-    unsigned dest_blend_factor : 4;
-    unsigned src_blend_factor : 4;
-    unsigned color_blend_function : 3;
-    unsigned color_buffer_blend : 1;
-    unsigned depth_test_function : 3;
-    unsigned depth_test_enable : 1;
-    unsigned alpha_reference_value : 8;
-    unsigned alpha_test_function : 3;
-    unsigned alpha_test_enable : 1;
-    
-};
-
-struct s7_dword
-{
-    unsigned global_depth_offset_const;
-};
-
-struct i915_3dstate_load_state_immediate_1
-{
-    struct {
-        unsigned length : 4;
-        unsigned load_s0 : 1;
-        unsigned load_s1 : 1;
-        unsigned load_s2 : 1;
-        unsigned load_s3 : 1;
-        unsigned load_s4 : 1;
-        unsigned load_s5 : 1;
-        unsigned load_s6 : 1;
-        unsigned load_s7 : 1;
-        unsigned pad0 : 4;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-};
-
-struct i915_3dstate_scissor_rectangle
-{
-    struct {
-        unsigned length : 16;
-        unsigned opcode : 13;
-        unsigned type : 3;
-    } dw0;
-
-    struct {
-        unsigned min_x : 16;
-        unsigned min_y : 16;
-    } dw1;
-
-    struct {
-        unsigned max_x : 16;
-        unsigned max_y : 16;
-    } dw2;
+struct s4_dword {
+	unsigned anti_aliasing_enable:1;
+	unsigned sprite_point_enable:1;
+	unsigned fog_parameter_present:1;
+	unsigned local_depth_offset_enable:1;
+	unsigned force_specular_diffuse_color:1;
+	unsigned force_default_diffuse_color:1;
+	unsigned position_mask:3;
+	unsigned local_depth_offset_present:1;
+	unsigned diffuse_color_presetn:1;
+	unsigned specular_color_fog_factor_present:1;
+	unsigned point_width_present:1;
+	unsigned cull_mode:2;
+	unsigned color_shade_mode:1;
+	unsigned specular_shade_mode:1;
+	unsigned fog_shade_mode:1;
+	unsigned alpha_shade_mode:1;
+	unsigned line_width:4;
+	unsigned point_width:9;
+};
+
+struct s5_dword {
+	unsigned logic_op_enable:1;
+	unsigned color_dither_enable:1;
+	unsigned stencil_test_enable:1;
+	unsigned stencil_buffer_write_enable:1;
+	unsigned stencil_pass_depth_pass_op:3;
+	unsigned stencil_pass_depth_fail_op:3;
+	unsigned stencil_fail_op:3;
+	unsigned stencil_test_function:3;
+	unsigned stencil_reference_value:8;
+	unsigned fog_enable:1;
+	unsigned global_depth_offset_enable:1;
+	unsigned last_pixel_enable:1;
+	unsigned force_default_point_width:1;
+	unsigned color_buffer_component_write_disable:4;
+};
+
+#define S6_COLOR_BUFFER_WRITE		(1 << 2)
+#define S6_DST_BLEND_FACTOR_SHIFT	4
+#define S6_SRC_BLEND_FACTOR_SHIFT	8
+#define S6_DEPTH_TEST_ENABLE		(1 << 19)
+
+struct s7_dword {
+	unsigned global_depth_offset_const;
+};
+
+#define OP_3D_LOAD_STATE_IMM_LOAD_S0 (1 << 4)
+#define OP_3D_LOAD_STATE_IMM_LOAD_S1 (1 << 5)
+#define OP_3D_LOAD_STATE_IMM_LOAD_S2 (1 << 6)
+#define OP_3D_LOAD_STATE_IMM_LOAD_S3 (1 << 7)
+#define OP_3D_LOAD_STATE_IMM_LOAD_S4 (1 << 8)
+#define OP_3D_LOAD_STATE_IMM_LOAD_S5 (1 << 9)
+#define OP_3D_LOAD_STATE_IMM_LOAD_S6 (1 << 10)
+#define OP_3D_LOAD_STATE_IMM_LOAD_S7 (1 << 11)
+
+struct i915_3dstate_scissor_rectangle {
+	struct {
+		unsigned length:16;
+		unsigned opcode:13;
+		unsigned type:3;
+	} dw0;
+
+	struct {
+		unsigned min_x:16;
+		unsigned min_y:16;
+	} dw1;
+
+	struct {
+		unsigned max_x:16;
+		unsigned max_y:16;
+	} dw2;
 };
 
 #define VERTEX_INLINE         0x00
@@ -991,40 +890,37 @@ struct i915_3dstate_scissor_rectangle
 #define PRIM_CLEAR_RECT       0x0a
 #define PRIM_ZONE_INIT        0x0d
 
-struct texture_coordinate_set
-{
-    unsigned tcx;
-    unsigned tcy;
-};
-
-struct vertex_data
-{
-    unsigned x;
-    unsigned y;
-    struct texture_coordinate_set tc0;
-    struct texture_coordinate_set tc1;
-};
-
-struct i915_3dprimitive
-{
-    union {
-        struct {
-            unsigned length : 18;
-            unsigned prim : 5;
-            unsigned vertex_location : 1;
-            unsigned opcode : 5;
-            unsigned type : 3;
-        } inline_prim;
-
-        struct {
-            unsigned vertex_count : 16;
-            unsigned pad0 : 1;
-            unsigned vertex_access_mode : 1;
-            unsigned prim : 5;
-            unsigned vertex_location : 1;
-            unsigned opcode : 5;
-            unsigned type : 3;
-        } indirect_prim;            
-    } dw0;
+struct texture_coordinate_set {
+	unsigned tcx;
+	unsigned tcy;
+};
+
+struct vertex_data {
+	unsigned x;
+	unsigned y;
+	struct texture_coordinate_set tc0;
+	struct texture_coordinate_set tc1;
+};
+
+struct i915_3dprimitive {
+	union {
+		struct {
+			unsigned length:18;
+			unsigned prim:5;
+			unsigned vertex_location:1;
+			unsigned opcode:5;
+			unsigned type:3;
+		} inline_prim;
+
+		struct {
+			unsigned vertex_count:16;
+			unsigned pad0:1;
+			unsigned vertex_access_mode:1;
+			unsigned prim:5;
+			unsigned vertex_location:1;
+			unsigned opcode:5;
+			unsigned type:3;
+		} indirect_prim;
+	} dw0;
 };
 #endif /*_I915_STRUCTS_H */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.c new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.c	2008-08-02 07:12:48.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.c	2011-02-08 11:14:00.000000000 +0100
@@ -31,2453 +31,1194 @@
 #include "i915_structs.h"
 #include "i915_program.h"
 
-#define YOFFSET(surface)        (surface->srf.offset)
-#define UOFFSET(surface)        (surface->srf.offset + \
-                                 SIZE_Y420(surface->width, surface->height) + \
-                                 SIZE_UV420(surface->width, surface->height))
-#define VOFFSET(surface)        (surface->srf.offset + \
-                                 SIZE_Y420(surface->width, surface->height))
+#define STRIDE(w)               (((w) + 0x3ff) & ~0x3ff)
+#define SIZE_Y420(w, h)         (h * STRIDE(w))
+#define SIZE_UV420(w, h)        ((h >> 1) * STRIDE(w >> 1))
+#define SIZE_YUV420(w, h)       (SIZE_Y420(w,h) + SIZE_UV420(w,h) * 2)
+#define UOFFSET(context)        (SIZE_Y420(context->width, context->height))
+#define VOFFSET(context)        (SIZE_Y420(context->width, context->height) + \
+                                 SIZE_UV420(context->width, context->height))
 
 typedef union {
-    int16_t component[2];
-    int32_t v;
+	int16_t component[2];
+	int32_t v;
 } vector_t;
 
-#if 0
-static int findOverlap(unsigned int width, unsigned int height,
-                       short *dstX, short *dstY,
-                       short *srcX, short *srcY,
-                       unsigned short *areaW, unsigned short *areaH)
-{
-    int w, h;
-    unsigned int mWidth, mHeight;
-
-    w = *areaW;
-    h = *areaH;
-
-    if ((*dstX >= width) || (*dstY >= height))
-        return 1;
-
-    if (*dstX < 0) {
-        w += *dstX;
-        *srcX -= *dstX;
-        *dstX = 0;
-    }
-
-    if (*dstY < 0) {
-        h += *dstY;
-        *srcY -= *dstY;
-        *dstY = 0;
-    }
-
-    if ((w <= 0) || ((h <= 0)))
-        return 1;
-
-    mWidth = width - *dstX;
-    mHeight = height - *dstY;
-    *areaW = (w <= mWidth) ? w : mWidth;
-    *areaH = (h <= mHeight) ? h : mHeight;
-    return 0;
-}
-#endif
-
 static void i915_inst_arith(unsigned int *inst,
-                            unsigned int op,
-                            unsigned int dest,
-                            unsigned int mask,
-                            unsigned int saturate,
-                            unsigned int src0, unsigned int src1, unsigned int src2)
-{
-    dest = UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest));
-    *inst = (op | A0_DEST(dest) | mask | saturate | A0_SRC0(src0));
-    inst++;
-    *inst = (A1_SRC0(src0) | A1_SRC1(src1));
-    inst++;
-    *inst = (A2_SRC1(src1) | A2_SRC2(src2));
+			    unsigned int op,
+			    unsigned int dest,
+			    unsigned int mask,
+			    unsigned int saturate,
+			    unsigned int src0, unsigned int src1,
+			    unsigned int src2)
+{
+	dest = UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest));
+	*inst = (op | A0_DEST(dest) | mask | saturate | A0_SRC0(src0));
+	inst++;
+	*inst = (A1_SRC0(src0) | A1_SRC1(src1));
+	inst++;
+	*inst = (A2_SRC1(src1) | A2_SRC2(src2));
 }
 
 static void i915_inst_decl(unsigned int *inst,
-                           unsigned int type,
-                           unsigned int nr,
-                           unsigned int d0_flags)
+			   unsigned int type,
+			   unsigned int nr, unsigned int d0_flags)
 {
-    unsigned int reg = UREG(type, nr);
+	unsigned int reg = UREG(type, nr);
 
-    *inst = (D0_DCL | D0_DEST(reg) | d0_flags);
-    inst++;
-    *inst = D1_MBZ;
-    inst++;
-    *inst = D2_MBZ;
+	*inst = (D0_DCL | D0_DEST(reg) | d0_flags);
+	inst++;
+	*inst = D1_MBZ;
+	inst++;
+	*inst = D2_MBZ;
 }
 
 static void i915_inst_texld(unsigned int *inst,
-                              unsigned int op,
-                              unsigned int dest,
-                              unsigned int coord,
-                              unsigned int sampler)
-{
-   dest = UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest));
-   *inst = (op | T0_DEST(dest) | T0_SAMPLER(sampler));
-   inst++;
-   *inst = T1_ADDRESS_REG(coord);
-   inst++;
-   *inst = T2_MBZ;
-}
-
-static void i915_emit_batch(void *data, int size, int flag)
-{
-    intelBatchbufferData(data, size, flag);
-}
-
-/* one time context initialization buffer */
-static uint32_t *one_time_load_state_imm1;
-static uint32_t *one_time_load_indirect;
-static int one_time_load_state_imm1_size, one_time_load_indirect_size;
-
-/* load indirect buffer for mc rendering */
-static uint32_t *mc_render_load_indirect;
-static int mc_render_load_indirect_size;
-
-static void i915_mc_one_time_context_init(XvMCContext *context)
-{
-    unsigned int dest, src0, src1, src2;
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    int i;
-    struct i915_3dstate_sampler_state *sampler_state;
-    struct i915_3dstate_pixel_shader_program *pixel_shader_program;
-    struct i915_3dstate_pixel_shader_constants *pixel_shader_constants;
-
-    /* sampler static state */
-    sampler_state = (struct i915_3dstate_sampler_state *)pI915XvMC->ssb.map;
-    /* pixel shader static state */
-    pixel_shader_program = (struct i915_3dstate_pixel_shader_program *)pI915XvMC->psp.map;
-    /* pixel shader contant static state */
-    pixel_shader_constants = (struct i915_3dstate_pixel_shader_constants *)pI915XvMC->psc.map;
-
-    memset(sampler_state, 0, sizeof(*sampler_state));
-    sampler_state->dw0.type = CMD_3D;
-    sampler_state->dw0.opcode = OPC_3DSTATE_SAMPLER_STATE;
-    sampler_state->dw0.length = 6;
-    sampler_state->dw1.sampler_masker = SAMPLER_SAMPLER0 | SAMPLER_SAMPLER1;
-
-    sampler_state->sampler0.ts0.reverse_gamma = 0;
-    sampler_state->sampler0.ts0.planar2packet = 0;
-    sampler_state->sampler0.ts0.color_conversion = 0;
-    sampler_state->sampler0.ts0.chromakey_index = 0;
-    sampler_state->sampler0.ts0.base_level = 0;
-    sampler_state->sampler0.ts0.mip_filter = MIPFILTER_NONE;        /* NONE */
-    sampler_state->sampler0.ts0.mag_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    sampler_state->sampler0.ts0.min_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    sampler_state->sampler0.ts0.lod_bias = 0;       /* 0.0 */
-    sampler_state->sampler0.ts0.shadow_enable = 0;
-    sampler_state->sampler0.ts0.max_anisotropy = ANISORATIO_2;
-    sampler_state->sampler0.ts0.shadow_function = PREFILTEROP_ALWAYS;
-    sampler_state->sampler0.ts1.min_lod = 0;        /* 0.0 Maximum Mip Level */
-    sampler_state->sampler0.ts1.kill_pixel = 0;
-    sampler_state->sampler0.ts1.keyed_texture_filter = 0;
-    sampler_state->sampler0.ts1.chromakey_enable = 0;
-    sampler_state->sampler0.ts1.tcx_control = TEXCOORDMODE_CLAMP;
-    sampler_state->sampler0.ts1.tcy_control = TEXCOORDMODE_CLAMP;
-    sampler_state->sampler0.ts1.tcz_control = TEXCOORDMODE_CLAMP;
-    sampler_state->sampler0.ts1.normalized_coor = 0;
-    sampler_state->sampler0.ts1.map_index = 0;
-    sampler_state->sampler0.ts1.east_deinterlacer = 0;
-    sampler_state->sampler0.ts2.default_color = 0;
-
-    sampler_state->sampler1.ts0.reverse_gamma = 0;
-    sampler_state->sampler1.ts0.planar2packet = 0;
-    sampler_state->sampler1.ts0.color_conversion = 0;
-    sampler_state->sampler1.ts0.chromakey_index = 0;
-    sampler_state->sampler1.ts0.base_level = 0;
-    sampler_state->sampler1.ts0.mip_filter = MIPFILTER_NONE;        /* NONE */
-    sampler_state->sampler1.ts0.mag_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    sampler_state->sampler1.ts0.min_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    sampler_state->sampler1.ts0.lod_bias = 0;       /* 0.0 */
-    sampler_state->sampler1.ts0.shadow_enable = 0;
-    sampler_state->sampler1.ts0.max_anisotropy = ANISORATIO_2;
-    sampler_state->sampler1.ts0.shadow_function = PREFILTEROP_ALWAYS;
-    sampler_state->sampler1.ts1.min_lod = 0;        /* 0.0 Maximum Mip Level */
-    sampler_state->sampler1.ts1.kill_pixel = 0;
-    sampler_state->sampler1.ts1.keyed_texture_filter = 0;
-    sampler_state->sampler1.ts1.chromakey_enable = 0;
-    sampler_state->sampler1.ts1.tcx_control = TEXCOORDMODE_CLAMP;
-    sampler_state->sampler1.ts1.tcy_control = TEXCOORDMODE_CLAMP;
-    sampler_state->sampler1.ts1.tcz_control = TEXCOORDMODE_CLAMP;
-    sampler_state->sampler1.ts1.normalized_coor = 0;
-    sampler_state->sampler1.ts1.map_index = 1;
-    sampler_state->sampler1.ts1.east_deinterlacer = 0;
-    sampler_state->sampler1.ts2.default_color = 0;
-
-    memset(pixel_shader_program, 0, sizeof(*pixel_shader_program));
-    pixel_shader_program->shader0.type = CMD_3D;
-    pixel_shader_program->shader0.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
-    pixel_shader_program->shader0.retain = 1;
-    pixel_shader_program->shader0.length = 2; /* 1 inst */
-    i = 0;
-
-    dest = UREG(REG_TYPE_OC, 0);
-    src0 = UREG(REG_TYPE_CONST, 0);
-    src1 = 0;
-    src2 = 0;
-    i915_inst_arith(&pixel_shader_program->inst0[i], A0_MOV,
-	    dest, A0_DEST_CHANNEL_ALL, A0_DEST_SATURATE, src0, src1, src2);
-
-    pixel_shader_program->shader1.type = CMD_3D;
-    pixel_shader_program->shader1.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
-    pixel_shader_program->shader1.retain = 1;
-    pixel_shader_program->shader1.length = 14; /* 5 inst */
-    i = 0;
-    /* dcl t0.xy */
-    i915_inst_decl(&pixel_shader_program->inst1[i], REG_TYPE_T, T_TEX0, D0_CHANNEL_XY);
-    i+=3;
-    /* dcl t1.xy */
-    i915_inst_decl(&pixel_shader_program->inst1[i], REG_TYPE_T, T_TEX1, D0_CHANNEL_XY);
-    /* dcl_2D s0 */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst1[i], REG_TYPE_S, 0, D0_SAMPLE_TYPE_2D);
-    /* texld r0, t0, s0 */
-    i += 3;
-    dest = UREG(REG_TYPE_R, 0);
-    src0 = UREG(REG_TYPE_T, 0); /* COORD */
-    src1 = UREG(REG_TYPE_S, 0); /* SAMPLER */
-    i915_inst_texld(&pixel_shader_program->inst1[i], T0_TEXLD, dest, src0, src1);
-    /* mov oC, r0 */
-    i += 3;
-    dest = UREG(REG_TYPE_OC, 0);
-    src0 = UREG(REG_TYPE_R, 0);
-    src1 = src2 = 0;
-    i915_inst_arith(&pixel_shader_program->inst1[i], A0_MOV, dest, A0_DEST_CHANNEL_ALL,
-                    A0_DEST_SATURATE, src0, src1, src2);
-
-
-    pixel_shader_program->shader2.type = CMD_3D;
-    pixel_shader_program->shader2.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
-    pixel_shader_program->shader2.retain = 1;
-    pixel_shader_program->shader2.length = 14; /* 5 inst */
-    i = 0;
-    /* dcl t2.xy */
-    i915_inst_decl(&pixel_shader_program->inst2[i], REG_TYPE_T, T_TEX2, D0_CHANNEL_XY);
-    /* dcl t3.xy */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst2[i], REG_TYPE_T, T_TEX3, D0_CHANNEL_XY);
-    /* dcl_2D s1 */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst2[i], REG_TYPE_S, 1, D0_SAMPLE_TYPE_2D);
-    /* texld r0, t2, s1 */
-    i += 3;
-    dest = UREG(REG_TYPE_R, 0);
-    src0 = UREG(REG_TYPE_T, 2); /* COORD */
-    src1 = UREG(REG_TYPE_S, 1); /* SAMPLER */
-    i915_inst_texld(&pixel_shader_program->inst2[i], T0_TEXLD, dest, src0, src1);
-    /* mov oC, r0 */
-    i += 3;
-    dest = UREG(REG_TYPE_OC, 0);
-    src0 = UREG(REG_TYPE_R, 0);
-    src1 = src2 = 0;
-    i915_inst_arith(&pixel_shader_program->inst2[i], A0_MOV, dest, A0_DEST_CHANNEL_ALL,
-                    A0_DEST_SATURATE, src0, src1, src2);
-
-    /* Shader 3 */
-    pixel_shader_program->shader3.type = CMD_3D;
-    pixel_shader_program->shader3.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
-    pixel_shader_program->shader3.retain = 1;
-    pixel_shader_program->shader3.length = 29; /* 10 inst */
-    i = 0;
-    /* dcl t0.xy */
-    i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX0, D0_CHANNEL_XY);
-    /* dcl t1.xy */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX1, D0_CHANNEL_XY);
-    /* dcl t2.xy */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX2, D0_CHANNEL_XY);
-    /* dcl t3.xy */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX3, D0_CHANNEL_XY);
-    /* dcl_2D s0 */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_S, 0, D0_SAMPLE_TYPE_2D);
-    /* dcl_2D s1 */
-    i += 3;
-    i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_S, 1, D0_SAMPLE_TYPE_2D);
-    /* texld r0, t0, s0 */
-    i += 3;
-    dest = UREG(REG_TYPE_R, 0);
-    src0 = UREG(REG_TYPE_T, 0); /* COORD */
-    src1 = UREG(REG_TYPE_S, 0); /* SAMPLER */
-    i915_inst_texld(&pixel_shader_program->inst3[i], T0_TEXLD, dest, src0, src1);
-    /* texld r1, t2, s1 */
-    i += 3;
-    dest = UREG(REG_TYPE_R, 1);
-    src0 = UREG(REG_TYPE_T, 2); /* COORD */
-    src1 = UREG(REG_TYPE_S, 1); /* SAMPLER */
-    i915_inst_texld(&pixel_shader_program->inst3[i], T0_TEXLD, dest, src0, src1);
-    /* add r0, r0, r1 */
-    i += 3;
-    dest = UREG(REG_TYPE_R, 0);
-    src0 = UREG(REG_TYPE_R, 0);
-    src1 = UREG(REG_TYPE_R, 1);
-    src2 = 0;
-    i915_inst_arith(&pixel_shader_program->inst3[i], A0_ADD, dest, A0_DEST_CHANNEL_ALL,
-                    0 /* A0_DEST_SATURATE */, src0, src1, src2);
-    /* mul oC, r0, c0 */
-    i += 3;
-    dest = UREG(REG_TYPE_OC, 0);
-    src0 = UREG(REG_TYPE_R, 0);
-    src1 = UREG(REG_TYPE_CONST, 0);
-    src2 = 0;
-    i915_inst_arith(&pixel_shader_program->inst3[i], A0_MUL, dest, A0_DEST_CHANNEL_ALL,
-                    A0_DEST_SATURATE, src0, src1, src2);
-
-    memset(pixel_shader_constants, 0, sizeof(*pixel_shader_constants));
-    pixel_shader_constants->dw0.type = CMD_3D;
-    pixel_shader_constants->dw0.opcode = OPC_3DSTATE_PIXEL_SHADER_CONSTANTS;
-    pixel_shader_constants->dw0.length = 4;
-    pixel_shader_constants->dw1.reg_mask = REG_CR0;
-    pixel_shader_constants->value.x = 0.5;
-    pixel_shader_constants->value.y = 0.5;
-    pixel_shader_constants->value.z = 0.5;
-    pixel_shader_constants->value.w = 0.5;
-
-}
-
-static void i915_mc_one_time_state_init(XvMCContext *context)
-{
-    struct s3_dword *s3 = NULL;
-    struct s6_dword *s6 = NULL;
-    dis_state *dis = NULL;
-    ssb_state *ssb = NULL;
-    psp_state *psp = NULL;
-    psc_state *psc = NULL;
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    struct i915_3dstate_load_state_immediate_1 *load_state_immediate_1;
-    struct i915_3dstate_load_indirect *load_indirect;
-    int mem_select;
-
-    /* 3DSTATE_LOAD_STATE_IMMEDIATE_1 */
-    one_time_load_state_imm1_size = sizeof(*load_state_immediate_1) + sizeof(*s3) + sizeof(*s6);
-    one_time_load_state_imm1 = calloc(1, one_time_load_state_imm1_size);
-    load_state_immediate_1 = (struct i915_3dstate_load_state_immediate_1 *)one_time_load_state_imm1;
-    load_state_immediate_1->dw0.type = CMD_3D;
-    load_state_immediate_1->dw0.opcode = OPC_3DSTATE_LOAD_STATE_IMMEDIATE_1;
-    load_state_immediate_1->dw0.load_s3 = 1;
-    load_state_immediate_1->dw0.load_s6 = 1;
-    load_state_immediate_1->dw0.length = (one_time_load_state_imm1_size >> 2) - 2;
-
-    s3 = (struct s3_dword *)(++load_state_immediate_1);
-    s3->set0_pcd = 1;
-    s3->set1_pcd = 1;
-    s3->set2_pcd = 1;
-    s3->set3_pcd = 1;
-    s3->set4_pcd = 1;
-    s3->set5_pcd = 1;
-    s3->set6_pcd = 1;
-    s3->set7_pcd = 1;
-
-    s6 = (struct s6_dword *)(++s3);
-    s6->alpha_test_enable = 0;
-    s6->alpha_test_function = 0;
-    s6->alpha_reference_value = 0;
-    s6->depth_test_enable = 1;
-    s6->depth_test_function = 0;
-    s6->color_buffer_blend = 0;
-    s6->color_blend_function = 0;
-    s6->src_blend_factor = 1;
-    s6->dest_blend_factor = 1;
-    s6->depth_buffer_write = 0;
-    s6->color_buffer_write = 1;
-    s6->triangle_pv = 0;
-
-    /* 3DSTATE_LOAD_INDIRECT */
-    one_time_load_indirect_size = sizeof(*load_indirect) + sizeof(*dis) + sizeof(*ssb) + sizeof(*psp) + sizeof(*psc);
-    one_time_load_indirect = calloc(1, one_time_load_indirect_size);
-    load_indirect = (struct i915_3dstate_load_indirect *)one_time_load_indirect;
-    load_indirect->dw0.type = CMD_3D;
-    load_indirect->dw0.opcode = OPC_3DSTATE_LOAD_INDIRECT;
-    load_indirect->dw0.block_mask = BLOCK_DIS | BLOCK_SSB | BLOCK_PSP | BLOCK_PSC;
-    load_indirect->dw0.length = (one_time_load_indirect_size >> 2) - 2;
-
-    if (pI915XvMC->deviceID == PCI_CHIP_I915_G ||
-        pI915XvMC->deviceID == PCI_CHIP_I915_GM)
-	mem_select = 0; /* use physical address */
-    else
-	mem_select = 1; /* use gfx address */
-
-    load_indirect->dw0.mem_select = mem_select;
-
-
-    /* Dynamic indirect state buffer */
-    dis = (dis_state *)(++load_indirect);
-    dis->dw0.valid = 0;
-    dis->dw0.reset = 0;
-    dis->dw0.buffer_address = 0;
-
-    /* Sample state buffer */
-    ssb = (ssb_state *)(++dis);
-    ssb->dw0.valid = 1;
-    ssb->dw0.force = 1;
-    ssb->dw1.length = 7; /* 8 - 1 */
-
-    if (mem_select)
-        ssb->dw0.buffer_address = (pI915XvMC->ssb.offset >> 2);
-    else
-	ssb->dw0.buffer_address = (pI915XvMC->ssb.bus_addr >> 2);
-
-    /* Pixel shader program buffer */
-    psp = (psp_state *)(++ssb);
-    psp->dw0.valid = 1;
-    psp->dw0.force = 1;
-    psp->dw1.length = 66; /* 4 + 16 + 16 + 31 - 1 */
-
-    if (mem_select)
-	psp->dw0.buffer_address = (pI915XvMC->psp.offset >> 2);
-    else
-	psp->dw0.buffer_address = (pI915XvMC->psp.bus_addr >> 2);
-
-    /* Pixel shader constant buffer */
-    psc = (psc_state *)(++psp);
-    psc->dw0.valid = 1;
-    psc->dw0.force = 1;
-    psc->dw1.length = 5; /* 6 - 1 */
-
-    if (mem_select)
-        psc->dw0.buffer_address = (pI915XvMC->psc.offset >> 2);
-    else
-        psc->dw0.buffer_address = (pI915XvMC->psc.bus_addr >> 2);
-}
-
-static void i915_mc_one_time_state_emit(void)
-{
-    i915_emit_batch(one_time_load_state_imm1, one_time_load_state_imm1_size, 0);
-    i915_emit_batch(one_time_load_indirect, one_time_load_indirect_size, 0);
-}
-
-static void i915_mc_static_indirect_state_init(XvMCContext *context)
-{
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    struct i915_mc_static_indirect_state_buffer *buffer_info =
-	(struct i915_mc_static_indirect_state_buffer *)pI915XvMC->sis.map;
-
-    memset(buffer_info, 0, sizeof(*buffer_info));
-    /* dest Y */
-    buffer_info->dest_y.dw0.type = CMD_3D;
-    buffer_info->dest_y.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
-    buffer_info->dest_y.dw0.length = 1;
-    buffer_info->dest_y.dw1.aux_id = 0;
-    buffer_info->dest_y.dw1.buffer_id = BUFFERID_COLOR_BACK;
-    buffer_info->dest_y.dw1.fence_regs = 0;    /* disabled */ /* FIXME: tiled y for performance */
-    buffer_info->dest_y.dw1.tiled_surface = 0; /* linear */
-    buffer_info->dest_y.dw1.walk = TILEWALK_XMAJOR;
-
-    /* dest U */
-    buffer_info->dest_u.dw0.type = CMD_3D;
-    buffer_info->dest_u.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
-    buffer_info->dest_u.dw0.length = 1;
-    buffer_info->dest_u.dw1.aux_id = 0;
-    buffer_info->dest_u.dw1.buffer_id = BUFFERID_COLOR_AUX;
-    buffer_info->dest_u.dw1.fence_regs = 0;
-    buffer_info->dest_u.dw1.tiled_surface = 0;
-    buffer_info->dest_u.dw1.walk = TILEWALK_XMAJOR;
-
-    /* dest V */
-    buffer_info->dest_v.dw0.type = CMD_3D;
-    buffer_info->dest_v.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
-    buffer_info->dest_v.dw0.length = 1;
-    buffer_info->dest_v.dw1.aux_id = 1;
-    buffer_info->dest_v.dw1.buffer_id = BUFFERID_COLOR_AUX;
-    buffer_info->dest_v.dw1.fence_regs = 0;
-    buffer_info->dest_v.dw1.tiled_surface = 0;
-    buffer_info->dest_v.dw1.walk = TILEWALK_XMAJOR;
-
-    buffer_info->dest_buf.dw0.type = CMD_3D;
-    buffer_info->dest_buf.dw0.opcode = OPC_3DSTATE_DEST_BUFFER_VARIABLES;
-    buffer_info->dest_buf.dw0.length = 0;
-    buffer_info->dest_buf.dw1.dest_v_bias = 8; /* 0.5 */
-    buffer_info->dest_buf.dw1.dest_h_bias = 8; /* 0.5 */
-    buffer_info->dest_buf.dw1.color_fmt = COLORBUFFER_8BIT;
-    buffer_info->dest_buf.dw1.v_ls = 0; /* fill later */
-    buffer_info->dest_buf.dw1.v_ls_offset = 0; /* fill later */
-
-    buffer_info->dest_buf_mpeg.dw0.type = CMD_3D;
-    buffer_info->dest_buf_mpeg.dw0.opcode = OPC_3DSTATE_DEST_BUFFER_VARIABLES_MPEG;
-    buffer_info->dest_buf_mpeg.dw0.length = 1;
-    buffer_info->dest_buf_mpeg.dw1.decode_mode = MPEG_DECODE_MC;
-    buffer_info->dest_buf_mpeg.dw1.rcontrol = 0;               /* for MPEG-1/MPEG-2 */
-    buffer_info->dest_buf_mpeg.dw1.bidir_avrg_control = 0;     /* for MPEG-1/MPEG-2/MPEG-4 */
-    buffer_info->dest_buf_mpeg.dw1.abort_on_error = 1;
-    buffer_info->dest_buf_mpeg.dw1.intra8 = 0;         /* 16-bit formatted correction data */
-    buffer_info->dest_buf_mpeg.dw1.tff = 1; /* fill later */
-
-    buffer_info->dest_buf_mpeg.dw1.v_subsample_factor = MC_SUB_1V;
-    buffer_info->dest_buf_mpeg.dw1.h_subsample_factor = MC_SUB_1H;
-
-    buffer_info->corr.dw0.type = CMD_3D;
-    buffer_info->corr.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
-    buffer_info->corr.dw0.length = 1;
-    buffer_info->corr.dw1.aux_id = 0;
-    buffer_info->corr.dw1.buffer_id = BUFFERID_MC_INTRA_CORR;
-    buffer_info->corr.dw1.aux_id = 0;
-    buffer_info->corr.dw1.fence_regs = 0;
-    buffer_info->corr.dw1.tiled_surface = 0;
-    buffer_info->corr.dw1.walk = 0;
-    buffer_info->corr.dw1.pitch = 0;
-    buffer_info->corr.dw2.base_address = (pI915XvMC->corrdata.offset >> 2);  /* starting DWORD address */
-}
-
-static void i915_mc_static_indirect_state_set(XvMCContext *context, XvMCSurface *dest,
-	unsigned int picture_structure, unsigned int flags, unsigned int picture_coding_type)
-{
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    i915XvMCSurface *pI915Surface = (i915XvMCSurface *)dest->privData;
-    struct i915_mc_static_indirect_state_buffer *buffer_info =
-	(struct i915_mc_static_indirect_state_buffer *)pI915XvMC->sis.map;
-    unsigned int w = dest->width;
-
-    buffer_info->dest_y.dw1.pitch = (pI915Surface->yStride >> 2);      /* in DWords */
-    buffer_info->dest_y.dw2.base_address = (YOFFSET(pI915Surface) >> 2);    /* starting DWORD address */
-    buffer_info->dest_u.dw1.pitch = (pI915Surface->uvStride >> 2);      /* in DWords */
-    buffer_info->dest_u.dw2.base_address = (UOFFSET(pI915Surface) >> 2);      /* starting DWORD address */
-    buffer_info->dest_v.dw1.pitch = (pI915Surface->uvStride >> 2);      /* in Dwords */
-    buffer_info->dest_v.dw2.base_address = (VOFFSET(pI915Surface) >> 2);      /* starting DWORD address */
-
-    if ((picture_structure & XVMC_FRAME_PICTURE) == XVMC_FRAME_PICTURE) {
-        ;
-    } else if ((picture_structure & XVMC_FRAME_PICTURE) == XVMC_TOP_FIELD) {
-        buffer_info->dest_buf.dw1.v_ls = 1;
-    } else if ((picture_structure & XVMC_FRAME_PICTURE) == XVMC_BOTTOM_FIELD) {
-        buffer_info->dest_buf.dw1.v_ls = 1;
-        buffer_info->dest_buf.dw1.v_ls_offset = 1;
-    }
-
-    if (picture_structure & XVMC_FRAME_PICTURE) {
-        ;
-    } else if (picture_structure & XVMC_TOP_FIELD) {
-        if (flags & XVMC_SECOND_FIELD)
-            buffer_info->dest_buf_mpeg.dw1.tff = 0;
-        else
-            buffer_info->dest_buf_mpeg.dw1.tff = 1;
-    } else if (picture_structure & XVMC_BOTTOM_FIELD) {
-        if (flags & XVMC_SECOND_FIELD)
-            buffer_info->dest_buf_mpeg.dw1.tff = 1;
-        else
-            buffer_info->dest_buf_mpeg.dw1.tff = 0;
-    }
-
-    buffer_info->dest_buf_mpeg.dw1.picture_width = (dest->width >> 4);     /* in macroblocks */
-    buffer_info->dest_buf_mpeg.dw2.picture_coding_type = picture_coding_type;
-}
-
-static void i915_mc_map_state_init(XvMCContext *context)
-{
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    unsigned int w = context->width;
-    unsigned int h = context->height;
-    struct i915_mc_map_state *map_state;
-
-    map_state = (struct i915_mc_map_state *)pI915XvMC->msb.map;
-
-    memset(map_state, 0, sizeof(*map_state));
-
-    /* 3DSATE_MAP_STATE: Y */
-    map_state->y_map.dw0.type = CMD_3D;
-    map_state->y_map.dw0.opcode = OPC_3DSTATE_MAP_STATE;
-    map_state->y_map.dw0.retain = 1;
-    map_state->y_map.dw0.length = 6;
-    map_state->y_map.dw1.map_mask = MAP_MAP0 | MAP_MAP1;
-
-    /* Y Forward (Past) */
-    map_state->y_forward.tm0.v_ls_offset = 0;
-    map_state->y_forward.tm0.v_ls = 0;
-    map_state->y_forward.tm1.tile_walk = TILEWALK_XMAJOR;
-    map_state->y_forward.tm1.tiled_surface = 0;
-    map_state->y_forward.tm1.utilize_fence_regs = 0;
-    map_state->y_forward.tm1.texel_fmt = 0;      /* 8bit */
-    map_state->y_forward.tm1.surface_fmt = 1;    /* 8bit */
-    map_state->y_forward.tm1.width = w - 1;
-    map_state->y_forward.tm1.height = h - 1;
-    map_state->y_forward.tm2.depth = 0;
-    map_state->y_forward.tm2.max_lod = 0;
-    map_state->y_forward.tm2.cube_face = 0;
-
-    /* Y Backward (Future) */
-    map_state->y_backward.tm0.v_ls_offset = 0;
-    map_state->y_backward.tm0.v_ls = 0;
-    map_state->y_backward.tm1.tile_walk = TILEWALK_XMAJOR;
-    map_state->y_backward.tm1.tiled_surface = 0;
-    map_state->y_backward.tm1.utilize_fence_regs = 0;
-    map_state->y_backward.tm1.texel_fmt = 0;      /* 8bit */
-    map_state->y_backward.tm1.surface_fmt = 1;    /* 8bit */
-    map_state->y_backward.tm1.width = w - 1;
-    map_state->y_backward.tm1.height = h - 1;
-    map_state->y_backward.tm2.depth = 0;
-    map_state->y_backward.tm2.max_lod = 0;
-    map_state->y_backward.tm2.cube_face = 0;
-
-    /* 3DSATE_MAP_STATE: U */
-    map_state->u_map.dw0.type = CMD_3D;
-    map_state->u_map.dw0.opcode = OPC_3DSTATE_MAP_STATE;
-    map_state->u_map.dw0.retain = 1;
-    map_state->u_map.dw0.length = 6;
-    map_state->u_map.dw1.map_mask = MAP_MAP0 | MAP_MAP1;
-
-    /* U Forward */
-    map_state->u_forward.tm0.v_ls_offset = 0;
-    map_state->u_forward.tm0.v_ls = 0;
-    map_state->u_forward.tm1.tile_walk = TILEWALK_XMAJOR;
-    map_state->u_forward.tm1.tiled_surface = 0;
-    map_state->u_forward.tm1.utilize_fence_regs = 0;
-    map_state->u_forward.tm1.texel_fmt = 0;      /* 8bit */
-    map_state->u_forward.tm1.surface_fmt = 1;    /* 8bit */
-    map_state->u_forward.tm1.width = (w >> 1) - 1;
-    map_state->u_forward.tm1.height = (h >> 1) - 1;
-    map_state->u_forward.tm2.depth = 0;
-    map_state->u_forward.tm2.max_lod = 0;
-    map_state->u_forward.tm2.cube_face = 0;
-
-    /* U Backward */
-    map_state->u_backward.tm0.v_ls_offset = 0;
-    map_state->u_backward.tm0.v_ls = 0;
-    map_state->u_backward.tm1.tile_walk = TILEWALK_XMAJOR;
-    map_state->u_backward.tm1.tiled_surface = 0;
-    map_state->u_backward.tm1.utilize_fence_regs = 0;
-    map_state->u_backward.tm1.texel_fmt = 0;
-    map_state->u_backward.tm1.surface_fmt = 1;
-    map_state->u_backward.tm1.width = (w >> 1) - 1;
-    map_state->u_backward.tm1.height = (h >> 1) - 1;
-    map_state->u_backward.tm2.depth = 0;
-    map_state->u_backward.tm2.max_lod = 0;
-    map_state->u_backward.tm2.cube_face = 0;
-
-    /* 3DSATE_MAP_STATE: V */
-    map_state->v_map.dw0.type = CMD_3D;
-    map_state->v_map.dw0.opcode = OPC_3DSTATE_MAP_STATE;
-    map_state->v_map.dw0.retain = 1;
-    map_state->v_map.dw0.length = 6;
-    map_state->v_map.dw1.map_mask = MAP_MAP0 | MAP_MAP1;
-
-    /* V Forward */
-    map_state->v_forward.tm0.v_ls_offset = 0;
-    map_state->v_forward.tm0.v_ls = 0;
-    map_state->v_forward.tm1.tile_walk = TILEWALK_XMAJOR;
-    map_state->v_forward.tm1.tiled_surface = 0;
-    map_state->v_forward.tm1.utilize_fence_regs = 0;
-    map_state->v_forward.tm1.texel_fmt = 0;
-    map_state->v_forward.tm1.surface_fmt = 1;
-    map_state->v_forward.tm1.width = (w >> 1) - 1;
-    map_state->v_forward.tm1.height = (h >> 1) - 1;
-    map_state->v_forward.tm2.depth = 0;
-    map_state->v_forward.tm2.max_lod = 0;
-    map_state->v_forward.tm2.cube_face = 0;
-
-    /* V Backward */
-    map_state->v_backward.tm0.v_ls_offset = 0;
-    map_state->v_backward.tm0.v_ls = 0;
-    map_state->v_backward.tm1.tile_walk = TILEWALK_XMAJOR;
-    map_state->v_backward.tm1.tiled_surface = 0;
-    map_state->v_backward.tm1.utilize_fence_regs = 0;
-    map_state->v_backward.tm1.texel_fmt = 0;
-    map_state->v_backward.tm1.surface_fmt = 1;
-    map_state->v_backward.tm1.width = (w >> 1) - 1;
-    map_state->v_backward.tm1.height = (h >> 1) - 1;
-    map_state->v_backward.tm2.depth = 0;
-    map_state->v_backward.tm2.max_lod = 0;
-    map_state->v_backward.tm2.cube_face = 0;
-}
-
-static void i915_mc_map_state_set(XvMCContext *context,
-	i915XvMCSurface *privPast,
-	i915XvMCSurface *privFuture)
-{
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    struct i915_mc_map_state *map_state;
-
-    map_state = (struct i915_mc_map_state *)pI915XvMC->msb.map;
-
-    map_state->y_forward.tm0.base_address = (YOFFSET(privPast) >> 2);
-    map_state->y_forward.tm2.pitch = (privPast->yStride >> 2) - 1;       /* in DWords - 1 */
-    map_state->y_backward.tm0.base_address = (YOFFSET(privFuture) >> 2);
-    map_state->y_backward.tm2.pitch = (privFuture->yStride >> 2) - 1;
-    map_state->u_forward.tm0.base_address = (UOFFSET(privPast) >> 2);
-    map_state->u_forward.tm2.pitch = (privPast->uvStride >> 2) - 1;       /* in DWords - 1 */
-    map_state->u_backward.tm0.base_address = (UOFFSET(privFuture) >> 2);
-    map_state->u_backward.tm2.pitch = (privFuture->uvStride >> 2) - 1;
-    map_state->v_forward.tm0.base_address = (VOFFSET(privPast) >> 2);
-    map_state->v_forward.tm2.pitch = (privPast->uvStride >> 2) - 1;       /* in DWords - 1 */
-    map_state->v_backward.tm0.base_address = (VOFFSET(privFuture) >> 2);
-    map_state->v_backward.tm2.pitch = (privFuture->uvStride >> 2) - 1;
-}
-
-static void i915_flush(int map, int render)
-{
-    struct i915_mi_flush mi_flush;
-
-    memset(&mi_flush, 0, sizeof(mi_flush));
-    mi_flush.dw0.type = CMD_MI;
-    mi_flush.dw0.opcode = OPC_MI_FLUSH;
-    mi_flush.dw0.map_cache_invalidate = map;
-    mi_flush.dw0.render_cache_flush_inhibit = render;
-
-    intelBatchbufferData(&mi_flush, sizeof(mi_flush), 0);
-}
-
-static void i915_mc_load_indirect_render_init(XvMCContext *context)
-{
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    sis_state *sis;
-    msb_state *msb;
-    struct i915_3dstate_load_indirect *load_indirect;
-    int mem_select;
-
-    mc_render_load_indirect_size = sizeof(*load_indirect) + sizeof(*sis)
-					+ sizeof(*msb);
-    mc_render_load_indirect = calloc(1, mc_render_load_indirect_size);
-
-    load_indirect = (struct i915_3dstate_load_indirect *)mc_render_load_indirect;
-    load_indirect->dw0.type = CMD_3D;
-    load_indirect->dw0.opcode = OPC_3DSTATE_LOAD_INDIRECT;
-    load_indirect->dw0.block_mask = BLOCK_SIS | BLOCK_MSB;
-    load_indirect->dw0.length = (mc_render_load_indirect_size >> 2) - 2;
-
-    if (pI915XvMC->deviceID == PCI_CHIP_I915_G ||
-        pI915XvMC->deviceID == PCI_CHIP_I915_GM)
-        mem_select = 0;
-    else
-	mem_select = 1;
-
-    load_indirect->dw0.mem_select = mem_select;
-
-    /* Static Indirect state buffer (dest buffer info) */
-    sis = (sis_state *)(++load_indirect);
-    sis->dw0.valid = 1;
-    sis->dw0.force = 1;
-    sis->dw1.length = 16; /* 4 * 3 + 2 + 3 - 1 */
-
-    if (mem_select)
-	sis->dw0.buffer_address = (pI915XvMC->sis.offset >> 2);
-    else
-	sis->dw0.buffer_address = (pI915XvMC->sis.bus_addr >> 2);
-
-    /* Map state buffer (reference buffer info) */
-    msb = (msb_state *)(++sis);
-    msb->dw0.valid = 1;
-    msb->dw0.force = 1;
-    msb->dw1.length = 23; /* 3 * 8 - 1 */
-
-    if (mem_select)
-	msb->dw0.buffer_address = (pI915XvMC->msb.offset >> 2);
-    else
-	msb->dw0.buffer_address = (pI915XvMC->msb.bus_addr >> 2);
+			    unsigned int op,
+			    unsigned int dest,
+			    unsigned int coord, unsigned int sampler)
+{
+	dest = UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest));
+	*inst = (op | T0_DEST(dest) | T0_SAMPLER(sampler));
+	inst++;
+	*inst = T1_ADDRESS_REG(coord);
+	inst++;
+	*inst = T2_MBZ;
+}
+
+static void i915_mc_one_time_context_init(XvMCContext * context)
+{
+	unsigned int dest, src0, src1, src2;
+	i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
+	int i;
+	struct i915_3dstate_sampler_state *sampler_state;
+	struct i915_3dstate_pixel_shader_program *pixel_shader_program;
+	struct i915_3dstate_pixel_shader_constants *pixel_shader_constants;
+
+	/* sampler static state */
+	drm_intel_gem_bo_map_gtt(pI915XvMC->ssb_bo);
+	sampler_state = pI915XvMC->ssb_bo->virtual;
+
+	memset(sampler_state, 0, sizeof(*sampler_state));
+	sampler_state->dw0.type = CMD_3D;
+	sampler_state->dw0.opcode = OPC_3DSTATE_SAMPLER_STATE;
+	sampler_state->dw0.length = 6;
+	sampler_state->dw1.sampler_masker = SAMPLER_SAMPLER0 | SAMPLER_SAMPLER1;
+
+	sampler_state->sampler0.ts0.reverse_gamma = 0;
+	sampler_state->sampler0.ts0.planar2packet = 0;
+	sampler_state->sampler0.ts0.color_conversion = 0;
+	sampler_state->sampler0.ts0.chromakey_index = 0;
+	sampler_state->sampler0.ts0.base_level = 0;
+	sampler_state->sampler0.ts0.mip_filter = MIPFILTER_NONE;	/* NONE */
+	sampler_state->sampler0.ts0.mag_filter = MAPFILTER_LINEAR;	/* LINEAR */
+	sampler_state->sampler0.ts0.min_filter = MAPFILTER_LINEAR;	/* LINEAR */
+	sampler_state->sampler0.ts0.lod_bias = 0;	/* 0.0 */
+	sampler_state->sampler0.ts0.shadow_enable = 0;
+	sampler_state->sampler0.ts0.max_anisotropy = ANISORATIO_2;
+	sampler_state->sampler0.ts0.shadow_function = PREFILTEROP_ALWAYS;
+	sampler_state->sampler0.ts1.min_lod = 0;	/* 0.0 Maximum Mip Level */
+	sampler_state->sampler0.ts1.kill_pixel = 0;
+	sampler_state->sampler0.ts1.keyed_texture_filter = 0;
+	sampler_state->sampler0.ts1.chromakey_enable = 0;
+	sampler_state->sampler0.ts1.tcx_control = TEXCOORDMODE_CLAMP;
+	sampler_state->sampler0.ts1.tcy_control = TEXCOORDMODE_CLAMP;
+	sampler_state->sampler0.ts1.tcz_control = TEXCOORDMODE_CLAMP;
+	sampler_state->sampler0.ts1.normalized_coor = 0;
+	sampler_state->sampler0.ts1.map_index = 0;
+	sampler_state->sampler0.ts1.east_deinterlacer = 0;
+	sampler_state->sampler0.ts2.default_color = 0;
+
+	sampler_state->sampler1.ts0.reverse_gamma = 0;
+	sampler_state->sampler1.ts0.planar2packet = 0;
+	sampler_state->sampler1.ts0.color_conversion = 0;
+	sampler_state->sampler1.ts0.chromakey_index = 0;
+	sampler_state->sampler1.ts0.base_level = 0;
+	sampler_state->sampler1.ts0.mip_filter = MIPFILTER_NONE;	/* NONE */
+	sampler_state->sampler1.ts0.mag_filter = MAPFILTER_LINEAR;	/* LINEAR */
+	sampler_state->sampler1.ts0.min_filter = MAPFILTER_LINEAR;	/* LINEAR */
+	sampler_state->sampler1.ts0.lod_bias = 0;	/* 0.0 */
+	sampler_state->sampler1.ts0.shadow_enable = 0;
+	sampler_state->sampler1.ts0.max_anisotropy = ANISORATIO_2;
+	sampler_state->sampler1.ts0.shadow_function = PREFILTEROP_ALWAYS;
+	sampler_state->sampler1.ts1.min_lod = 0;	/* 0.0 Maximum Mip Level */
+	sampler_state->sampler1.ts1.kill_pixel = 0;
+	sampler_state->sampler1.ts1.keyed_texture_filter = 0;
+	sampler_state->sampler1.ts1.chromakey_enable = 0;
+	sampler_state->sampler1.ts1.tcx_control = TEXCOORDMODE_CLAMP;
+	sampler_state->sampler1.ts1.tcy_control = TEXCOORDMODE_CLAMP;
+	sampler_state->sampler1.ts1.tcz_control = TEXCOORDMODE_CLAMP;
+	sampler_state->sampler1.ts1.normalized_coor = 0;
+	sampler_state->sampler1.ts1.map_index = 1;
+	sampler_state->sampler1.ts1.east_deinterlacer = 0;
+	sampler_state->sampler1.ts2.default_color = 0;
+
+	drm_intel_gem_bo_unmap_gtt(pI915XvMC->ssb_bo);
+
+	/* pixel shader static state */
+	drm_intel_gem_bo_map_gtt(pI915XvMC->psp_bo);
+	pixel_shader_program = pI915XvMC->psp_bo->virtual;
+
+	memset(pixel_shader_program, 0, sizeof(*pixel_shader_program));
+	pixel_shader_program->shader0.type = CMD_3D;
+	pixel_shader_program->shader0.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
+	pixel_shader_program->shader0.retain = 1;
+	pixel_shader_program->shader0.length = 2;	/* 1 inst */
+	i = 0;
+
+	dest = UREG(REG_TYPE_OC, 0);
+	src0 = UREG(REG_TYPE_CONST, 0);
+	src1 = 0;
+	src2 = 0;
+	i915_inst_arith(&pixel_shader_program->inst0[i], A0_MOV,
+			dest, A0_DEST_CHANNEL_ALL, A0_DEST_SATURATE, src0, src1,
+			src2);
+
+	pixel_shader_program->shader1.type = CMD_3D;
+	pixel_shader_program->shader1.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
+	pixel_shader_program->shader1.retain = 1;
+	pixel_shader_program->shader1.length = 14;	/* 5 inst */
+	i = 0;
+	/* dcl t0.xy */
+	i915_inst_decl(&pixel_shader_program->inst1[i], REG_TYPE_T, T_TEX0,
+		       D0_CHANNEL_XY);
+	i += 3;
+	/* dcl t1.xy */
+	i915_inst_decl(&pixel_shader_program->inst1[i], REG_TYPE_T, T_TEX1,
+		       D0_CHANNEL_XY);
+	/* dcl_2D s0 */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst1[i], REG_TYPE_S, 0,
+		       D0_SAMPLE_TYPE_2D);
+	/* texld r0, t0, s0 */
+	i += 3;
+	dest = UREG(REG_TYPE_R, 0);
+	src0 = UREG(REG_TYPE_T, 0);	/* COORD */
+	src1 = UREG(REG_TYPE_S, 0);	/* SAMPLER */
+	i915_inst_texld(&pixel_shader_program->inst1[i], T0_TEXLD, dest, src0,
+			src1);
+	/* mov oC, r0 */
+	i += 3;
+	dest = UREG(REG_TYPE_OC, 0);
+	src0 = UREG(REG_TYPE_R, 0);
+	src1 = src2 = 0;
+	i915_inst_arith(&pixel_shader_program->inst1[i], A0_MOV, dest,
+			A0_DEST_CHANNEL_ALL, A0_DEST_SATURATE, src0, src1,
+			src2);
+
+	pixel_shader_program->shader2.type = CMD_3D;
+	pixel_shader_program->shader2.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
+	pixel_shader_program->shader2.retain = 1;
+	pixel_shader_program->shader2.length = 14;	/* 5 inst */
+	i = 0;
+	/* dcl t2.xy */
+	i915_inst_decl(&pixel_shader_program->inst2[i], REG_TYPE_T, T_TEX2,
+		       D0_CHANNEL_XY);
+	/* dcl t3.xy */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst2[i], REG_TYPE_T, T_TEX3,
+		       D0_CHANNEL_XY);
+	/* dcl_2D s1 */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst2[i], REG_TYPE_S, 1,
+		       D0_SAMPLE_TYPE_2D);
+	/* texld r0, t2, s1 */
+	i += 3;
+	dest = UREG(REG_TYPE_R, 0);
+	src0 = UREG(REG_TYPE_T, 2);	/* COORD */
+	src1 = UREG(REG_TYPE_S, 1);	/* SAMPLER */
+	i915_inst_texld(&pixel_shader_program->inst2[i], T0_TEXLD, dest, src0,
+			src1);
+	/* mov oC, r0 */
+	i += 3;
+	dest = UREG(REG_TYPE_OC, 0);
+	src0 = UREG(REG_TYPE_R, 0);
+	src1 = src2 = 0;
+	i915_inst_arith(&pixel_shader_program->inst2[i], A0_MOV, dest,
+			A0_DEST_CHANNEL_ALL, A0_DEST_SATURATE, src0, src1,
+			src2);
+
+	/* Shader 3 */
+	pixel_shader_program->shader3.type = CMD_3D;
+	pixel_shader_program->shader3.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
+	pixel_shader_program->shader3.retain = 1;
+	pixel_shader_program->shader3.length = 29;	/* 10 inst */
+	i = 0;
+	/* dcl t0.xy */
+	i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX0,
+		       D0_CHANNEL_XY);
+	/* dcl t1.xy */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX1,
+		       D0_CHANNEL_XY);
+	/* dcl t2.xy */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX2,
+		       D0_CHANNEL_XY);
+	/* dcl t3.xy */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_T, T_TEX3,
+		       D0_CHANNEL_XY);
+	/* dcl_2D s0 */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_S, 0,
+		       D0_SAMPLE_TYPE_2D);
+	/* dcl_2D s1 */
+	i += 3;
+	i915_inst_decl(&pixel_shader_program->inst3[i], REG_TYPE_S, 1,
+		       D0_SAMPLE_TYPE_2D);
+	/* texld r0, t0, s0 */
+	i += 3;
+	dest = UREG(REG_TYPE_R, 0);
+	src0 = UREG(REG_TYPE_T, 0);	/* COORD */
+	src1 = UREG(REG_TYPE_S, 0);	/* SAMPLER */
+	i915_inst_texld(&pixel_shader_program->inst3[i], T0_TEXLD, dest, src0,
+			src1);
+	/* texld r1, t2, s1 */
+	i += 3;
+	dest = UREG(REG_TYPE_R, 1);
+	src0 = UREG(REG_TYPE_T, 2);	/* COORD */
+	src1 = UREG(REG_TYPE_S, 1);	/* SAMPLER */
+	i915_inst_texld(&pixel_shader_program->inst3[i], T0_TEXLD, dest, src0,
+			src1);
+	/* add r0, r0, r1 */
+	i += 3;
+	dest = UREG(REG_TYPE_R, 0);
+	src0 = UREG(REG_TYPE_R, 0);
+	src1 = UREG(REG_TYPE_R, 1);
+	src2 = 0;
+	i915_inst_arith(&pixel_shader_program->inst3[i], A0_ADD, dest,
+			A0_DEST_CHANNEL_ALL, 0 /* A0_DEST_SATURATE */ , src0,
+			src1, src2);
+	/* mul oC, r0, c0 */
+	i += 3;
+	dest = UREG(REG_TYPE_OC, 0);
+	src0 = UREG(REG_TYPE_R, 0);
+	src1 = UREG(REG_TYPE_CONST, 0);
+	src2 = 0;
+	i915_inst_arith(&pixel_shader_program->inst3[i], A0_MUL, dest,
+			A0_DEST_CHANNEL_ALL, A0_DEST_SATURATE, src0, src1,
+			src2);
+
+	drm_intel_gem_bo_unmap_gtt(pI915XvMC->psp_bo);
+
+	/* pixel shader contant static state */
+	drm_intel_gem_bo_map_gtt(pI915XvMC->psc_bo);
+	pixel_shader_constants = pI915XvMC->psc_bo->virtual;
+
+	memset(pixel_shader_constants, 0, sizeof(*pixel_shader_constants));
+	pixel_shader_constants->dw0.type = CMD_3D;
+	pixel_shader_constants->dw0.opcode = OPC_3DSTATE_PIXEL_SHADER_CONSTANTS;
+	pixel_shader_constants->dw0.length = 4;
+	pixel_shader_constants->dw1.reg_mask = REG_CR0;
+	pixel_shader_constants->value.x = 0.5;
+	pixel_shader_constants->value.y = 0.5;
+	pixel_shader_constants->value.z = 0.5;
+	pixel_shader_constants->value.w = 0.5;
+
+	drm_intel_gem_bo_unmap_gtt(pI915XvMC->psc_bo);
+}
+
+static void i915_mc_one_time_state_emit(XvMCContext * context)
+{
+	i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
+	uint32_t load_state_immediate_1, load_indirect, s3_dword, s6_dword;
+	int mem_select;
+	BATCH_LOCALS;
+
+	/* 3DSTATE_LOAD_STATE_IMMEDIATE_1 */
+	BEGIN_BATCH(3 + 8);
+	load_state_immediate_1 = OP_3D_LOAD_STATE_IMMEDIATE_1;
+	load_state_immediate_1 |= OP_3D_LOAD_STATE_IMM_LOAD_S3;
+	load_state_immediate_1 |= OP_3D_LOAD_STATE_IMM_LOAD_S6;
+	load_state_immediate_1 |= 3 - 2; /* length */
+	OUT_BATCH(load_state_immediate_1);
+
+	s3_dword = S3_SET0_PCD | S3_SET1_PCD |
+		   S3_SET2_PCD | S3_SET3_PCD |
+		   S3_SET4_PCD | S3_SET5_PCD |
+		   S3_SET6_PCD | S3_SET7_PCD;
+	OUT_BATCH(s3_dword);
+
+	s6_dword = S6_COLOR_BUFFER_WRITE | S6_DEPTH_TEST_ENABLE;
+	s6_dword |= 1 << S6_SRC_BLEND_FACTOR_SHIFT;
+	s6_dword |= 1 << S6_DST_BLEND_FACTOR_SHIFT;
+	OUT_BATCH(s6_dword);
+
+	/* 3DSTATE_LOAD_INDIRECT */
+	load_indirect = OP_3D_LOAD_INDIRECT;
+	load_indirect |= (BLOCK_DIS | BLOCK_SSB | BLOCK_PSP | BLOCK_PSC)
+				<< BLOCK_MASK_SHIFT;
+	load_indirect |= 8 - 2; /* length */
+
+	if (pI915XvMC->use_phys_addr)
+		mem_select = 0;	/* use physical address */
+	else {
+		load_indirect |= OP_3D_LOAD_INDIRECT_GFX_ADDR;
+		mem_select = 1;	/* use gfx address */
+	}
+
+	OUT_BATCH(load_indirect);
+
+	/* Dynamic indirect state buffer */
+	OUT_BATCH(0); /* no dynamic indirect state */
+
+	/* Sample state buffer */
+	OUT_RELOC(pI915XvMC->ssb_bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
+			STATE_VALID | STATE_FORCE);
+	OUT_BATCH(7);	/* 8 - 1 */
+
+	/* Pixel shader program buffer */
+	OUT_RELOC(pI915XvMC->psp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
+			STATE_VALID | STATE_FORCE);
+	OUT_BATCH(66);	/* 4 + 16 + 16 + 31 - 1 */
+
+	/* Pixel shader constant buffer */
+	OUT_RELOC(pI915XvMC->psc_bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
+			STATE_VALID | STATE_FORCE);
+	OUT_BATCH(5);	/* 6 - 1 */
+	ADVANCE_BATCH();
+}
+
+static void i915_mc_static_indirect_state_set(XvMCContext * context,
+					      XvMCSurface * dest,
+					      unsigned int picture_structure,
+					      unsigned int flags,
+					      unsigned int picture_coding_type)
+{
+	i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
+	struct intel_xvmc_surface *intel_surf = dest->privData;
+	struct i915_mc_static_indirect_state_buffer *buffer_info;
+	unsigned int w = dest->width;
+
+	drm_intel_gem_bo_map_gtt(pI915XvMC->sis_bo);
+	buffer_info = pI915XvMC->sis_bo->virtual;
+
+	memset(buffer_info, 0, sizeof(*buffer_info));
+
+	/* dest Y */
+	buffer_info->dest_y.dw0.type = CMD_3D;
+	buffer_info->dest_y.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
+	buffer_info->dest_y.dw0.length = 1;
+	buffer_info->dest_y.dw1.aux_id = 0;
+	buffer_info->dest_y.dw1.buffer_id = BUFFERID_COLOR_BACK;
+	buffer_info->dest_y.dw1.fence_regs = 0;	/* disabled *//* FIXME: tiled y for performance */
+	buffer_info->dest_y.dw1.tiled_surface = 0;	/* linear */
+	buffer_info->dest_y.dw1.walk = TILEWALK_XMAJOR;
+	buffer_info->dest_y.dw1.pitch = (pI915XvMC->yStride >> 2);	/* in DWords */
+	buffer_info->dest_y.dw2.base_address = intel_surf->bo->offset >> 2;	/* starting DWORD address */
+	drm_intel_bo_emit_reloc(pI915XvMC->sis_bo,
+				offsetof(typeof(*buffer_info),dest_y.dw2),
+				intel_surf->bo, 0,
+				I915_GEM_DOMAIN_RENDER,
+				I915_GEM_DOMAIN_RENDER);
+
+	/* dest U */
+	buffer_info->dest_u.dw0.type = CMD_3D;
+	buffer_info->dest_u.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
+	buffer_info->dest_u.dw0.length = 1;
+	buffer_info->dest_u.dw1.aux_id = 0;
+	buffer_info->dest_u.dw1.buffer_id = BUFFERID_COLOR_AUX;
+	buffer_info->dest_u.dw1.fence_regs = 0;
+	buffer_info->dest_u.dw1.tiled_surface = 0;
+	buffer_info->dest_u.dw1.walk = TILEWALK_XMAJOR;
+	buffer_info->dest_u.dw1.pitch = (pI915XvMC->uvStride >> 2);	/* in DWords */
+	buffer_info->dest_u.dw2.base_address =
+		(intel_surf->bo->offset + UOFFSET(context)) >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->sis_bo,
+				offsetof(typeof(*buffer_info),dest_u.dw2),
+				intel_surf->bo, UOFFSET(context),
+				I915_GEM_DOMAIN_RENDER,
+				I915_GEM_DOMAIN_RENDER);
+
+	/* dest V */
+	buffer_info->dest_v.dw0.type = CMD_3D;
+	buffer_info->dest_v.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
+	buffer_info->dest_v.dw0.length = 1;
+	buffer_info->dest_v.dw1.aux_id = 1;
+	buffer_info->dest_v.dw1.buffer_id = BUFFERID_COLOR_AUX;
+	buffer_info->dest_v.dw1.fence_regs = 0;
+	buffer_info->dest_v.dw1.tiled_surface = 0;
+	buffer_info->dest_v.dw1.walk = TILEWALK_XMAJOR;
+	buffer_info->dest_v.dw1.pitch = (pI915XvMC->uvStride >> 2);	/* in Dwords */
+	buffer_info->dest_v.dw2.base_address =
+		(intel_surf->bo->offset + VOFFSET(context)) >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->sis_bo,
+				offsetof(typeof(*buffer_info),dest_v.dw2),
+				intel_surf->bo, VOFFSET(context),
+				I915_GEM_DOMAIN_RENDER,
+				I915_GEM_DOMAIN_RENDER);
+
+	/* Dest buffer parameters */
+	buffer_info->dest_buf.dw0.type = CMD_3D;
+	buffer_info->dest_buf.dw0.opcode = OPC_3DSTATE_DEST_BUFFER_VARIABLES;
+	buffer_info->dest_buf.dw0.length = 0;
+	buffer_info->dest_buf.dw1.dest_v_bias = 8;	/* 0.5 */
+	buffer_info->dest_buf.dw1.dest_h_bias = 8;	/* 0.5 */
+	buffer_info->dest_buf.dw1.color_fmt = COLORBUFFER_8BIT;
+	buffer_info->dest_buf.dw1.v_ls = 0;	/* fill later */
+	buffer_info->dest_buf.dw1.v_ls_offset = 0;	/* fill later */
+	if ((picture_structure & XVMC_FRAME_PICTURE) == XVMC_FRAME_PICTURE) {
+		;
+	} else if ((picture_structure & XVMC_FRAME_PICTURE) == XVMC_TOP_FIELD) {
+		buffer_info->dest_buf.dw1.v_ls = 1;
+	} else if ((picture_structure & XVMC_FRAME_PICTURE) ==
+		   XVMC_BOTTOM_FIELD) {
+		buffer_info->dest_buf.dw1.v_ls = 1;
+		buffer_info->dest_buf.dw1.v_ls_offset = 1;
+	}
+
+	/* MPEG buffer parameters */
+	buffer_info->dest_buf_mpeg.dw0.type = CMD_3D;
+	buffer_info->dest_buf_mpeg.dw0.opcode =
+	    OPC_3DSTATE_DEST_BUFFER_VARIABLES_MPEG;
+	buffer_info->dest_buf_mpeg.dw0.length = 1;
+	buffer_info->dest_buf_mpeg.dw1.decode_mode = MPEG_DECODE_MC;
+	buffer_info->dest_buf_mpeg.dw1.rcontrol = 0;	/* for MPEG-1/MPEG-2 */
+	buffer_info->dest_buf_mpeg.dw1.bidir_avrg_control = 0;	/* for MPEG-1/MPEG-2/MPEG-4 */
+	buffer_info->dest_buf_mpeg.dw1.abort_on_error = 1;
+	buffer_info->dest_buf_mpeg.dw1.intra8 = 0;	/* 16-bit formatted correction data */
+	buffer_info->dest_buf_mpeg.dw1.tff = 1;	/* fill later */
+
+	buffer_info->dest_buf_mpeg.dw1.v_subsample_factor = MC_SUB_1V;
+	buffer_info->dest_buf_mpeg.dw1.h_subsample_factor = MC_SUB_1H;
+
+	if (picture_structure & XVMC_FRAME_PICTURE) {
+		;
+	} else if (picture_structure & XVMC_TOP_FIELD) {
+		if (flags & XVMC_SECOND_FIELD)
+			buffer_info->dest_buf_mpeg.dw1.tff = 0;
+		else
+			buffer_info->dest_buf_mpeg.dw1.tff = 1;
+	} else if (picture_structure & XVMC_BOTTOM_FIELD) {
+		if (flags & XVMC_SECOND_FIELD)
+			buffer_info->dest_buf_mpeg.dw1.tff = 1;
+		else
+			buffer_info->dest_buf_mpeg.dw1.tff = 0;
+	}
+
+	buffer_info->dest_buf_mpeg.dw1.picture_width = (dest->width >> 4);	/* in macroblocks */
+	buffer_info->dest_buf_mpeg.dw2.picture_coding_type =
+	    picture_coding_type;
+
+	buffer_info->corr.dw0.type = CMD_3D;
+	buffer_info->corr.dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
+	buffer_info->corr.dw0.length = 1;
+	buffer_info->corr.dw1.aux_id = 0;
+	buffer_info->corr.dw1.buffer_id = BUFFERID_MC_INTRA_CORR;
+	buffer_info->corr.dw1.aux_id = 0;
+	buffer_info->corr.dw1.fence_regs = 0;
+	buffer_info->corr.dw1.tiled_surface = 0;
+	buffer_info->corr.dw1.walk = 0;
+	buffer_info->corr.dw1.pitch = 0;
+	buffer_info->corr.dw2.base_address = pI915XvMC->corrdata_bo->offset >> 2;	/* starting DWORD address */
+	drm_intel_bo_emit_reloc(pI915XvMC->sis_bo,
+				offsetof(typeof(*buffer_info),corr.dw2),
+				pI915XvMC->corrdata_bo, 0,
+				I915_GEM_DOMAIN_RENDER, 0);
+
+	drm_intel_gem_bo_unmap_gtt(pI915XvMC->sis_bo);
+}
+
+static void i915_mc_map_state_set(XvMCContext * context,
+				  struct intel_xvmc_surface * privPast,
+				  struct intel_xvmc_surface * privFuture)
+{
+	i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
+	struct i915_mc_map_state *map_state;
+	unsigned int w = context->width;
+	unsigned int h = context->height;
+
+	drm_intel_gem_bo_map_gtt(pI915XvMC->msb_bo);
+	map_state = pI915XvMC->msb_bo->virtual;
+
+	memset(map_state, 0, sizeof(*map_state));
+
+	/* 3DSATE_MAP_STATE: Y */
+	map_state->y_map.dw0.type = CMD_3D;
+	map_state->y_map.dw0.opcode = OPC_3DSTATE_MAP_STATE;
+	map_state->y_map.dw0.retain = 1;
+	map_state->y_map.dw0.length = 6;
+	map_state->y_map.dw1.map_mask = MAP_MAP0 | MAP_MAP1;
+
+	/* Y Forward (Past) */
+	map_state->y_forward.tm0.v_ls_offset = 0;
+	map_state->y_forward.tm0.v_ls = 0;
+	map_state->y_forward.tm1.tile_walk = TILEWALK_XMAJOR;
+	map_state->y_forward.tm1.tiled_surface = 0;
+	map_state->y_forward.tm1.utilize_fence_regs = 0;
+	map_state->y_forward.tm1.texel_fmt = 0;	/* 8bit */
+	map_state->y_forward.tm1.surface_fmt = 1;	/* 8bit */
+	map_state->y_forward.tm1.width = w - 1;
+	map_state->y_forward.tm1.height = h - 1;
+	map_state->y_forward.tm2.depth = 0;
+	map_state->y_forward.tm2.max_lod = 0;
+	map_state->y_forward.tm2.cube_face = 0;
+	map_state->y_forward.tm0.base_address = privPast->bo->offset >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->msb_bo,
+				offsetof(typeof(*map_state),y_forward.tm0),
+				privPast->bo, 0,
+				I915_GEM_DOMAIN_SAMPLER, 0);
+	map_state->y_forward.tm2.pitch = (pI915XvMC->yStride >> 2) - 1;	/* in DWords - 1 */
+
+	/* Y Backward (Future) */
+	map_state->y_backward.tm0.v_ls_offset = 0;
+	map_state->y_backward.tm0.v_ls = 0;
+	map_state->y_backward.tm1.tile_walk = TILEWALK_XMAJOR;
+	map_state->y_backward.tm1.tiled_surface = 0;
+	map_state->y_backward.tm1.utilize_fence_regs = 0;
+	map_state->y_backward.tm1.texel_fmt = 0;	/* 8bit */
+	map_state->y_backward.tm1.surface_fmt = 1;	/* 8bit */
+	map_state->y_backward.tm1.width = w - 1;
+	map_state->y_backward.tm1.height = h - 1;
+	map_state->y_backward.tm2.depth = 0;
+	map_state->y_backward.tm2.max_lod = 0;
+	map_state->y_backward.tm2.cube_face = 0;
+	map_state->y_backward.tm0.base_address = privFuture->bo->offset >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->msb_bo,
+				offsetof(typeof(*map_state),y_backward.tm0),
+				privFuture->bo, 0,
+				I915_GEM_DOMAIN_SAMPLER, 0);
+	map_state->y_backward.tm2.pitch = (pI915XvMC->yStride >> 2) - 1;
+
+	/* 3DSATE_MAP_STATE: U */
+	map_state->u_map.dw0.type = CMD_3D;
+	map_state->u_map.dw0.opcode = OPC_3DSTATE_MAP_STATE;
+	map_state->u_map.dw0.retain = 1;
+	map_state->u_map.dw0.length = 6;
+	map_state->u_map.dw1.map_mask = MAP_MAP0 | MAP_MAP1;
+
+	/* U Forward */
+	map_state->u_forward.tm0.v_ls_offset = 0;
+	map_state->u_forward.tm0.v_ls = 0;
+	map_state->u_forward.tm1.tile_walk = TILEWALK_XMAJOR;
+	map_state->u_forward.tm1.tiled_surface = 0;
+	map_state->u_forward.tm1.utilize_fence_regs = 0;
+	map_state->u_forward.tm1.texel_fmt = 0;	/* 8bit */
+	map_state->u_forward.tm1.surface_fmt = 1;	/* 8bit */
+	map_state->u_forward.tm1.width = (w >> 1) - 1;
+	map_state->u_forward.tm1.height = (h >> 1) - 1;
+	map_state->u_forward.tm2.depth = 0;
+	map_state->u_forward.tm2.max_lod = 0;
+	map_state->u_forward.tm2.cube_face = 0;
+	map_state->u_forward.tm0.base_address =
+		(privPast->bo->offset + UOFFSET(context)) >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->msb_bo,
+				offsetof(typeof(*map_state),u_forward.tm0),
+				privPast->bo, UOFFSET(context),
+				I915_GEM_DOMAIN_SAMPLER, 0);
+	map_state->u_forward.tm2.pitch = (pI915XvMC->uvStride >> 2) - 1;	/* in DWords - 1 */
+
+	/* U Backward */
+	map_state->u_backward.tm0.v_ls_offset = 0;
+	map_state->u_backward.tm0.v_ls = 0;
+	map_state->u_backward.tm1.tile_walk = TILEWALK_XMAJOR;
+	map_state->u_backward.tm1.tiled_surface = 0;
+	map_state->u_backward.tm1.utilize_fence_regs = 0;
+	map_state->u_backward.tm1.texel_fmt = 0;
+	map_state->u_backward.tm1.surface_fmt = 1;
+	map_state->u_backward.tm1.width = (w >> 1) - 1;
+	map_state->u_backward.tm1.height = (h >> 1) - 1;
+	map_state->u_backward.tm2.depth = 0;
+	map_state->u_backward.tm2.max_lod = 0;
+	map_state->u_backward.tm2.cube_face = 0;
+	map_state->u_backward.tm0.base_address =
+		(privFuture->bo->offset + UOFFSET(context)) >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->msb_bo,
+				offsetof(typeof(*map_state),u_backward.tm0),
+				privFuture->bo, UOFFSET(context),
+				I915_GEM_DOMAIN_SAMPLER, 0);
+	map_state->u_backward.tm2.pitch = (pI915XvMC->uvStride >> 2) - 1;
+
+	/* 3DSATE_MAP_STATE: V */
+	map_state->v_map.dw0.type = CMD_3D;
+	map_state->v_map.dw0.opcode = OPC_3DSTATE_MAP_STATE;
+	map_state->v_map.dw0.retain = 1;
+	map_state->v_map.dw0.length = 6;
+	map_state->v_map.dw1.map_mask = MAP_MAP0 | MAP_MAP1;
+
+	/* V Forward */
+	map_state->v_forward.tm0.v_ls_offset = 0;
+	map_state->v_forward.tm0.v_ls = 0;
+	map_state->v_forward.tm1.tile_walk = TILEWALK_XMAJOR;
+	map_state->v_forward.tm1.tiled_surface = 0;
+	map_state->v_forward.tm1.utilize_fence_regs = 0;
+	map_state->v_forward.tm1.texel_fmt = 0;
+	map_state->v_forward.tm1.surface_fmt = 1;
+	map_state->v_forward.tm1.width = (w >> 1) - 1;
+	map_state->v_forward.tm1.height = (h >> 1) - 1;
+	map_state->v_forward.tm2.depth = 0;
+	map_state->v_forward.tm2.max_lod = 0;
+	map_state->v_forward.tm2.cube_face = 0;
+	map_state->v_forward.tm0.base_address =
+		(privPast->bo->offset + VOFFSET(context)) >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->msb_bo,
+				offsetof(typeof(*map_state),v_forward.tm0),
+				privPast->bo, VOFFSET(context),
+				I915_GEM_DOMAIN_SAMPLER, 0);
+	map_state->v_forward.tm2.pitch = (pI915XvMC->uvStride >> 2) - 1;	/* in DWords - 1 */
+
+	/* V Backward */
+	map_state->v_backward.tm0.v_ls_offset = 0;
+	map_state->v_backward.tm0.v_ls = 0;
+	map_state->v_backward.tm1.tile_walk = TILEWALK_XMAJOR;
+	map_state->v_backward.tm1.tiled_surface = 0;
+	map_state->v_backward.tm1.utilize_fence_regs = 0;
+	map_state->v_backward.tm1.texel_fmt = 0;
+	map_state->v_backward.tm1.surface_fmt = 1;
+	map_state->v_backward.tm1.width = (w >> 1) - 1;
+	map_state->v_backward.tm1.height = (h >> 1) - 1;
+	map_state->v_backward.tm2.depth = 0;
+	map_state->v_backward.tm2.max_lod = 0;
+	map_state->v_backward.tm2.cube_face = 0;
+	map_state->v_backward.tm0.base_address =
+		(privFuture->bo->offset + VOFFSET(context)) >> 2;
+	drm_intel_bo_emit_reloc(pI915XvMC->msb_bo,
+				offsetof(typeof(*map_state),v_backward.tm0),
+				privFuture->bo, VOFFSET(context),
+				I915_GEM_DOMAIN_SAMPLER, 0);
+	map_state->v_backward.tm2.pitch = (pI915XvMC->uvStride >> 2) - 1;
+
+	drm_intel_gem_bo_unmap_gtt(pI915XvMC->msb_bo);
+}
+
+static void i915_mc_load_indirect_render_emit(XvMCContext * context)
+{
+	i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
+	int mem_select;
+	uint32_t load_indirect, buffer_address;
+	BATCH_LOCALS;
+
+	BEGIN_BATCH(5);
+	load_indirect = OP_3D_LOAD_INDIRECT;
+	load_indirect |= (BLOCK_SIS | BLOCK_MSB) << BLOCK_MASK_SHIFT;
+	load_indirect |= 5 - 2; /* length */
+
+	if (pI915XvMC->use_phys_addr)
+		mem_select = 0;	/* use physical address */
+	else {
+		load_indirect |= OP_3D_LOAD_INDIRECT_GFX_ADDR;
+		mem_select = 1;	/* use gfx address */
+	}
+	OUT_BATCH(load_indirect);
+
+	/* Static Indirect state buffer (dest buffer info) */
+	OUT_RELOC(pI915XvMC->sis_bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
+			STATE_VALID | STATE_FORCE);
+	OUT_BATCH(16);	/* 4 * 3 + 2 + 3 - 1 */
+
+	/* Map state buffer (reference buffer info) */
+	OUT_RELOC(pI915XvMC->msb_bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
+			STATE_VALID | STATE_FORCE);
+	OUT_BATCH(23);	/* 3 * 8 - 1 */
+	ADVANCE_BATCH();
+}
+
+static void i915_mc_mpeg_set_origin(XvMCContext * context, XvMCMacroBlock * mb)
+{
+	struct i915_3dmpeg_set_origin set_origin;
+
+	/* 3DMPEG_SET_ORIGIN */
+	memset(&set_origin, 0, sizeof(set_origin));
+	set_origin.dw0.type = CMD_3D;
+	set_origin.dw0.opcode = OPC_3DMPEG_SET_ORIGIN;
+	set_origin.dw0.length = 0;
+	set_origin.dw1.h_origin = mb->x;
+	set_origin.dw1.v_origin = mb->y;
+
+	intelBatchbufferData(&set_origin, sizeof(set_origin), 0);
+}
+
+static void i915_mc_mpeg_macroblock_ipicture(XvMCContext * context,
+					     XvMCMacroBlock * mb)
+{
+	struct i915_3dmpeg_macroblock_ipicture macroblock_ipicture;
+
+	/* 3DMPEG_MACROBLOCK_IPICTURE */
+	memset(&macroblock_ipicture, 0, sizeof(macroblock_ipicture));
+	macroblock_ipicture.dw0.type = CMD_3D;
+	macroblock_ipicture.dw0.opcode = OPC_3DMPEG_MACROBLOCK_IPICTURE;
+	macroblock_ipicture.dw0.dct_type =
+	    (mb->dct_type == XVMC_DCT_TYPE_FIELD);
+
+	intelBatchbufferData(&macroblock_ipicture, sizeof(macroblock_ipicture),
+			     0);
+}
+
+static void i915_mc_mpeg_macroblock_1fbmv(XvMCContext * context,
+					  XvMCMacroBlock * mb)
+{
+	struct i915_3dmpeg_macroblock_1fbmv macroblock_1fbmv;
+	vector_t mv0[2];
+
+	/* 3DMPEG_MACROBLOCK(1fbmv) */
+	memset(&macroblock_1fbmv, 0, sizeof(macroblock_1fbmv));
+	macroblock_1fbmv.header.dw0.type = CMD_3D;
+	macroblock_1fbmv.header.dw0.opcode = OPC_3DMPEG_MACROBLOCK;
+	macroblock_1fbmv.header.dw0.length = 2;
+	macroblock_1fbmv.header.dw1.mb_intra = 0;	/* should be 0 */
+	macroblock_1fbmv.header.dw1.forward =
+	    ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_FORWARD) ? 1 : 0);
+	macroblock_1fbmv.header.dw1.backward =
+	    ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_BACKWARD) ? 1 : 0);
+	macroblock_1fbmv.header.dw1.h263_4mv = 0;	/* should be 0 */
+	macroblock_1fbmv.header.dw1.dct_type =
+	    (mb->dct_type == XVMC_DCT_TYPE_FIELD);
+
+	if (!(mb->coded_block_pattern & 0x3f))
+		macroblock_1fbmv.header.dw1.dct_type = XVMC_DCT_TYPE_FRAME;
+
+	macroblock_1fbmv.header.dw1.motion_type = (mb->motion_type & 0x03);
+	macroblock_1fbmv.header.dw1.vertical_field_select =
+	    (mb->motion_vertical_field_select & 0x0f);
+	macroblock_1fbmv.header.dw1.coded_block_pattern =
+	    mb->coded_block_pattern;
+	macroblock_1fbmv.header.dw1.skipped_macroblocks = 0;
+
+	mv0[0].component[0] = mb->PMV[0][0][0];
+	mv0[0].component[1] = mb->PMV[0][0][1];
+	mv0[1].component[0] = mb->PMV[0][1][0];
+	mv0[1].component[1] = mb->PMV[0][1][1];
+
+	macroblock_1fbmv.dw2 = mv0[0].v;
+	macroblock_1fbmv.dw3 = mv0[1].v;
+
+	intelBatchbufferData(&macroblock_1fbmv, sizeof(macroblock_1fbmv), 0);
+}
+
+static void i915_mc_mpeg_macroblock_2fbmv(XvMCContext * context,
+					  XvMCMacroBlock * mb, unsigned int ps)
+{
+	struct i915_3dmpeg_macroblock_2fbmv macroblock_2fbmv;
+	vector_t mv0[2];
+	vector_t mv1[2];
+
+	/* 3DMPEG_MACROBLOCK(2fbmv) */
+	memset(&macroblock_2fbmv, 0, sizeof(macroblock_2fbmv));
+	macroblock_2fbmv.header.dw0.type = CMD_3D;
+	macroblock_2fbmv.header.dw0.opcode = OPC_3DMPEG_MACROBLOCK;
+	macroblock_2fbmv.header.dw0.length = 4;
+	macroblock_2fbmv.header.dw1.mb_intra = 0;	/* should be 0 */
+	macroblock_2fbmv.header.dw1.forward =
+	    ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_FORWARD) ? 1 : 0);
+	macroblock_2fbmv.header.dw1.backward =
+	    ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_BACKWARD) ? 1 : 0);
+	macroblock_2fbmv.header.dw1.h263_4mv = 0;	/* should be 0 */
+	macroblock_2fbmv.header.dw1.dct_type =
+	    (mb->dct_type == XVMC_DCT_TYPE_FIELD);
+
+	if (!(mb->coded_block_pattern & 0x3f))
+		macroblock_2fbmv.header.dw1.dct_type = XVMC_DCT_TYPE_FRAME;
+
+	macroblock_2fbmv.header.dw1.motion_type = (mb->motion_type & 0x03);
+	macroblock_2fbmv.header.dw1.vertical_field_select =
+	    (mb->motion_vertical_field_select & 0x0f);
+	macroblock_2fbmv.header.dw1.coded_block_pattern =
+	    mb->coded_block_pattern;
+	macroblock_2fbmv.header.dw1.skipped_macroblocks = 0;
+
+	mv0[0].component[0] = mb->PMV[0][0][0];
+	mv0[0].component[1] = mb->PMV[0][0][1];
+	mv0[1].component[0] = mb->PMV[0][1][0];
+	mv0[1].component[1] = mb->PMV[0][1][1];
+	mv1[0].component[0] = mb->PMV[1][0][0];
+	mv1[0].component[1] = mb->PMV[1][0][1];
+	mv1[1].component[0] = mb->PMV[1][1][0];
+	mv1[1].component[1] = mb->PMV[1][1][1];
+
+	if ((ps & XVMC_FRAME_PICTURE) == XVMC_FRAME_PICTURE) {
+		if ((mb->motion_type & 3) == XVMC_PREDICTION_FIELD) {
+			mv0[0].component[1] = mb->PMV[0][0][1] >> 1;
+			mv0[1].component[1] = mb->PMV[0][1][1] >> 1;
+			mv1[0].component[1] = mb->PMV[1][0][1] >> 1;
+			mv1[1].component[1] = mb->PMV[1][1][1] >> 1;
+		} else if ((mb->motion_type & 3) == XVMC_PREDICTION_DUAL_PRIME) {
+			mv0[0].component[1] = mb->PMV[0][0][1] >> 1;
+			mv0[1].component[1] = mb->PMV[0][1][1] >> 1;	// MPEG2 MV[0][1] isn't used
+			mv1[0].component[1] = mb->PMV[1][0][1] >> 1;
+			mv1[1].component[1] = mb->PMV[1][1][1] >> 1;
+		}
+	}
+
+	macroblock_2fbmv.dw2 = mv0[0].v;
+	macroblock_2fbmv.dw3 = mv0[1].v;
+	macroblock_2fbmv.dw4 = mv1[0].v;
+	macroblock_2fbmv.dw5 = mv1[1].v;
+
+	intelBatchbufferData(&macroblock_2fbmv, sizeof(macroblock_2fbmv), 0);
+}
+
+static int i915_xvmc_alloc_one_time_buffers(i915XvMCContext *pI915XvMC)
+{
+	pI915XvMC->ssb_bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+					       "ssb",
+					       GTT_PAGE_SIZE,
+					       GTT_PAGE_SIZE);
+	if (!pI915XvMC->ssb_bo)
+		return 0;
+
+	pI915XvMC->psp_bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+					       "psp",
+					       GTT_PAGE_SIZE,
+					       GTT_PAGE_SIZE);
+	if (!pI915XvMC->psp_bo)
+		return 0;
+
+	pI915XvMC->psc_bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+					       "psc",
+					       GTT_PAGE_SIZE,
+					       GTT_PAGE_SIZE);
+	if (!pI915XvMC->psc_bo)
+		return 0;
+
+	return 1;
+}
+
+static void i915_xvmc_free_one_time_buffers(i915XvMCContext *pI915XvMC)
+{
+	drm_intel_bo_unreference(pI915XvMC->ssb_bo);
+	drm_intel_bo_unreference(pI915XvMC->psp_bo);
+	drm_intel_bo_unreference(pI915XvMC->psc_bo);
 }
 
-static void i915_mc_load_indirect_render_emit(void)
-{
-    i915_emit_batch(mc_render_load_indirect, mc_render_load_indirect_size, 0);
-}
-
-static void i915_mc_mpeg_set_origin(XvMCContext *context, XvMCMacroBlock *mb)
-{
-    struct i915_3dmpeg_set_origin set_origin;
-
-    /* 3DMPEG_SET_ORIGIN */
-    memset(&set_origin, 0, sizeof(set_origin));
-    set_origin.dw0.type = CMD_3D;
-    set_origin.dw0.opcode = OPC_3DMPEG_SET_ORIGIN;
-    set_origin.dw0.length = 0;
-    set_origin.dw1.h_origin = mb->x;
-    set_origin.dw1.v_origin = mb->y;
-
-    intelBatchbufferData(&set_origin, sizeof(set_origin), 0);
-}
-
-static void i915_mc_mpeg_macroblock_ipicture(XvMCContext *context, XvMCMacroBlock *mb)
-{
-    struct i915_3dmpeg_macroblock_ipicture macroblock_ipicture;
-
-    /* 3DMPEG_MACROBLOCK_IPICTURE */
-    memset(&macroblock_ipicture, 0, sizeof(macroblock_ipicture));
-    macroblock_ipicture.dw0.type = CMD_3D;
-    macroblock_ipicture.dw0.opcode = OPC_3DMPEG_MACROBLOCK_IPICTURE;
-    macroblock_ipicture.dw0.dct_type = (mb->dct_type == XVMC_DCT_TYPE_FIELD);
-
-    intelBatchbufferData(&macroblock_ipicture, sizeof(macroblock_ipicture), 0);
-}
-
-#if 0
-static void i915_mc_mpeg_macroblock_0mv(XvMCContext *context, XvMCMacroBlock *mb)
-{
-    struct i915_3dmpeg_macroblock_0mv macroblock_0mv;
-
-    /* 3DMPEG_MACROBLOCK(0mv) */
-    memset(&macroblock_0mv, 0, sizeof(macroblock_0mv));
-    macroblock_0mv.header.dw0.type = CMD_3D;
-    macroblock_0mv.header.dw0.opcode = OPC_3DMPEG_MACROBLOCK;
-    macroblock_0mv.header.dw0.length = 0;
-    macroblock_0mv.header.dw1.mb_intra = 1;     /* should be 1 */
-    macroblock_0mv.header.dw1.forward = 0;      /* should be 0 */
-    macroblock_0mv.header.dw1.backward = 0;     /* should be 0 */
-    macroblock_0mv.header.dw1.h263_4mv = 0;     /* should be 0 */
-    macroblock_0mv.header.dw1.dct_type = (mb->dct_type == XVMC_DCT_TYPE_FIELD);
-
-/*
-    if (!mb->coded_block_pattern)
-        macroblock_0mv.header.dw1.dct_type = XVMC_DCT_TYPE_FRAME;
-*/
-
-    macroblock_0mv.header.dw1.motion_type = 0; // (mb->motion_type & 0x3);
-    macroblock_0mv.header.dw1.vertical_field_select = 0; // mb->motion_vertical_field_select & 0xf;
-    macroblock_0mv.header.dw1.coded_block_pattern = mb->coded_block_pattern;
-    macroblock_0mv.header.dw1.skipped_macroblocks = 0;
-
-    intelBatchbufferData(&macroblock_0mv, sizeof(macroblock_0mv), 0);
-}
-#endif
-
-static void i915_mc_mpeg_macroblock_1fbmv(XvMCContext *context, XvMCMacroBlock *mb)
-{
-    struct i915_3dmpeg_macroblock_1fbmv macroblock_1fbmv;
-    vector_t mv0[2];
-
-    /* 3DMPEG_MACROBLOCK(1fbmv) */
-    memset(&macroblock_1fbmv, 0, sizeof(macroblock_1fbmv));
-    macroblock_1fbmv.header.dw0.type = CMD_3D;
-    macroblock_1fbmv.header.dw0.opcode = OPC_3DMPEG_MACROBLOCK;
-    macroblock_1fbmv.header.dw0.length = 2;
-    macroblock_1fbmv.header.dw1.mb_intra = 0;   /* should be 0 */
-    macroblock_1fbmv.header.dw1.forward = ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_FORWARD) ? 1 : 0);
-    macroblock_1fbmv.header.dw1.backward = ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_BACKWARD) ? 1 : 0);
-    macroblock_1fbmv.header.dw1.h263_4mv = 0;   /* should be 0 */
-    macroblock_1fbmv.header.dw1.dct_type = (mb->dct_type == XVMC_DCT_TYPE_FIELD);
-
-    if (!(mb->coded_block_pattern & 0x3f))
-        macroblock_1fbmv.header.dw1.dct_type = XVMC_DCT_TYPE_FRAME;
-
-    macroblock_1fbmv.header.dw1.motion_type = (mb->motion_type & 0x03);
-    macroblock_1fbmv.header.dw1.vertical_field_select = (mb->motion_vertical_field_select & 0x0f);
-    macroblock_1fbmv.header.dw1.coded_block_pattern = mb->coded_block_pattern;
-    macroblock_1fbmv.header.dw1.skipped_macroblocks = 0;
-
-    mv0[0].component[0] = mb->PMV[0][0][0];
-    mv0[0].component[1] = mb->PMV[0][0][1];
-    mv0[1].component[0] = mb->PMV[0][1][0];
-    mv0[1].component[1] = mb->PMV[0][1][1];
-
-    macroblock_1fbmv.dw2 = mv0[0].v;
-    macroblock_1fbmv.dw3 = mv0[1].v;
-
-    intelBatchbufferData(&macroblock_1fbmv, sizeof(macroblock_1fbmv), 0);
-}
-
-static void i915_mc_mpeg_macroblock_2fbmv(XvMCContext *context, XvMCMacroBlock *mb, unsigned int ps)
-{
-    struct i915_3dmpeg_macroblock_2fbmv macroblock_2fbmv;
-    vector_t mv0[2];
-    vector_t mv1[2];
-
-    /* 3DMPEG_MACROBLOCK(2fbmv) */
-    memset(&macroblock_2fbmv, 0, sizeof(macroblock_2fbmv));
-    macroblock_2fbmv.header.dw0.type = CMD_3D;
-    macroblock_2fbmv.header.dw0.opcode = OPC_3DMPEG_MACROBLOCK;
-    macroblock_2fbmv.header.dw0.length = 4;
-    macroblock_2fbmv.header.dw1.mb_intra = 0;   /* should be 0 */
-    macroblock_2fbmv.header.dw1.forward = ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_FORWARD) ? 1 : 0);
-    macroblock_2fbmv.header.dw1.backward = ((mb->macroblock_type & XVMC_MB_TYPE_MOTION_BACKWARD) ? 1 : 0);
-    macroblock_2fbmv.header.dw1.h263_4mv = 0;   /* should be 0 */
-    macroblock_2fbmv.header.dw1.dct_type = (mb->dct_type == XVMC_DCT_TYPE_FIELD);
-
-    if (!(mb->coded_block_pattern & 0x3f))
-        macroblock_2fbmv.header.dw1.dct_type = XVMC_DCT_TYPE_FRAME;
-
-    macroblock_2fbmv.header.dw1.motion_type = (mb->motion_type & 0x03);
-    macroblock_2fbmv.header.dw1.vertical_field_select = (mb->motion_vertical_field_select & 0x0f);
-    macroblock_2fbmv.header.dw1.coded_block_pattern = mb->coded_block_pattern;
-    macroblock_2fbmv.header.dw1.skipped_macroblocks = 0;
-
-    mv0[0].component[0] = mb->PMV[0][0][0];
-    mv0[0].component[1] = mb->PMV[0][0][1];
-    mv0[1].component[0] = mb->PMV[0][1][0];
-    mv0[1].component[1] = mb->PMV[0][1][1];
-    mv1[0].component[0] = mb->PMV[1][0][0];
-    mv1[0].component[1] = mb->PMV[1][0][1];
-    mv1[1].component[0] = mb->PMV[1][1][0];
-    mv1[1].component[1] = mb->PMV[1][1][1];
-
-    if ((ps & XVMC_FRAME_PICTURE) == XVMC_FRAME_PICTURE) {
-        if ((mb->motion_type & 3) == XVMC_PREDICTION_FIELD) {
-            mv0[0].component[1] = mb->PMV[0][0][1] >> 1;
-            mv0[1].component[1] = mb->PMV[0][1][1] >> 1;
-            mv1[0].component[1] = mb->PMV[1][0][1] >> 1;
-            mv1[1].component[1] = mb->PMV[1][1][1] >> 1;
-        } else if ((mb->motion_type & 3) == XVMC_PREDICTION_DUAL_PRIME) {
-            mv0[0].component[1] = mb->PMV[0][0][1] >> 1;
-            mv0[1].component[1] = mb->PMV[0][1][1] >> 1;  // MPEG2 MV[0][1] isn't used
-            mv1[0].component[1] = mb->PMV[1][0][1] >> 1;
-            mv1[1].component[1] = mb->PMV[1][1][1] >> 1;
-        }
-    }
-
-    macroblock_2fbmv.dw2 = mv0[0].v;
-    macroblock_2fbmv.dw3 = mv0[1].v;
-    macroblock_2fbmv.dw4 = mv1[0].v;
-    macroblock_2fbmv.dw5 = mv1[1].v;
-
-    intelBatchbufferData(&macroblock_2fbmv, sizeof(macroblock_2fbmv), 0);
-}
-
-#if 0
-static void i915_mc_invalidate_subcontext_buffers(XvMCContext *context, unsigned int mask)
-{
-    struct i915_3dstate_load_indirect *load_indirect = NULL;
-    sis_state *sis = NULL;
-    dis_state *dis = NULL;
-    ssb_state *ssb = NULL;
-    msb_state *msb = NULL;
-    psp_state *psp = NULL;
-    psc_state *psc = NULL;
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)context->privData;
-    unsigned int size;
-    void *base = NULL, *ptr = NULL;
-
-    size = sizeof(*load_indirect);
-    if (mask & BLOCK_SIS)
-        size += sizeof(*sis);
-    if (mask & BLOCK_DIS)
-        size += sizeof(*dis);
-    if (mask & BLOCK_SSB)
-        size += sizeof(*ssb);
-    if (mask & BLOCK_MSB)
-        size += sizeof(*msb);
-    if (mask & BLOCK_PSP)
-        size += sizeof(*psp);
-    if (mask & BLOCK_PSC)
-        size += sizeof(*psc);
-
-    if (size == sizeof(*load_indirect)) {
-        XVMC_ERR("There must be at least one bit set\n");
-        return;
-    }
-
-    /* 3DSTATE_LOAD_INDIRECT */
-    base = calloc(1, size);
-    load_indirect = (struct i915_3dstate_load_indirect *)base;
-    load_indirect->dw0.type = CMD_3D;
-    load_indirect->dw0.opcode = OPC_3DSTATE_LOAD_INDIRECT;
-
-    if (pI915XvMC->deviceID == PCI_CHIP_I915_G ||
-        pI915XvMC->deviceID == PCI_CHIP_I915_GM ||
-        pI915XvMC->deviceID == PCI_CHIP_I945_G ||
-        pI915XvMC->deviceID == PCI_CHIP_I945_GM)
-        load_indirect->dw0.mem_select = 0;
-    else
-        load_indirect->dw0.mem_select = 1;
-
-    load_indirect->dw0.block_mask = mask;
-    load_indirect->dw0.length = (size >> 2) - 2;
-    ptr = ++load_indirect;
-
-    /* SIS */
-    if (mask & BLOCK_SIS) {
-        sis = (sis_state *)ptr;
-        sis->dw0.valid = 0;
-        sis->dw0.buffer_address = 0;
-        sis->dw1.length = 0;
-        ptr = ++sis;
-    }
-
-    /* DIS */
-    if (mask & BLOCK_DIS) {
-        dis = (dis_state *)ptr;
-        dis->dw0.valid = 0;
-        dis->dw0.reset = 0;
-        dis->dw0.buffer_address = 0;
-        ptr = ++dis;
-    }
-
-    /* SSB */
-    if (mask & BLOCK_SSB) {
-        ssb = (ssb_state *)ptr;
-        ssb->dw0.valid = 0;
-        ssb->dw0.buffer_address = 0;
-        ssb->dw1.length = 0;
-        ptr = ++ssb;
-    }
-
-    /* MSB */
-    if (mask & BLOCK_MSB) {
-        msb = (msb_state *)ptr;
-        msb->dw0.valid = 0;
-        msb->dw0.buffer_address = 0;
-        msb->dw1.length = 0;
-        ptr = ++msb;
-    }
-
-    /* PSP */
-    if (mask & BLOCK_PSP) {
-        psp = (psp_state *)ptr;
-        psp->dw0.valid = 0;
-        psp->dw0.buffer_address = 0;
-        psp->dw1.length = 0;
-        ptr = ++psp;
-    }
-
-    /* PSC */
-    if (mask & BLOCK_PSC) {
-        psc = (psc_state *)ptr;
-        psc->dw0.valid = 0;
-        psc->dw0.buffer_address = 0;
-        psc->dw1.length = 0;
-        ptr = ++psc;
-    }
-
-    intelBatchbufferData(base, size, 0);
-    free(base);
-}
-#endif
-
-static int i915_xvmc_map_buffers(i915XvMCContext *pI915XvMC)
-{
-    if (drmMap(xvmc_driver->fd,
-               pI915XvMC->sis.handle,
-               pI915XvMC->sis.size,
-               (drmAddress *)&pI915XvMC->sis.map) != 0) {
-        return -1;
-    }
-
-    if (drmMap(xvmc_driver->fd,
-               pI915XvMC->ssb.handle,
-               pI915XvMC->ssb.size,
-               (drmAddress *)&pI915XvMC->ssb.map) != 0) {
-        return -1;
-    }
-
-    if (drmMap(xvmc_driver->fd,
-               pI915XvMC->msb.handle,
-               pI915XvMC->msb.size,
-               (drmAddress *)&pI915XvMC->msb.map) != 0) {
-        return -1;
-    }
-
-    if (drmMap(xvmc_driver->fd,
-               pI915XvMC->psp.handle,
-               pI915XvMC->psp.size,
-               (drmAddress *)&pI915XvMC->psp.map) != 0) {
-        return -1;
-    }
-
-    if (drmMap(xvmc_driver->fd,
-               pI915XvMC->psc.handle,
-               pI915XvMC->psc.size,
-               (drmAddress *)&pI915XvMC->psc.map) != 0) {
-        return -1;
-    }
-
-    if (drmMap(xvmc_driver->fd,
-               pI915XvMC->corrdata.handle,
-               pI915XvMC->corrdata.size,
-               (drmAddress *)&pI915XvMC->corrdata.map) != 0) {
-        return -1;
-    }
-
-    return 0;
-}
-
-static void i915_xvmc_unmap_buffers(i915XvMCContext *pI915XvMC)
-{
-    if (pI915XvMC->sis.map) {
-        drmUnmap(pI915XvMC->sis.map, pI915XvMC->sis.size);
-        pI915XvMC->sis.map = NULL;
-    }
-
-    if (pI915XvMC->ssb.map) {
-        drmUnmap(pI915XvMC->ssb.map, pI915XvMC->ssb.size);
-        pI915XvMC->ssb.map = NULL;
-    }
-
-    if (pI915XvMC->msb.map) {
-        drmUnmap(pI915XvMC->msb.map, pI915XvMC->msb.size);
-        pI915XvMC->msb.map = NULL;
-    }
-
-    if (pI915XvMC->psp.map) {
-        drmUnmap(pI915XvMC->psp.map, pI915XvMC->psp.size);
-        pI915XvMC->psp.map = NULL;
-    }
-
-    if (pI915XvMC->psc.map) {
-        drmUnmap(pI915XvMC->psc.map, pI915XvMC->psc.size);
-        pI915XvMC->psc.map = NULL;
-    }
-
-    if (pI915XvMC->corrdata.map) {
-        drmUnmap(pI915XvMC->corrdata.map, pI915XvMC->corrdata.size);
-        pI915XvMC->corrdata.map = NULL;
-    }
-}
-
-#if 0
-/*
- * Video post processing
- */
-static void i915_yuv2rgb_map_state_buffer(XvMCSurface *target_surface)
-{
-    struct i915_3dstate_map_state *map_state;
-    struct texture_map *tm;
-    i915XvMCSurface *privTarget = NULL;
-    i915XvMCContext *pI915XvMC = NULL;
-    unsigned int w = target_surface->width, h = target_surface->height;
-
-    privTarget = (i915XvMCSurface *)target_surface->privData;
-    pI915XvMC = (i915XvMCContext *)privTarget->privContext;
-    /* 3DSATE_MAP_STATE */
-    map_state = (struct i915_3dstate_map_state *)pI915XvMC->msb.map;
-    memset(map_state, 0, sizeof(*map_state));
-    map_state->dw0.type = CMD_3D;
-    map_state->dw0.opcode = OPC_3DSTATE_MAP_STATE;
-    map_state->dw0.retain = 0;
-    map_state->dw0.length = 9;
-    map_state->dw1.map_mask = MAP_MAP0 | MAP_MAP1 | MAP_MAP2;
-
-    /* texture map 0: V Plane */
-    tm = (struct texture_map *)(++map_state);
-    memset(tm, 0, sizeof(*tm));
-    tm->tm0.v_ls_offset = 0;
-    tm->tm0.v_ls = 0;
-    tm->tm0.base_address = VOFFSET(privTarget);
-    tm->tm1.tile_walk = TILEWALK_XMAJOR;
-    tm->tm1.tiled_surface = 0;
-    tm->tm1.utilize_fence_regs = 1;
-    tm->tm1.texel_fmt = 0;
-    tm->tm1.surface_fmt = 1;
-    tm->tm1.width = (w >> 1) - 1;
-    tm->tm1.height = (h >> 1) - 1;
-    tm->tm2.depth = 0;
-    tm->tm2.max_lod = 0;
-    tm->tm2.cube_face = 0;
-    tm->tm2.pitch = (privTarget->uvStride >> 2) - 1;    /* in DWords - 1 */
-
-    /* texture map 1: Y Plane */
-    ++tm;
-    memset(tm, 0, sizeof(*tm));
-    tm->tm0.v_ls_offset = 0;
-    tm->tm0.v_ls = 0;
-    tm->tm0.base_address = YOFFSET(privTarget);
-    tm->tm1.tile_walk = TILEWALK_XMAJOR;
-    tm->tm1.tiled_surface = 0;
-    tm->tm1.utilize_fence_regs = 1;
-    tm->tm1.texel_fmt = 0;
-    tm->tm1.surface_fmt = 1;
-    tm->tm1.width = w - 1;
-    tm->tm1.height = h - 1;
-    tm->tm2.depth = 0;
-    tm->tm2.max_lod = 0;
-    tm->tm2.cube_face = 0;
-    tm->tm2.pitch = (privTarget->yStride >> 2) - 1;     /* in DWords - 1 */
-
-    /* texture map 2: U Plane */
-    ++tm;
-    memset(tm, 0, sizeof(*tm));
-    tm->tm0.v_ls_offset = 0;
-    tm->tm0.v_ls = 0;
-    tm->tm0.base_address = UOFFSET(privTarget);
-    tm->tm1.tile_walk = TILEWALK_XMAJOR;
-    tm->tm1.tiled_surface = 0;
-    tm->tm1.utilize_fence_regs = 1;
-    tm->tm1.texel_fmt = 0;
-    tm->tm1.surface_fmt = 1;
-    tm->tm1.width = (w >> 1) - 1;
-    tm->tm1.height = (h >> 1) - 1;
-    tm->tm2.depth = 0;
-    tm->tm2.max_lod = 0;
-    tm->tm2.cube_face = 0;
-    tm->tm2.pitch = (privTarget->uvStride >> 2) - 1;    /* in DWords - 1 */
-}
-#endif
-
-#if 0
-static void i915_yuv2rgb_sampler_state_buffer(XvMCSurface *surface)
-{
-    struct i915_3dstate_sampler_state *sampler_state;
-    struct texture_sampler *ts;
-    i915XvMCSurface *privSurface = (i915XvMCSurface *)surface->privData;
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)privSurface->privContext;
-
-    /* 3DSATE_SAMPLER_STATE */
-    sampler_state = (struct i915_3dstate_sampler_state *)pI915XvMC->ssb.map;
-    memset(sampler_state, 0, sizeof(*sampler_state));
-    sampler_state->dw0.type = CMD_3D;
-    sampler_state->dw0.opcode = OPC_3DSTATE_SAMPLER_STATE;
-    sampler_state->dw0.length = 9;
-    sampler_state->dw1.sampler_masker = SAMPLER_SAMPLER0 | SAMPLER_SAMPLER1 | SAMPLER_SAMPLER2;
-
-    /* Sampler 0 */
-    ts = (struct texture_sampler *)(++sampler_state);
-    memset(ts, 0, sizeof(*ts));
-    ts->ts0.reverse_gamma = 0;
-    ts->ts0.planar2packet = 1;
-    ts->ts0.color_conversion = 1;
-    ts->ts0.chromakey_index = 0;
-    ts->ts0.base_level = 0;
-    ts->ts0.mip_filter = MIPFILTER_NONE;        /* NONE */
-    ts->ts0.mag_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    ts->ts0.min_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    ts->ts0.lod_bias = 0;
-    ts->ts0.shadow_enable = 0;
-    ts->ts0.max_anisotropy = ANISORATIO_2;
-    ts->ts0.shadow_function = PREFILTEROP_ALWAYS;
-    ts->ts1.min_lod = 0;        /* Maximum Mip Level */
-    ts->ts1.kill_pixel = 0;
-    ts->ts1.keyed_texture_filter = 0;
-    ts->ts1.chromakey_enable = 0;
-    ts->ts1.tcx_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.tcy_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.tcz_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.normalized_coor = 0;
-    ts->ts1.map_index = 0;
-    ts->ts1.east_deinterlacer = 0;
-    ts->ts2.default_color = 0;
-
-    /* Sampler 1 */
-    ++ts;
-    memset(ts, 0, sizeof(*ts));
-    ts->ts0.reverse_gamma = 0;
-    ts->ts0.planar2packet = 1;
-    ts->ts0.color_conversion = 1;
-    ts->ts0.chromakey_index = 0;
-    ts->ts0.base_level = 0;
-    ts->ts0.mip_filter = MIPFILTER_NONE;        /* NONE */
-    ts->ts0.mag_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    ts->ts0.min_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    ts->ts0.lod_bias = 0;
-    ts->ts0.shadow_enable = 0;
-    ts->ts0.max_anisotropy = ANISORATIO_2;
-    ts->ts0.shadow_function = PREFILTEROP_ALWAYS;
-    ts->ts1.min_lod = 0;        /* Maximum Mip Level */
-    ts->ts1.kill_pixel = 0;
-    ts->ts1.keyed_texture_filter = 0;
-    ts->ts1.chromakey_enable = 0;
-    ts->ts1.tcx_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.tcy_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.tcz_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.normalized_coor = 0;
-    ts->ts1.map_index = 1;
-    ts->ts1.east_deinterlacer = 0;
-    ts->ts2.default_color = 0;
-
-    /* Sampler 2 */
-    ++ts;
-    memset(ts, 0, sizeof(*ts));
-    ts->ts0.reverse_gamma = 0;
-    ts->ts0.planar2packet = 1;
-    ts->ts0.color_conversion = 1;
-    ts->ts0.chromakey_index = 0;
-    ts->ts0.base_level = 0;
-    ts->ts0.mip_filter = MIPFILTER_NONE;        /* NONE */
-    ts->ts0.mag_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    ts->ts0.min_filter = MAPFILTER_LINEAR;      /* LINEAR */
-    ts->ts0.lod_bias = 0;
-    ts->ts0.shadow_enable = 0;
-    ts->ts0.max_anisotropy = ANISORATIO_2;
-    ts->ts0.shadow_function = PREFILTEROP_ALWAYS;
-    ts->ts1.min_lod = 0;        /* Maximum Mip Level */
-    ts->ts1.kill_pixel = 0;
-    ts->ts1.keyed_texture_filter = 0;
-    ts->ts1.chromakey_enable = 0;
-    ts->ts1.tcx_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.tcy_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.tcz_control = TEXCOORDMODE_CLAMP;
-    ts->ts1.normalized_coor = 0;
-    ts->ts1.map_index = 2;
-    ts->ts1.east_deinterlacer = 0;
-    ts->ts2.default_color = 0;
-}
-#endif
-
-#if 0
-static void i915_yuv2rgb_static_indirect_state_buffer(XvMCSurface *surface,
-                                                      unsigned int dstaddr,
-                                                      int dstpitch)
-{
-    struct i915_3dstate_buffer_info *buffer_info;
-    struct i915_3dstate_dest_buffer_variables *dest_buffer_variables;
-    i915XvMCSurface *privSurface = (i915XvMCSurface *)surface->privData;
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)privSurface->privContext;
-
-    /* 3DSTATE_BUFFER_INFO */
-    buffer_info = (struct i915_3dstate_buffer_info *)pI915XvMC->sis.map;
-    memset(buffer_info, 0, sizeof(*buffer_info));
-    buffer_info->dw0.type = CMD_3D;
-    buffer_info->dw0.opcode = OPC_3DSTATE_BUFFER_INFO;
-    buffer_info->dw0.length = 1;
-    buffer_info->dw1.aux_id = 0;
-    buffer_info->dw1.buffer_id = BUFFERID_COLOR_BACK;
-    buffer_info->dw1.fence_regs = 1;
-    buffer_info->dw1.tiled_surface = 0;   /* linear */
-    buffer_info->dw1.walk = TILEWALK_XMAJOR;
-    buffer_info->dw1.pitch = dstpitch;
-    buffer_info->dw2.base_address = dstaddr;
-
-    /* 3DSTATE_DEST_BUFFER_VARIABLES */
-    dest_buffer_variables = (struct i915_3dstate_dest_buffer_variables *)(++buffer_info);
-    memset(dest_buffer_variables, 0, sizeof(*dest_buffer_variables));
-    dest_buffer_variables->dw0.type = CMD_3D;
-    dest_buffer_variables->dw0.opcode = OPC_3DSTATE_DEST_BUFFER_VARIABLES;
-    dest_buffer_variables->dw0.length = 0;
-    dest_buffer_variables->dw1.dest_v_bias = 8; /* FIXME 0x1000 .5 ??? */
-    dest_buffer_variables->dw1.dest_h_bias = 8;
-    dest_buffer_variables->dw1.color_fmt = COLORBUFFER_A8R8G8B8;  /* FIXME */
-}
-#endif
-
-#if 0
-static void i915_yuv2rgb_pixel_shader_program_buffer(XvMCSurface *surface)
-{
-    struct i915_3dstate_pixel_shader_program *pixel_shader_program;
-    i915XvMCSurface *privSurface = (i915XvMCSurface *)surface->privData;
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)privSurface->privContext;
-    unsigned int *inst;
-    unsigned int dest, src0, src1;
-
-    /* Shader 0 */
-    pixel_shader_program = (struct i915_3dstate_pixel_shader_program *)pI915XvMC->psp.map;
-    memset(pixel_shader_program, 0, sizeof(*pixel_shader_program));
-    pixel_shader_program->dw0.type = CMD_3D;
-    pixel_shader_program->dw0.opcode = OPC_3DSTATE_PIXEL_SHADER_PROGRAM;
-    pixel_shader_program->dw0.retain = 0;
-    pixel_shader_program->dw0.length = 23;
-    /* dcl      t0.xy */
-    inst = (unsigned int*)(++pixel_shader_program);
-    i915_inst_decl(inst, REG_TYPE_T, T_TEX0, D0_CHANNEL_XY);
-    /* dcl         t1.xy */
-    inst += 3;
-    i915_inst_decl(inst, REG_TYPE_T, T_TEX1, D0_CHANNEL_XY);
-    /* dcl_2D   s0 */
-    inst += 3;
-    i915_inst_decl(inst, REG_TYPE_S, 0, D0_SAMPLE_TYPE_2D);
-    /* dcl_2D   s1 */
-    inst += 3;
-    i915_inst_decl(inst, REG_TYPE_S, 1, D0_SAMPLE_TYPE_2D);
-    /* dcl_2D   s2 */
-    inst += 3;
-    i915_inst_decl(inst, REG_TYPE_S, 2, D0_SAMPLE_TYPE_2D);
-    /* texld    r0 t1 s0 */
-    inst += 3;
-    dest = UREG(REG_TYPE_R, 0);
-    src0 = UREG(REG_TYPE_T, 1); /* COORD */
-    src1 = UREG(REG_TYPE_S, 0); /* SAMPLER */
-    i915_inst_texld(inst, T0_TEXLD, dest, src0, src1);
-    /* texld    r0 t0 s1 */
-    inst += 3;
-    dest = UREG(REG_TYPE_R, 0);
-    src0 = UREG(REG_TYPE_T, 0); /* COORD */
-    src1 = UREG(REG_TYPE_S, 1); /* SAMPLER */
-    i915_inst_texld(inst, T0_TEXLD, dest, src0, src1);
-    /* texld    oC t1 s2 */
-    inst += 3;
-    dest = UREG(REG_TYPE_OC, 0);
-    src0 = UREG(REG_TYPE_T, 1); /* COORD */
-    src1 = UREG(REG_TYPE_S, 2); /* SAMPLER */
-    i915_inst_texld(inst, T0_TEXLD, dest, src0, src1);
-}
-#endif
-
-#if 0
-static void i915_yuv2rgb_proc(XvMCSurface *surface)
-{
-    i915XvMCSurface *privSurface = (i915XvMCSurface *)surface->privData;
-    i915XvMCContext *pI915XvMC = (i915XvMCContext *)privSurface->privContext;
-    struct i915_3dstate_load_state_immediate_1 *load_state_immediate_1 = NULL;
-    struct s2_dword *s2 = NULL;
-    struct s3_dword *s3 = NULL;
-    struct s4_dword *s4 = NULL;
-    struct s5_dword *s5 = NULL;
-    struct s6_dword *s6 = NULL;
-    struct s7_dword *s7 = NULL;
-    struct i915_3dstate_scissor_rectangle scissor_rectangle;
-    struct i915_3dstate_load_indirect *load_indirect = NULL;
-    sis_state *sis = NULL;
-    ssb_state *ssb = NULL;
-    msb_state *msb = NULL;
-    psp_state *psp = NULL;
-    struct i915_3dprimitive *_3dprimitive = NULL;
-    struct vertex_data *vd = NULL;
-    unsigned int size;
-    void *base = NULL;
-
-    /* 3DSTATE_LOAD_STATE_IMMEDIATE_1 */
-    size = sizeof(*load_state_immediate_1) + sizeof(*s2) + sizeof(*s3) +
-        sizeof(*s4) + sizeof(*s5) + sizeof(*s6) + sizeof(*s7);
-    base = calloc(1, size);
-    load_state_immediate_1 = (struct i915_3dstate_load_state_immediate_1 *)base;
-    load_state_immediate_1->dw0.type = CMD_3D;
-    load_state_immediate_1->dw0.opcode = OPC_3DSTATE_LOAD_STATE_IMMEDIATE_1;
-    load_state_immediate_1->dw0.load_s2 = 1;
-    load_state_immediate_1->dw0.load_s3 = 1;
-    load_state_immediate_1->dw0.load_s4 = 1;
-    load_state_immediate_1->dw0.load_s5 = 1;
-    load_state_immediate_1->dw0.load_s6 = 1;
-    load_state_immediate_1->dw0.load_s7 = 1;
-    load_state_immediate_1->dw0.length = 5;
-
-    s2 = (struct s2_dword *)(++load_state_immediate_1);
-    s2->set0_texcoord_fmt = TEXCOORDFMT_2FP;
-    s2->set1_texcoord_fmt = TEXCOORDFMT_2FP;
-    s2->set2_texcoord_fmt = TEXCOORDFMT_NOT_PRESENT;
-    s2->set3_texcoord_fmt = TEXCOORDFMT_NOT_PRESENT;
-    s2->set4_texcoord_fmt = TEXCOORDFMT_NOT_PRESENT;
-    s2->set5_texcoord_fmt = TEXCOORDFMT_NOT_PRESENT;
-    s2->set6_texcoord_fmt = TEXCOORDFMT_NOT_PRESENT;
-    s2->set7_texcoord_fmt = TEXCOORDFMT_NOT_PRESENT;
-
-    s3 = (struct s3_dword *)(++s2);
-    s4 = (struct s4_dword *)(++s3);
-    s4->position_mask = VERTEXHAS_XY;
-    s4->cull_mode = CULLMODE_NONE;
-    s4->color_shade_mode = SHADEMODE_FLAT;
-    s4->specular_shade_mode = SHADEMODE_FLAT;
-    s4->fog_shade_mode = SHADEMODE_FLAT;
-    s4->alpha_shade_mode = SHADEMODE_FLAT;
-    s4->line_width = 0x2;     /* FIXME: 1.0??? */
-    s4->point_width = 0x1;
-
-    s5 = (struct s5_dword *)(++s4);
-    s6 = (struct s6_dword *)(++s5);
-    s6->src_blend_factor = 1;
-    s6->dest_blend_factor = 1;
-    s6->color_buffer_write = 1;
-
-    s7 = (struct s7_dword *)(++s6);
-    intelBatchbufferData(base, size, 0);
-    free(base);
-
-    /* 3DSTATE_3DSTATE_SCISSOR_RECTANGLE */
-    scissor_rectangle.dw0.type = CMD_3D;
-    scissor_rectangle.dw0.opcode = OPC_3DSTATE_SCISSOR_RECTANGLE;
-    scissor_rectangle.dw0.length = 1;
-    scissor_rectangle.dw1.min_x = 0;
-    scissor_rectangle.dw1.min_y = 0;
-    scissor_rectangle.dw2.max_x = 2047;
-    scissor_rectangle.dw2.max_y = 2047;
-    intelBatchbufferData(&scissor_rectangle, sizeof(scissor_rectangle), 0);
-
-    /* 3DSTATE_LOAD_INDIRECT */
-    size = sizeof(*load_indirect) + sizeof(*sis) + sizeof(*ssb) + sizeof(*msb) + sizeof(*psp);
-    base = calloc(1, size);
-    load_indirect = (struct i915_3dstate_load_indirect *)base;
-    load_indirect->dw0.type = CMD_3D;
-    load_indirect->dw0.opcode = OPC_3DSTATE_LOAD_INDIRECT;
-    load_indirect->dw0.mem_select = 1;  /* Bearlake only */
-    load_indirect->dw0.block_mask = BLOCK_SIS | BLOCK_SSB | BLOCK_MSB | BLOCK_PSP;
-    load_indirect->dw0.length = 7;
-
-    /* SIS */
-    sis = (sis_state *)(++load_indirect);
-    sis->dw0.valid = 1;
-    sis->dw0.buffer_address = pI915XvMC->sis.offset;
-    sis->dw1.length = ((sizeof(struct i915_3dstate_buffer_info) +
-                        sizeof(struct i915_3dstate_dest_buffer_variables)) >> 2) - 1;
-
-    /* SSB */
-    ssb = (ssb_state *)(++sis);
-    ssb->dw0.valid = 1;
-    ssb->dw0.buffer_address = pI915XvMC->ssb.offset;
-    ssb->dw1.length = ((sizeof(struct i915_3dstate_sampler_state) +
-                        sizeof(struct texture_sampler) * 3) >> 2) - 1;
-
-    /* MSB */
-    msb = (msb_state *)(++ssb);
-    msb->dw0.valid = 1;
-    msb->dw0.buffer_address = pI915XvMC->msb.offset;
-    msb->dw1.length = ((sizeof(struct i915_3dstate_map_state) +
-                        sizeof(struct texture_map) * 3) >> 2) - 1;
-
-    /* PSP */
-    psp = (psp_state *)(++msb);
-    psp->dw0.valid = 1;
-    psp->dw0.buffer_address = pI915XvMC->psp.offset;
-    psp->dw1.length = ((sizeof(struct i915_3dstate_pixel_shader_program) +
-                        sizeof(union shader_inst)) >> 2) - 1;
-
-    intelBatchbufferData(base, size, 0);
-    free(base);
-
-    /* 3DPRIMITIVE */
-    size = sizeof(*_3dprimitive) + sizeof(*vd) * 3;
-    base = calloc(1, size);
-    _3dprimitive = (struct i915_3dprimitive *)base;
-    _3dprimitive->dw0.inline_prim.type = CMD_3D;
-    _3dprimitive->dw0.inline_prim.opcode = OPC_3DPRIMITIVE;
-    _3dprimitive->dw0.inline_prim.vertex_location = VERTEX_INLINE;
-    _3dprimitive->dw0.inline_prim.prim = PRIM_RECTLIST;
-    _3dprimitive->dw0.inline_prim.length = size - 2;
-
-    vd = (struct vertex_data *)(++_3dprimitive);
-    vd->x = 0;          /* FIXME!!! */
-    vd->x = 0;          /* FIXME */
-    vd->tc0.tcx = 0;
-    vd->tc0.tcy = 0;
-    vd->tc1.tcx = 0;
-    vd->tc1.tcy = 0;
-
-    ++vd;
-    vd->x = 0;          /* FIXME!!! */
-    vd->x = 0;          /* FIXME */
-    vd->tc0.tcx = 0;
-    vd->tc0.tcy = 0;
-    vd->tc1.tcx = 0;
-    vd->tc1.tcy = 0;
-
-    ++vd;
-    vd->x = 0;          /* FIXME!!! */
-    vd->x = 0;          /* FIXME */
-    vd->tc0.tcx = 0;
-    vd->tc0.tcy = 0;
-    vd->tc1.tcx = 0;
-    vd->tc1.tcy = 0;
-
-    intelBatchbufferData(base, size, 0);
-    free(base);
-}
-#endif
-
 /*
  * Function: i915_release_resource
  */
-static void i915_release_resource(Display *display, XvMCContext *context)
-{
-    i915XvMCContext *pI915XvMC;
-
-    if (!(pI915XvMC = context->privData))
-        return;
-
-    pI915XvMC->ref--;
-    i915_xvmc_unmap_buffers(pI915XvMC);
-
-    free(pI915XvMC);
-    context->privData = NULL;
-}
-
-static Status i915_xvmc_mc_create_context(Display *display, XvMCContext *context,
-	int priv_count, CARD32 *priv_data)
+static void i915_release_resource(Display * display, XvMCContext * context)
 {
-    i915XvMCContext *pI915XvMC = NULL;
-    I915XvMCCreateContextRec *tmpComm = NULL;
-    drm_sarea_t *pSAREA;
-
-    XVMC_DBG("%s\n", __FUNCTION__);
-
-    if (priv_count != (sizeof(I915XvMCCreateContextRec) >> 2)) {
-        XVMC_ERR("_xvmc_create_context() returned incorrect data size!");
-        XVMC_INFO("\tExpected %d, got %d",
-               (int)(sizeof(I915XvMCCreateContextRec) >> 2),priv_count);
-        _xvmc_destroy_context(display, context);
-        XFree(priv_data);
-        context->privData = NULL;
-        return BadValue;
-    }
-
-    context->privData = (void *)calloc(1, sizeof(i915XvMCContext));
-    if (!context->privData) {
-        XVMC_ERR("Unable to allocate resources for XvMC context.");
-        return BadAlloc;
-    }
-    pI915XvMC = (i915XvMCContext *)context->privData;
-
-    tmpComm = (I915XvMCCreateContextRec *)priv_data;
-    pI915XvMC->ctxno = tmpComm->ctxno;
-    pI915XvMC->deviceID = tmpComm->deviceID;
-    pI915XvMC->sis.handle = tmpComm->sis.handle;
-    pI915XvMC->sis.offset = tmpComm->sis.offset;
-    pI915XvMC->sis.size = tmpComm->sis.size;
-    pI915XvMC->ssb.handle = tmpComm->ssb.handle;
-    pI915XvMC->ssb.offset = tmpComm->ssb.offset;
-    pI915XvMC->ssb.size = tmpComm->ssb.size;
-    pI915XvMC->msb.handle = tmpComm->msb.handle;
-    pI915XvMC->msb.offset = tmpComm->msb.offset;
-    pI915XvMC->msb.size = tmpComm->msb.size;
-    pI915XvMC->psp.handle = tmpComm->psp.handle;
-    pI915XvMC->psp.offset = tmpComm->psp.offset;
-    pI915XvMC->psp.size = tmpComm->psp.size;
-    pI915XvMC->psc.handle = tmpComm->psc.handle;
-    pI915XvMC->psc.offset = tmpComm->psc.offset;
-    pI915XvMC->psc.size = tmpComm->psc.size;
-
-    if (pI915XvMC->deviceID == PCI_CHIP_I915_G ||
-        pI915XvMC->deviceID == PCI_CHIP_I915_GM) {
-        pI915XvMC->sis.bus_addr = tmpComm->sis.bus_addr;
-        pI915XvMC->ssb.bus_addr = tmpComm->ssb.bus_addr;
-        pI915XvMC->msb.bus_addr = tmpComm->msb.bus_addr;
-        pI915XvMC->psp.bus_addr = tmpComm->psp.bus_addr;
-        pI915XvMC->psc.bus_addr = tmpComm->psc.bus_addr;
-    }
-
-    pI915XvMC->corrdata.handle = tmpComm->corrdata.handle;
-    pI915XvMC->corrdata.offset = tmpComm->corrdata.offset;
-    pI915XvMC->corrdata.size = tmpComm->corrdata.size;
-    pI915XvMC->sarea_priv_offset = tmpComm->sarea_priv_offset;
-
-    /* Must free the private data we were passed from X */
-    XFree(priv_data);
-    priv_data = NULL;
-
-    pSAREA = (drm_sarea_t *)xvmc_driver->sarea_address;
-    pI915XvMC->sarea = (drmI830Sarea*)((char*)pSAREA + pI915XvMC->sarea_priv_offset);
-
-    if (i915_xvmc_map_buffers(pI915XvMC)) {
-        i915_xvmc_unmap_buffers(pI915XvMC);
-        free(pI915XvMC);
-        context->privData = NULL;
-        return BadAlloc;
-    }
-
-    /* Initialize private context values */
-    pI915XvMC->yStride = STRIDE(context->width);
-    pI915XvMC->uvStride = STRIDE(context->width >> 1);
-    pI915XvMC->haveXv = 0;
-    pI915XvMC->dual_prime = 0;
-    pI915XvMC->last_flip = 0;
-    pI915XvMC->port = context->port;
-    pI915XvMC->ref = 1;
-
-    /* pre-init state buffers */
-    i915_mc_one_time_context_init(context);
-    i915_mc_one_time_state_init(context);
-
-    i915_mc_static_indirect_state_init(context);
-
-    i915_mc_map_state_init(context);
+	i915XvMCContext *pI915XvMC;
 
-    i915_mc_load_indirect_render_init(context);
-    return Success;
-}
+	if (!(pI915XvMC = context->privData))
+		return;
 
-static int i915_xvmc_mc_destroy_context(Display *display, XvMCContext *context)
-{
-    i915XvMCContext *pI915XvMC;
+	i915_xvmc_free_one_time_buffers(pI915XvMC);
 
-    if (!(pI915XvMC = context->privData))
-        return XvMCBadContext;
+	free(pI915XvMC);
+	context->privData = NULL;
+}
+
+static Status i915_xvmc_mc_create_context(Display * display,
+					  XvMCContext * context, int priv_count,
+					  CARD32 * priv_data)
+{
+	i915XvMCContext *pI915XvMC = NULL;
+	struct intel_xvmc_hw_context *tmpComm = NULL;
+
+	if (priv_count != (sizeof(struct intel_xvmc_hw_context) >> 2)) {
+		XVMC_ERR
+		    ("_xvmc_create_context() returned incorrect data size!");
+		XVMC_INFO("\tExpected %d, got %d",
+			  (int)(sizeof(struct intel_xvmc_hw_context) >> 2),
+			  priv_count);
+		_xvmc_destroy_context(display, context);
+		XFree(priv_data);
+		context->privData = NULL;
+		return BadValue;
+	}
+
+	context->privData = (void *)calloc(1, sizeof(i915XvMCContext));
+	if (!context->privData) {
+		XVMC_ERR("Unable to allocate resources for XvMC context.");
+		return BadAlloc;
+	}
+	pI915XvMC = (i915XvMCContext *) context->privData;
+
+	tmpComm = (struct intel_xvmc_hw_context *) priv_data;
+	pI915XvMC->use_phys_addr = tmpComm->i915.use_phys_addr;
+	pI915XvMC->comm.surface_bo_size = SIZE_YUV420(context->width,
+						      context->height);
+
+	/* Must free the private data we were passed from X */
+	XFree(priv_data);
+	priv_data = NULL;
+
+	if (!i915_xvmc_alloc_one_time_buffers(pI915XvMC))
+		goto free_one_time_buffers;
+
+	/* Initialize private context values */
+	pI915XvMC->yStride = STRIDE(context->width);
+	pI915XvMC->uvStride = STRIDE(context->width >> 1);
+
+	/* pre-init state buffers */
+	i915_mc_one_time_context_init(context);
+
+	return Success;
+
+free_one_time_buffers:
+	i915_xvmc_free_one_time_buffers(pI915XvMC);
+	free(pI915XvMC);
+	context->privData = NULL;
+	return BadAlloc;
+}
+
+static int i915_xvmc_mc_destroy_context(Display * display,
+					XvMCContext * context)
+{
+	i915XvMCContext *pI915XvMC;
+
+	if (!(pI915XvMC = context->privData))
+		return XvMCBadContext;
+
+	/* Pass Control to the X server to destroy the drm_context_t */
+	i915_release_resource(display, context);
+
+	return Success;
+}
+
+static int i915_xvmc_alloc_render_state_buffers(i915XvMCContext *pI915XvMC)
+{
+	pI915XvMC->sis_bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+					       "sis",
+					       GTT_PAGE_SIZE,
+					       GTT_PAGE_SIZE);
+	if (!pI915XvMC->sis_bo)
+		return 0;
+
+	pI915XvMC->msb_bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+					       "msb",
+					       GTT_PAGE_SIZE,
+					       GTT_PAGE_SIZE);
+	if (!pI915XvMC->msb_bo)
+		return 0;
+
+	pI915XvMC->corrdata_bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+					       "corrdata",
+					       CORRDATA_SIZE,
+					       GTT_PAGE_SIZE);
+	if (!pI915XvMC->corrdata_bo)
+		return 0;
+
+	return 1;
+}
+
+static void i915_xvmc_free_render_state_buffers(i915XvMCContext *pI915XvMC)
+{
+	drm_intel_bo_unreference(pI915XvMC->sis_bo);
+	drm_intel_bo_unreference(pI915XvMC->msb_bo);
+	drm_intel_bo_unreference(pI915XvMC->corrdata_bo);
+}
+
+static int i915_xvmc_mc_render_surface(Display * display, XvMCContext * context,
+				       unsigned int picture_structure,
+				       XvMCSurface * target_surface,
+				       XvMCSurface * past_surface,
+				       XvMCSurface * future_surface,
+				       unsigned int flags,
+				       unsigned int num_macroblocks,
+				       unsigned int first_macroblock,
+				       XvMCMacroBlockArray * macroblock_array,
+				       XvMCBlockArray * blocks)
+{
+	int i;
+	int picture_coding_type = MPEG_I_PICTURE;
+	/* correction data buffer */
+	char *corrdata_ptr;
+	int corrdata_size = 0;
+
+	/* Block Pointer */
+	short *block_ptr;
+	/* Current Macroblock Pointer */
+	XvMCMacroBlock *mb;
+
+	intel_xvmc_context_ptr intel_ctx;
+
+	struct intel_xvmc_surface *privTarget = NULL;
+	struct intel_xvmc_surface *privFuture = NULL;
+	struct intel_xvmc_surface *privPast = NULL;
+	i915XvMCContext *pI915XvMC = NULL;
+
+	/* Check Parameters for validity */
+	if (!display || !context || !target_surface) {
+		XVMC_ERR("Invalid Display, Context or Target!");
+		return BadValue;
+	}
+
+	if (!num_macroblocks)
+		return Success;
+
+	if (!macroblock_array || !blocks) {
+		XVMC_ERR("Invalid block data!");
+		return BadValue;
+	}
+
+	if (macroblock_array->num_blocks < (num_macroblocks + first_macroblock)) {
+		XVMC_ERR("Too many macroblocks requested for MB array size.");
+		return BadValue;
+	}
+
+	if (!(pI915XvMC = context->privData))
+		return XvMCBadContext;
+
+	if (!(privTarget = target_surface->privData))
+		return XvMCBadSurface;
+
+	if (!i915_xvmc_alloc_render_state_buffers(pI915XvMC))
+		return BadAlloc;
+
+	intel_ctx = context->privData;
+	if (!intel_ctx) {
+		XVMC_ERR("Can't find intel xvmc context\n");
+		return BadValue;
+	}
+
+	/* P Frame Test */
+	if (!past_surface) {
+		/* Just to avoid some ifs later. */
+		privPast = privTarget;
+	} else {
+		if (!(privPast = past_surface->privData)) {
+			return XvMCBadSurface;
+		}
+		picture_coding_type = MPEG_P_PICTURE;
+	}
+
+	/* B Frame Test */
+	if (!future_surface) {
+		privFuture = privPast;	// privTarget;
+	} else {
+		if (!past_surface) {
+			XVMC_ERR("No Past Surface!");
+			return BadValue;
+		}
+
+		if (!(privFuture = future_surface->privData)) {
+			XVMC_ERR("Invalid Future Surface!");
+			return XvMCBadSurface;
+		}
+
+		picture_coding_type = MPEG_B_PICTURE;
+	}
+
+	LOCK_HARDWARE(intel_ctx->hw_context);
+	drm_intel_gem_bo_map_gtt(pI915XvMC->corrdata_bo);
+	corrdata_ptr = pI915XvMC->corrdata_bo->virtual;
+	corrdata_size = 0;
+
+	for (i = first_macroblock; i < (num_macroblocks + first_macroblock);
+	     i++) {
+		int bspm = 0;
+		mb = &macroblock_array->macro_blocks[i];
+		block_ptr = &(blocks->blocks[mb->index << 6]);
+
+		/* Lockup can happen if the coordinates are too far out of range */
+		if (mb->x > (target_surface->width >> 4)) {
+			mb->x = 0;
+			XVMC_INFO("reset x");
+		}
+
+		if (mb->y > (target_surface->height >> 4)) {
+			mb->y = 0;
+			XVMC_INFO("reset y");
+		}
+
+		/* Catch no pattern case */
+		if (!(mb->macroblock_type & XVMC_MB_TYPE_PATTERN) &&
+		    !(mb->macroblock_type & XVMC_MB_TYPE_INTRA) &&
+		    mb->coded_block_pattern) {
+			mb->coded_block_pattern = 0;
+			XVMC_INFO("no coded blocks present!");
+		}
+
+		bspm = mb_bytes_420[mb->coded_block_pattern];
+
+		if (!bspm)
+			continue;
+
+		corrdata_size += bspm;
+
+		if (corrdata_size > CORRDATA_SIZE) {
+			XVMC_ERR("correction data buffer overflow.");
+			break;
+		}
+		memcpy(corrdata_ptr, block_ptr, bspm);
+		corrdata_ptr += bspm;
+	}
+
+	drm_intel_gem_bo_unmap_gtt(pI915XvMC->corrdata_bo);
+
+	// i915_mc_invalidate_subcontext_buffers(context, BLOCK_SIS | BLOCK_DIS | BLOCK_SSB
+	// | BLOCK_MSB | BLOCK_PSP | BLOCK_PSC);
+
+	i915_mc_one_time_state_emit(context);
+
+	i915_mc_static_indirect_state_set(context, target_surface,
+					  picture_structure, flags,
+					  picture_coding_type);
+	/* setup reference surfaces */
+	i915_mc_map_state_set(context, privPast, privFuture);
+
+	i915_mc_load_indirect_render_emit(context);
+
+	i915_mc_mpeg_set_origin(context,
+				&macroblock_array->macro_blocks
+				[first_macroblock]);
+
+	for (i = first_macroblock; i < (num_macroblocks + first_macroblock);
+	     i++) {
+		mb = &macroblock_array->macro_blocks[i];
+
+		/* Intra Blocks */
+		if (mb->macroblock_type & XVMC_MB_TYPE_INTRA) {
+			i915_mc_mpeg_macroblock_ipicture(context, mb);
+		} else if ((picture_structure & XVMC_FRAME_PICTURE) ==
+			   XVMC_FRAME_PICTURE) {
+			/* Frame Picture */
+			switch (mb->motion_type & 3) {
+			case XVMC_PREDICTION_FIELD:	/* Field Based */
+				i915_mc_mpeg_macroblock_2fbmv(context, mb,
+							      picture_structure);
+				break;
+
+			case XVMC_PREDICTION_FRAME:	/* Frame Based */
+				i915_mc_mpeg_macroblock_1fbmv(context, mb);
+				break;
+
+			case XVMC_PREDICTION_DUAL_PRIME:	/* Dual Prime */
+				i915_mc_mpeg_macroblock_2fbmv(context, mb,
+							      picture_structure);
+				break;
+
+			default:	/* No Motion Type */
+				XVMC_ERR
+				    ("Invalid Macroblock Parameters found.");
+				break;
+			}
+		} else {	/* Field Picture */
+			switch (mb->motion_type & 3) {
+			case XVMC_PREDICTION_FIELD:	/* Field Based */
+				i915_mc_mpeg_macroblock_1fbmv(context, mb);
+				break;
+
+			case XVMC_PREDICTION_16x8:	/* 16x8 MC */
+				i915_mc_mpeg_macroblock_2fbmv(context, mb,
+							      picture_structure);
+				break;
+
+			case XVMC_PREDICTION_DUAL_PRIME:	/* Dual Prime */
+				i915_mc_mpeg_macroblock_1fbmv(context, mb);
+				break;
+
+			default:	/* No Motion Type */
+				XVMC_ERR
+				    ("Invalid Macroblock Parameters found.");
+				break;
+			}
+		}
+	}
 
-    /* Pass Control to the X server to destroy the drm_context_t */
-    i915_release_resource(display,context);
+	intelFlushBatch(TRUE);
 
-    free(one_time_load_state_imm1);
-    free(one_time_load_indirect);
-    free(mc_render_load_indirect);
-    return Success;
-}
+	i915_xvmc_free_render_state_buffers(pI915XvMC);
 
-static Status i915_xvmc_mc_create_surface(Display *display,
-	XvMCContext *context, XvMCSurface *surface, int priv_count,
-	CARD32 *priv_data)
-{
-    i915XvMCContext *pI915XvMC;
-    i915XvMCSurface *pI915Surface;
-    I915XvMCCreateSurfaceRec *tmpComm = NULL;
-
-    if (!(pI915XvMC = context->privData))
-        return XvMCBadContext;
-
-    XVMC_DBG("%s\n", __FUNCTION__);
-
-    if (priv_count != (sizeof(I915XvMCCreateSurfaceRec) >> 2)) {
-        XVMC_ERR("_xvmc_create_surface() returned incorrect data size!");
-        XVMC_INFO("\tExpected %d, got %d",
-               (int)(sizeof(I915XvMCCreateSurfaceRec) >> 2), priv_count);
-        _xvmc_destroy_surface(display, surface);
-        XFree(priv_data);
-        return BadAlloc;
-    }
-
-    PPTHREAD_MUTEX_LOCK();
-    surface->privData = (i915XvMCSurface *)malloc(sizeof(i915XvMCSurface));
-
-    if (!(pI915Surface = surface->privData)) {
-        PPTHREAD_MUTEX_UNLOCK();
-        return BadAlloc;
-    }
-
-    /* Initialize private values */
-    pI915Surface->last_render = 0;
-    pI915Surface->last_flip = 0;
-    pI915Surface->yStride = pI915XvMC->yStride;
-    pI915Surface->uvStride = pI915XvMC->uvStride;
-    pI915Surface->width = context->width;
-    pI915Surface->height = context->height;
-    pI915Surface->privContext = pI915XvMC;
-    pI915Surface->privSubPic = NULL;
-    pI915Surface->srf.map = NULL;
-
-    tmpComm = (I915XvMCCreateSurfaceRec *)priv_data;
-
-    pI915Surface->srfNo = tmpComm->srfno;
-    pI915Surface->srf.handle = tmpComm->srf.handle;
-    pI915Surface->srf.offset = tmpComm->srf.offset;
-    pI915Surface->srf.size = tmpComm->srf.size;
-
-    XFree(priv_data);
-
-    if (drmMap(xvmc_driver->fd,
-               pI915Surface->srf.handle,
-               pI915Surface->srf.size,
-               (drmAddress *)&pI915Surface->srf.map) != 0) {
-	XVMC_ERR("mapping surface memory failed!\n");
-        _xvmc_destroy_surface(display, surface);
-        free(pI915Surface);
-        surface->privData = NULL;
-        PPTHREAD_MUTEX_UNLOCK();
-        return BadAlloc;
-    }
-
-    pI915XvMC->ref++;
-    PPTHREAD_MUTEX_UNLOCK();
-    return 0;
+	UNLOCK_HARDWARE(intel_ctx->hw_context);
+	return 0;
 }
 
-
-static int i915_xvmc_mc_destroy_surface(Display *display, XvMCSurface *surface)
-{
-    i915XvMCSurface *pI915Surface;
-    i915XvMCContext *pI915XvMC;
-
-    if (!display || !surface)
-        return BadValue;
-
-    if (!(pI915Surface = surface->privData))
-        return XvMCBadSurface;
-
-    if (!(pI915XvMC = pI915Surface->privContext))
-        return XvMCBadSurface;
-
-    if (pI915Surface->last_flip)
-        XvMCSyncSurface(display,surface);
-
-    if (pI915Surface->srf.map)
-        drmUnmap(pI915Surface->srf.map, pI915Surface->srf.size);
-
-    free(pI915Surface);
-    surface->privData = NULL;
-    pI915XvMC->ref--;
-
-    return Success;
-}
-
-
-static int i915_xvmc_mc_render_surface(Display *display, XvMCContext *context,
-                         unsigned int picture_structure,
-                         XvMCSurface *target_surface,
-                         XvMCSurface *past_surface,
-                         XvMCSurface *future_surface,
-                         unsigned int flags,
-                         unsigned int num_macroblocks,
-                         unsigned int first_macroblock,
-                         XvMCMacroBlockArray *macroblock_array,
-                         XvMCBlockArray *blocks)
-{
-    int i;
-    int picture_coding_type = MPEG_I_PICTURE;
-    /* correction data buffer */
-    char *corrdata_ptr;
-    int corrdata_size = 0;
-
-    /* Block Pointer */
-    short *block_ptr;
-    /* Current Macroblock Pointer */
-    XvMCMacroBlock *mb;
-
-    intel_xvmc_context_ptr intel_ctx;
-
-    i915XvMCSurface *privTarget = NULL;
-    i915XvMCSurface *privFuture = NULL;
-    i915XvMCSurface *privPast = NULL;
-    i915XvMCContext *pI915XvMC = NULL;
-
-    XVMC_DBG("%s\n", __FUNCTION__);
-
-    /* Check Parameters for validity */
-    if (!display || !context || !target_surface) {
-        XVMC_ERR("Invalid Display, Context or Target!");
-        return BadValue;
-    }
-
-    if (!num_macroblocks)
-        return Success;
-
-    if (!macroblock_array || !blocks) {
-        XVMC_ERR("Invalid block data!");
-        return BadValue;
-    }
-
-    if (macroblock_array->num_blocks < (num_macroblocks + first_macroblock)) {
-        XVMC_ERR("Too many macroblocks requested for MB array size.");
-        return BadValue;
-    }
-
-    if (!(pI915XvMC = context->privData))
-        return XvMCBadContext;
-
-    if (!(privTarget = target_surface->privData))
-        return XvMCBadSurface;
-
-    if (context->surface_type_id >= SURFACE_TYPE_MAX) {
-        XVMC_ERR("Unsupprted surface_type_id %d.", context->surface_type_id);
-        return BadValue;
-    }
-
-    intel_ctx = intel_xvmc_find_context(context->context_id);
-    if (!intel_ctx) {
-	XVMC_ERR("Can't find intel xvmc context\n");
-	return BadValue;
-    }
-
-    /* P Frame Test */
-    if (!past_surface) {
-        /* Just to avoid some ifs later. */
-        privPast = privTarget;
-    } else {
-        if (!(privPast = past_surface->privData)) {
-            XVMC_ERR("Invalid Past Surface!");
-            return XvMCBadSurface;
-        }
-        picture_coding_type = MPEG_P_PICTURE;
-    }
-
-    /* B Frame Test */
-    if (!future_surface) {
-        privFuture = privPast; // privTarget;
-    } else {
-        if (!past_surface) {
-            XVMC_ERR("No Past Surface!");
-            return BadValue;
-        }
-
-        if (!(privFuture = future_surface->privData)) {
-            XVMC_ERR("Invalid Future Surface!");
-            return XvMCBadSurface;
-        }
-
-        picture_coding_type = MPEG_B_PICTURE;
-    }
-
-    LOCK_HARDWARE(intel_ctx->hw_context);
-    corrdata_ptr = pI915XvMC->corrdata.map;
-    corrdata_size = 0;
-
-    for (i = first_macroblock; i < (num_macroblocks + first_macroblock); i++) {
-        int bspm = 0;
-        mb = &macroblock_array->macro_blocks[i];
-        block_ptr = &(blocks->blocks[mb->index << 6]);
-
-        /* Lockup can happen if the coordinates are too far out of range */
-        if (mb->x > (target_surface->width >> 4)) {
-            mb->x = 0;
-            XVMC_INFO("reset x");
-        }
-
-        if (mb->y > (target_surface->height >> 4)) {
-            mb->y = 0;
-            XVMC_INFO("reset y");
-        }
-
-        /* Catch no pattern case */
-        if (!(mb->macroblock_type & XVMC_MB_TYPE_PATTERN) &&
-            !(mb->macroblock_type & XVMC_MB_TYPE_INTRA) &&
-            mb->coded_block_pattern) {
-            mb->coded_block_pattern = 0;
-            XVMC_INFO("no coded blocks present!");
-        }
-
-        bspm = mb_bytes_420[mb->coded_block_pattern];
-
-        if (!bspm)
-            continue;
-
-        corrdata_size += bspm;
-
-        if (corrdata_size > pI915XvMC->corrdata.size) {
-            XVMC_ERR("correction data buffer overflow.");
-            break;
-        }
-        memcpy(corrdata_ptr, block_ptr, bspm);
-        corrdata_ptr += bspm;
-    }
-
-    i915_flush(1, 0);
-    // i915_mc_invalidate_subcontext_buffers(context, BLOCK_SIS | BLOCK_DIS | BLOCK_SSB
-    // | BLOCK_MSB | BLOCK_PSP | BLOCK_PSC);
-
-    i915_mc_one_time_state_emit();
-
-    i915_mc_static_indirect_state_set(context, target_surface, picture_structure,
-	    flags, picture_coding_type);
-    /* setup reference surfaces */
-    i915_mc_map_state_set(context, privPast, privFuture);
-
-    i915_mc_load_indirect_render_emit();
-
-    i915_mc_mpeg_set_origin(context, &macroblock_array->macro_blocks[first_macroblock]);
-
-    for (i = first_macroblock; i < (num_macroblocks + first_macroblock); i++) {
-        mb = &macroblock_array->macro_blocks[i];
-
-        /* Intra Blocks */
-        if (mb->macroblock_type & XVMC_MB_TYPE_INTRA) {
-            i915_mc_mpeg_macroblock_ipicture(context, mb);
-        } else if ((picture_structure & XVMC_FRAME_PICTURE) == XVMC_FRAME_PICTURE) {
-	    /* Frame Picture */
-            switch (mb->motion_type & 3) {
-            case XVMC_PREDICTION_FIELD: /* Field Based */
-                i915_mc_mpeg_macroblock_2fbmv(context, mb, picture_structure);
-                break;
-
-            case XVMC_PREDICTION_FRAME: /* Frame Based */
-                i915_mc_mpeg_macroblock_1fbmv(context, mb);
-                break;
-
-            case XVMC_PREDICTION_DUAL_PRIME:    /* Dual Prime */
-                i915_mc_mpeg_macroblock_2fbmv(context, mb, picture_structure);
-                break;
-
-            default:    /* No Motion Type */
-		XVMC_ERR("Invalid Macroblock Parameters found.");
-                break;
-            }
-        } else {        /* Field Picture */
-            switch (mb->motion_type & 3) {
-            case XVMC_PREDICTION_FIELD: /* Field Based */
-                i915_mc_mpeg_macroblock_1fbmv(context, mb);
-                break;
-
-            case XVMC_PREDICTION_16x8:  /* 16x8 MC */
-                i915_mc_mpeg_macroblock_2fbmv(context, mb, picture_structure);
-                break;
-
-            case XVMC_PREDICTION_DUAL_PRIME:    /* Dual Prime */
-                i915_mc_mpeg_macroblock_1fbmv(context, mb);
-                break;
-
-            default:    /* No Motion Type */
-		XVMC_ERR("Invalid Macroblock Parameters found.");
-                break;
-            }
-        }
-    }
-
-    intelFlushBatch(TRUE);
-    xvmc_driver->last_render = xvmc_driver->alloc.irq_emitted;
-    privTarget->last_render = xvmc_driver->last_render;
-
-    UNLOCK_HARDWARE(intel_ctx->hw_context);
-    return 0;
-}
-
-static int i915_xvmc_mc_put_surface(Display *display,XvMCSurface *surface,
-                      Drawable draw, short srcx, short srcy,
-                      unsigned short srcw, unsigned short srch,
-                      short destx, short desty,
-                      unsigned short destw, unsigned short desth,
-                      int flags, struct intel_xvmc_command *data)
-{
-    i915XvMCContext *pI915XvMC;
-    i915XvMCSurface *pI915Surface;
-    i915XvMCSubpicture *pI915SubPic;
-
-    if (!(pI915Surface = surface->privData))
-        return XvMCBadSurface;
-
-    if (!(pI915XvMC = pI915Surface->privContext))
-        return XvMCBadSurface;
-
-    PPTHREAD_MUTEX_LOCK();
-
-    data->command = INTEL_XVMC_COMMAND_DISPLAY;
-    data->ctxNo = pI915XvMC->ctxno;
-    data->srfNo = pI915Surface->srfNo;
-    pI915SubPic = pI915Surface->privSubPic;
-    data->subPicNo = (!pI915SubPic ? 0 : pI915SubPic->srfNo);
-    data->real_id = FOURCC_YV12;
-    data->flags = flags;
-
-    PPTHREAD_MUTEX_UNLOCK();
-
-    return 0;
-}
-
-static int i915_xvmc_mc_get_surface_status(Display *display,
-	XvMCSurface *surface, int *stat)
-{
-    i915XvMCSurface *pI915Surface;
-    i915XvMCContext *pI915XvMC;
-
-    if (!display || !surface || !stat)
-        return BadValue;
-
-    *stat = 0;
-
-    if (!(pI915Surface = surface->privData))
-        return XvMCBadSurface;
-
-    if (!(pI915XvMC = pI915Surface->privContext))
-        return XvMCBadSurface;
-
-    PPTHREAD_MUTEX_LOCK();
-    if (pI915Surface->last_flip) {
-        /* This can not happen */
-        if (pI915XvMC->last_flip < pI915Surface->last_flip) {
-            XVMC_ERR("Context last flip is less than surface last flip.");
-            PPTHREAD_MUTEX_UNLOCK();
-            return BadValue;
-        }
-
-        /*
-          If the context has 2 or more flips after this surface it
-          cannot be displaying. Don't bother to check.
-        */
-        if (!(pI915XvMC->last_flip > (pI915Surface->last_flip + 1))) {
-            /*
-              If this surface was the last flipped it is either displaying
-              or about to be so don't bother checking.
-            */
-            if (pI915XvMC->last_flip == pI915Surface->last_flip) {
-                *stat |= XVMC_DISPLAYING;
-            }
-        }
-    }
-
-    if (pI915Surface->last_render &&
-        (pI915Surface->last_render > pI915XvMC->sarea->last_dispatch)) {
-        *stat |= XVMC_RENDERING;
-    }
-
-    PPTHREAD_MUTEX_UNLOCK();
-    return 0;
-}
-
-/* XXX WIP code */
-#if 0
-Status XvMCHideSurface(Display *display, XvMCSurface *surface)
-{
-    i915XvMCSurface *pI915Surface;
-    i915XvMCContext *pI915XvMC;
-    int stat = 0, ret;
-
-    if (!display || !surface)
-        return BadValue;
-
-    if (!(pI915Surface = surface->privData))
-        return XvMCBadSurface;
-
-    /* Get the associated context pointer */
-    if (!(pI915XvMC = pI915Surface->privContext))
-        return XvMCBadSurface;
-
-    XvMCSyncSurface(display, surface);
-
-    /*
-      Get the status of the surface, if it is not currently displayed
-      we don't need to worry about it.
-    */
-    if ((ret = XvMCGetSurfaceStatus(display, surface, &stat)) != Success)
-        return ret;
-
-    if (!(stat & XVMC_DISPLAYING))
-        return Success;
-
-    /* FIXME: */
-    return Success;
-}
-
-Status i915_xvmc_create_subpict(Display *display, XvMCContext *context,
-                            XvMCSubpicture *subpicture,
-                            unsigned short width, unsigned short height,
-                            int xvimage_id)
-{
-    Status ret;
-    i915XvMCContext *pI915XvMC;
-    i915XvMCSubpicture *pI915Subpicture;
-    I915XvMCCreateSurfaceRec *tmpComm = NULL;
-    int priv_count;
-    uint *priv_data;
-
-    if (!subpicture || !context || !display)
-        return BadValue;
-
-    pI915XvMC = (i915XvMCContext *)context->privData;
-
-    if (!pI915XvMC)
-        return XvMCBadContext;
-
-    subpicture->privData =
-        (i915XvMCSubpicture *)malloc(sizeof(i915XvMCSubpicture));
-
-    if (!subpicture->privData)
-        return BadAlloc;
-
-    PPTHREAD_MUTEX_LOCK();
-    subpicture->context_id = context->context_id;
-    subpicture->xvimage_id = xvimage_id;
-    subpicture->width = width;
-    subpicture->height = height;
-    pI915Subpicture = (i915XvMCSubpicture *)subpicture->privData;
-
-    XLockDisplay(display);
-    if ((ret = _xvmc_create_subpicture(display, context, subpicture,
-                                       &priv_count, &priv_data))) {
-        XUnlockDisplay(display);
-        XVMC_ERR("Unable to create XvMCSubpicture.");
-        free(pI915Subpicture);
-        subpicture->privData = NULL;
-        PPTHREAD_MUTEX_UNLOCK();
-        return ret;
-    }
-    XUnlockDisplay(display);
-
-    if (priv_count != (sizeof(I915XvMCCreateSurfaceRec) >> 2)) {
-        XVMC_ERR("_xvmc_create_subpicture() returned incorrect data size!");
-        XVMC_INFO("\tExpected %d, got %d",
-               (int)(sizeof(I915XvMCCreateSurfaceRec) >> 2), priv_count);
-        XLockDisplay(display);
-        _xvmc_destroy_subpicture(display, subpicture);
-        XUnlockDisplay(display);
-        XFree(priv_data);
-        free(pI915Subpicture);
-        subpicture->privData = NULL;
-        PPTHREAD_MUTEX_UNLOCK();
-        return BadAlloc;
-    }
-
-    tmpComm = (I915XvMCCreateSurfaceRec *)priv_data;
-    pI915Subpicture->srfNo = tmpComm->srfno;
-    pI915Subpicture->srf.handle = tmpComm->srf.handle;
-    pI915Subpicture->srf.offset = tmpComm->srf.offset;
-    pI915Subpicture->srf.size = tmpComm->srf.size;
-    XFree(priv_data);
-
-    if (drmMap(pI915XvMC->fd,
-               pI915Subpicture->srf.handle,
-               pI915Subpicture->srf.size,
-               (drmAddress *)&pI915Subpicture->srf.map) != 0) {
-        XLockDisplay(display);
-        _xvmc_destroy_subpicture(display, subpicture);
-        XUnlockDisplay(display);
-        free(pI915Subpicture);
-        subpicture->privData = NULL;
-        PPTHREAD_MUTEX_UNLOCK();
-        return BadAlloc;
-    }
-
-    /* subpicture */
-    subpicture->num_palette_entries = I915_SUBPIC_PALETTE_SIZE;
-    subpicture->entry_bytes = 3;
-    strncpy(subpicture->component_order, "YUV", 4);
-
-    /* Initialize private values */
-    pI915Subpicture->privContext = pI915XvMC;
-    pI915Subpicture->last_render= 0;
-    pI915Subpicture->last_flip = 0;
-    pI915Subpicture->pitch = ((subpicture->width + 3) & ~3);
-
-    switch(subpicture->xvimage_id) {
-    case FOURCC_IA44:
-    case FOURCC_AI44:
-        break;
-
-    default:
-        drmUnmap(pI915Subpicture->srf.map, pI915Subpicture->srf.size);
-        XLockDisplay(display);
-        _xvmc_destroy_subpicture(display, subpicture);
-        XUnlockDisplay(display);
-        free(pI915Subpicture);
-        subpicture->privData = NULL;
-        PPTHREAD_MUTEX_UNLOCK();
-        return BadMatch;
-    }
-
-    pI915XvMC->ref++;
-    PPTHREAD_MUTEX_UNLOCK();
-    return Success;
-}
-
-Status i915_xvmc_clear_subpict(Display *display, XvMCSubpicture *subpicture,
-                           short x, short y,
-                           unsigned short width, unsigned short height,
-                           unsigned int color)
-{
-    i915XvMCContext *pI915XvMC;
-    i915XvMCSubpicture *pI915Subpicture;
-
-    if (!display || !subpicture)
-        return BadValue;
-
-    if (!(pI915Subpicture = subpicture->privData))
-        return XvMCBadSubpicture;
-
-    if (!(pI915XvMC = pI915Subpicture->privContext))
-        return XvMCBadSubpicture;
-
-    if ((x < 0) || (x + width) > subpicture->width)
-        return BadValue;
-
-    if ((y < 0) || (y + height) > subpicture->height)
-        return BadValue;
-
-    /* FIXME: clear the area */
-
-    return Success;
-}
-
-Status i915_xvmc_composite_subpict(Display *display, XvMCSubpicture *subpicture,
-                               XvImage *image,
-                               short srcx, short srcy,
-                               unsigned short width, unsigned short height,
-                               short dstx, short dsty)
-{
-    i915XvMCContext *pI915XvMC;
-    i915XvMCSubpicture *pI915Subpicture;
-
-    if (!display || !subpicture)
-        return BadValue;
-
-    if (!(pI915Subpicture = subpicture->privData))
-        return XvMCBadSubpicture;
-
-    if (!(pI915XvMC = pI915Subpicture->privContext))
-        return XvMCBadSubpicture;
-
-    if ((srcx < 0) || (srcx + width) > subpicture->width)
-        return BadValue;
-
-    if ((srcy < 0) || (srcy + height) > subpicture->height)
-        return BadValue;
-
-    if ((dstx < 0) || (dstx + width) > subpicture->width)
-        return BadValue;
-
-    if ((dsty < 0) || (dsty + width) > subpicture->height)
-        return BadValue;
-
-    if (image->id != subpicture->xvimage_id)
-        return BadMatch;
-
-    /* FIXME */
-    return Success;
-}
-
-
-Status i915_xvmc_destroy_subpict(Display *display, XvMCSubpicture *subpicture)
-{
-    i915XvMCSubpicture *pI915Subpicture;
-    i915XvMCContext *pI915XvMC;
-
-    if (!display || !subpicture)
-        return BadValue;
-
-    if (!(pI915Subpicture = subpicture->privData))
-        return XvMCBadSubpicture;
-
-    if (!(pI915XvMC = pI915Subpicture->privContext))
-        return XvMCBadSubpicture;
-
-    if (pI915Subpicture->last_render)
-        XvMCSyncSubpicture(display, subpicture);
-
-    if (pI915Subpicture->srf.map)
-        drmUnmap(pI915Subpicture->srf.map, pI915Subpicture->srf.size);
-
-    PPTHREAD_MUTEX_LOCK();
-    XLockDisplay(display);
-    _xvmc_destroy_subpicture(display,subpicture);
-    XUnlockDisplay(display);
-
-    free(pI915Subpicture);
-    subpicture->privData = NULL;
-    pI915XvMC->ref--;
-    PPTHREAD_MUTEX_UNLOCK();
-
-    return Success;
-}
-
-
-Status i915_xvmc_set_subpict_palette(Display *display,
-	XvMCSubpicture *subpicture,
-	unsigned char *palette)
-{
-    i915XvMCSubpicture *pI915Subpicture;
-    int i, j;
-
-    if (!display || !subpicture)
-        return BadValue;
-
-    if (!(pI915Subpicture = subpicture->privData))
-        return XvMCBadSubpicture;
-
-    j = 0;
-    for (i = 0; i < 16; i++) {
-        pI915Subpicture->palette[0][i] = palette[j++];
-        pI915Subpicture->palette[1][i] = palette[j++];
-        pI915Subpicture->palette[2][i] = palette[j++];
-    }
-
-    /* FIXME: Update the subpicture with the new palette */
-    return Success;
-}
-
-Status i915_xvmc_blend_subpict(Display *display, XvMCSurface *target_surface,
-                           XvMCSubpicture *subpicture,
-                           short subx, short suby,
-                           unsigned short subw, unsigned short subh,
-                           short surfx, short surfy,
-                           unsigned short surfw, unsigned short surfh)
-{
-    i915XvMCSubpicture *pI915Subpicture;
-    i915XvMCSurface *privTargetSurface;
-
-    if (!display || !target_surface)
-        return BadValue;
-
-    if (!(privTargetSurface = target_surface->privData))
-        return XvMCBadSurface;
-
-    if (subpicture) {
-        if (!(pI915Subpicture = subpicture->privData))
-            return XvMCBadSubpicture;
-
-        if ((FOURCC_AI44 != subpicture->xvimage_id) &&
-            (FOURCC_IA44 != subpicture->xvimage_id))
-            return XvMCBadSubpicture;
-
-        privTargetSurface->privSubPic = pI915Subpicture;
-    } else {
-        privTargetSurface->privSubPic = NULL;
-    }
-
-    return Success;
-}
-
-Status i915_xvmc_blend_subpict2(Display *display,
-                            XvMCSurface *source_surface,
-                            XvMCSurface *target_surface,
-                            XvMCSubpicture *subpicture,
-                            short subx, short suby,
-                            unsigned short subw, unsigned short subh,
-                            short surfx, short surfy,
-                            unsigned short surfw, unsigned short surfh)
-{
-    i915XvMCContext *pI915XvMC;
-    i915XvMCSubpicture *pI915Subpicture;
-    i915XvMCSurface *privSourceSurface;
-    i915XvMCSurface *privTargetSurface;
-
-    if (!display || !source_surface || !target_surface)
-        return BadValue;
-
-    if (!(privSourceSurface = source_surface->privData))
-        return XvMCBadSurface;
-
-    if (!(privTargetSurface = target_surface->privData))
-        return XvMCBadSurface;
-
-    if (!(pI915XvMC = privTargetSurface->privContext))
-        return XvMCBadSurface;
-
-    if (((surfx + surfw) > privTargetSurface->width) ||
-        ((surfy + surfh) > privTargetSurface->height))
-        return BadValue;
-
-    if ((privSourceSurface->width != privTargetSurface->width) ||
-        (privTargetSurface->height != privTargetSurface->height))
-        return BadValue;
-
-    if (XvMCSyncSurface(display, source_surface))
-        return BadValue;
-
-    /* FIXME: update Target Surface */
-
-    if (subpicture) {
-        if (((subx + subw) > subpicture->width) ||
-            ((suby + subh) > subpicture->height))
-            return BadValue;
-
-        if (!(pI915Subpicture = subpicture->privData))
-            return XvMCBadSubpicture;
-
-        if ((FOURCC_AI44 != subpicture->xvimage_id) &&
-            (FOURCC_IA44 != subpicture->xvimage_id))
-            return XvMCBadSubpicture;
-
-        privTargetSurface->privSubPic = pI915Subpicture;
-    } else {
-        privTargetSurface->privSubPic = NULL;
-    }
-
-    return Success;
-}
-
-Status i915_xvmc_sync_subpict(Display *display, XvMCSubpicture *subpicture)
-{
-    Status ret;
-    int stat = 0;
-
-    if (!display || !subpicture)
-        return BadValue;
-
-    do {
-        ret = XvMCGetSubpictureStatus(display, subpicture, &stat);
-    } while(!ret && (stat & XVMC_RENDERING));
-
-    return ret;
-}
-
-Status i915_xvmc_flush_subpict(Display *display, XvMCSubpicture *subpicture)
-{
-    i915XvMCSubpicture *pI915Subpicture;
-
-    if (!display || !subpicture)
-        return BadValue;
-
-    if (!(pI915Subpicture = subpicture->privData))
-        return XvMCBadSubpicture;
-
-    return Success;
-}
-
-Status i915_xvmc_get_subpict_status(Display *display, XvMCSubpicture *subpicture,
-                               int *stat)
-{
-    i915XvMCSubpicture *pI915Subpicture;
-    i915XvMCContext *pI915XvMC;
-
-    if (!display || !subpicture || stat)
-        return BadValue;
-
-    *stat = 0;
-
-    if (!(pI915Subpicture = subpicture->privData))
-        return XvMCBadSubpicture;
-
-    if (!(pI915XvMC = pI915Subpicture->privContext))
-        return XvMCBadSubpicture;
-
-    PPTHREAD_MUTEX_LOCK();
-    /* FIXME: */
-    if (pI915Subpicture->last_render &&
-        (pI915Subpicture->last_render > pI915XvMC->sarea->last_dispatch)) {
-        *stat |= XVMC_RENDERING;
-    }
-
-    PPTHREAD_MUTEX_UNLOCK();
-    return Success;
-}
-
-#endif
-
 struct _intel_xvmc_driver i915_xvmc_mc_driver = {
-    .type		= XVMC_I915_MPEG2_MC,
-    .num_ctx		= 0,
-    .ctx_list		= NULL,
-    .create_context	= i915_xvmc_mc_create_context,
-    .destroy_context	= i915_xvmc_mc_destroy_context,
-    .create_surface	= i915_xvmc_mc_create_surface,
-    .destroy_surface	= i915_xvmc_mc_destroy_surface,
-    .render_surface	= i915_xvmc_mc_render_surface,
-    .put_surface	= i915_xvmc_mc_put_surface,
-    .get_surface_status	= i915_xvmc_mc_get_surface_status,
+	.type = XVMC_I915_MPEG2_MC,
+	.num_ctx = 0,
+	.ctx_list = NULL,
+	.create_context = i915_xvmc_mc_create_context,
+	.destroy_context = i915_xvmc_mc_destroy_context,
+	.render_surface = i915_xvmc_mc_render_surface,
 };
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.h new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.h	2008-08-02 07:12:46.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i915_xvmc.h	2011-02-08 11:14:00.000000000 +0100
@@ -29,7 +29,7 @@
 #define _I915XVMC_H
 
 #include "intel_xvmc.h"
-#include "i915_hwmc.h"
+#include "i830_hwmc.h"
 
 #define I915_SUBPIC_PALETTE_SIZE        16
 #define MAX_SUBCONTEXT_LEN              1024
@@ -43,37 +43,24 @@
 #define PCI_CHIP_Q35_G                  0x29B2
 #define PCI_CHIP_Q33_G                  0x29D2
 
+#define CORRDATA_SIZE			128*GTT_PAGE_SIZE
 /*
  * i915XvMCContext:
  *	Private Context data referenced via the privData
  *      pointer in the XvMCContext structure.
  */
 typedef struct _i915XvMCContext {
-    unsigned int ctxno;
-    unsigned int last_flip;
-    unsigned int dual_prime; /* Flag to identify when dual prime is in use. */
-    unsigned int yStride;
-    unsigned int uvStride;
-    unsigned short ref;
-    volatile drmI830Sarea *sarea;
-    unsigned int sarea_priv_offset;	        /* Offset in sarea to private part */
-    unsigned int depth;
-    XvPortID port;		       /* Xv Port ID when displaying */
-    int haveXv;                        /* Have I initialized the Xv
-                                        * connection for this surface? */
-    XvImage *xvImage;                  /* Fake Xv Image used for command
-                                        * buffer transport to the X server */
-    GC  gc;                            /* X GC needed for displaying */
-    Drawable draw;                     /* Drawable to undisplay from */
-    void *drawHash;
-    int deviceID;
-
-    intel_xvmc_drm_map_t sis;
-    intel_xvmc_drm_map_t msb;
-    intel_xvmc_drm_map_t ssb;
-    intel_xvmc_drm_map_t psp;
-    intel_xvmc_drm_map_t psc;
-    intel_xvmc_drm_map_t corrdata;
+	struct intel_xvmc_context comm;
+	unsigned int yStride;
+	unsigned int uvStride;
+	unsigned int use_phys_addr;
+
+	drm_intel_bo *sis_bo;
+	drm_intel_bo *msb_bo;
+	drm_intel_bo *ssb_bo;
+	drm_intel_bo *psp_bo;
+	drm_intel_bo *psc_bo;
+	drm_intel_bo *corrdata_bo;
 } i915XvMCContext;
 
 /*
@@ -83,35 +70,14 @@ typedef struct _i915XvMCContext {
  *  structure.
  */
 typedef struct _i915XvMCSubpicture {
-    unsigned int srfNo;
-    unsigned int last_render;
-    unsigned int last_flip;
-    unsigned int pitch;
-    unsigned char palette[3][16];
-    intel_xvmc_drm_map_t srf;
-    i915XvMCContext *privContext;
+	unsigned int srfNo;
+	unsigned int pitch;
+	unsigned char palette[3][16];
+	intel_xvmc_drm_map_t srf;
+	i915XvMCContext *privContext;
 } i915XvMCSubpicture;
 
 /* Number of YUV buffers per surface */
 #define I830_MAX_BUFS 2
 
-/*
- * i915XvMCSurface: Private data structure for each XvMCSurface. This
- *  structure is referenced by the privData pointer in the XvMCSurface
- *  structure.
- */
-typedef struct _i915XvMCSurface {
-    unsigned int srfNo;                    /* XvMC private surface numbers */
-    unsigned int last_render;
-    unsigned int last_flip;
-    unsigned int yStride;                  /* Stride of YUV420 Y component. */
-    unsigned int uvStride;
-    unsigned int width;                    /* Dimensions */
-    unsigned int height;
-    intel_xvmc_drm_map_t srf;
-    i915XvMCContext *privContext;
-    i915XvMCSubpicture *privSubPic;     /* Subpicture to be blended when
-                                         * displaying. NULL if none. */
-} i915XvMCSurface;
-
 #endif /* _I915XVMC_H */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c	2011-01-19 00:31:47.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c	2011-02-08 11:14:00.000000000 +0100
@@ -24,737 +24,858 @@
  *    Zou Nan hai <nanhai.zou@intel.com>
  *
  */
-#include "i965_xvmc.h"
+#include "intel_xvmc.h"
 #include "i810_reg.h"
 #include "brw_defines.h"
 #include "brw_structs.h"
 #include "intel_batchbuffer.h"
-#include "i965_hwmc.h"
+#include "i830_hwmc.h"
 #define BATCH_STRUCT(x) intelBatchbufferData(&x, sizeof(x), 0)
-#define URB_SIZE     256        /* XXX */
+#define URB_SIZE     256	/* XXX */
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+
 enum interface {
-    INTRA_INTERFACE,            /* non field intra */
-    NULL_INTERFACE,             /* fill with white, do nothing, for debug */
-    FORWARD_INTERFACE,          /* non field forward predict */
-    BACKWARD_INTERFACE,         /* non field backward predict */
-    F_B_INTERFACE,              /* non field forward and backward predict */
-    FIELD_INTRA_INTERFACE,      /* field intra */
-    FIELD_FORWARD_INTERFACE,    /* field forward predict */
-    FIELD_BACKWARD_INTERFACE,   /* field backward predict */
-    FIELD_F_B_INTERFACE,        /* field forward and backward predict */
-    DUAL_PRIME_INTERFACE
+	INTRA_INTERFACE = 0,	/* non field intra */
+	NULL_INTERFACE,		/* fill with white, do nothing, for debug */
+	FORWARD_INTERFACE,	/* non field forward predict */
+	BACKWARD_INTERFACE,	/* non field backward predict */
+	F_B_INTERFACE,		/* non field forward and backward predict */
+	FIELD_FORWARD_INTERFACE,	/* field forward predict */
+	FIELD_BACKWARD_INTERFACE,	/* field backward predict */
+	FIELD_F_B_INTERFACE,	/* field forward and backward predict */
+	DUAL_PRIME_INTERFACE
 };
 
 static const uint32_t ipicture_kernel_static[][4] = {
-	#include "ipicture.g4b"
+#include "shader/mc/ipicture.g4b"
 };
+
 static const uint32_t null_kernel_static[][4] = {
-	#include "null.g4b"
+#include "shader/mc/null.g4b"
 };
+
 static const uint32_t frame_forward_kernel_static[][4] = {
-	#include "frame_forward.g4b"
+#include "shader/mc/frame_forward.g4b"
 };
+
 static const uint32_t frame_backward_kernel_static[][4] = {
-	#include "frame_backward.g4b"
+#include "shader/mc/frame_backward.g4b"
 };
+
 static const uint32_t frame_f_b_kernel_static[][4] = {
-	#include "frame_f_b.g4b"
-}; 
+#include "shader/mc/frame_f_b.g4b"
+};
+
 static const uint32_t field_forward_kernel_static[][4] = {
-	#include "field_forward.g4b"
+#include "shader/mc/field_forward.g4b"
 };
+
 static const uint32_t field_backward_kernel_static[][4] = {
-	#include "field_backward.g4b"
+#include "shader/mc/field_backward.g4b"
 };
+
 static const uint32_t field_f_b_kernel_static[][4] = {
-	#include "field_f_b.g4b"
-}; 
-static const uint32_t dual_prime_kernel_static[][4]= {
-	#include "dual_prime.g4b"
-}; 
+#include "shader/mc/field_f_b.g4b"
+};
+
+static const uint32_t dual_prime_kernel_static[][4] = {
+#include "shader/mc/dual_prime.g4b"
+};
+
 static const uint32_t frame_forward_igd_kernel_static[][4] = {
-	#include "frame_forward_igd.g4b"
+#include "shader/mc/frame_forward_igd.g4b"
 };
+
 static const uint32_t frame_backward_igd_kernel_static[][4] = {
-	#include "frame_backward_igd.g4b"
+#include "shader/mc/frame_backward_igd.g4b"
 };
+
 static const uint32_t frame_f_b_igd_kernel_static[][4] = {
-	#include "frame_f_b_igd.g4b"
-}; 
+#include "shader/mc/frame_f_b_igd.g4b"
+};
+
 static const uint32_t field_forward_igd_kernel_static[][4] = {
-	#include "field_forward_igd.g4b"
+#include "shader/mc/field_forward_igd.g4b"
 };
+
 static const uint32_t field_backward_igd_kernel_static[][4] = {
-	#include "field_backward_igd.g4b"
+#include "shader/mc/field_backward_igd.g4b"
 };
+
 static const uint32_t field_f_b_igd_kernel_static[][4] = {
-	#include "field_f_b_igd.g4b"
-}; 
-static const uint32_t dual_prime_igd_kernel_static[][4]= {
-	#include "dual_prime_igd.g4b"
-}; 
+#include "shader/mc/field_f_b_igd.g4b"
+};
 
-#define ALIGN(i,m)    (((i) + (m) - 1) & ~((m) - 1))
+static const uint32_t dual_prime_igd_kernel_static[][4] = {
+#include "shader/mc/dual_prime_igd.g4b"
+};
+
+struct kernel_struct {
+	const uint32_t(*bin)[4];
+	uint32_t size;
+};
+
+struct kernel_struct kernels_igd[] = {
+	{ipicture_kernel_static, sizeof(ipicture_kernel_static)}
+	,
+	{null_kernel_static, sizeof(null_kernel_static)}
+	,
+	{frame_forward_igd_kernel_static,
+	 sizeof(frame_forward_igd_kernel_static)}
+	,
+	{frame_backward_igd_kernel_static,
+	 sizeof(frame_backward_igd_kernel_static)}
+	,
+	{frame_f_b_igd_kernel_static, sizeof(frame_f_b_igd_kernel_static)}
+	,
+	{field_forward_igd_kernel_static,
+	 sizeof(field_forward_igd_kernel_static)}
+	,
+	{field_backward_igd_kernel_static,
+	 sizeof(field_backward_igd_kernel_static)}
+	,
+	{field_f_b_igd_kernel_static, sizeof(field_f_b_igd_kernel_static)}
+	,
+	{dual_prime_igd_kernel_static, sizeof(dual_prime_igd_kernel_static)}
+};
+
+struct kernel_struct kernels_965[] = {
+	{ipicture_kernel_static, sizeof(ipicture_kernel_static)}
+	,
+	{null_kernel_static, sizeof(null_kernel_static)}
+	,
+	{frame_forward_kernel_static, sizeof(frame_forward_kernel_static)}
+	,
+	{frame_backward_kernel_static, sizeof(frame_backward_kernel_static)}
+	,
+	{frame_f_b_kernel_static, sizeof(frame_f_b_kernel_static)}
+	,
+	{field_forward_kernel_static, sizeof(field_forward_kernel_static)}
+	,
+	{field_backward_kernel_static, sizeof(field_backward_kernel_static)}
+	,
+	{field_f_b_kernel_static, sizeof(field_f_b_kernel_static)}
+	,
+	{dual_prime_kernel_static, sizeof(dual_prime_kernel_static)}
+};
 
-#define	VFE_GENERIC_MODE	0x0
-#define	VFE_VLD_MODE		0x1
-#define VFE_IS_MODE		0x2
-#define VFE_AVC_MC_MODE		0x4
-#define VFE_AVC_IT_MODE		0x7
-#define VFE_VC1_IT_MODE		0x7
+#define ALIGN(i,m)    (((i) + (m) - 1) & ~((m) - 1))
 
 #define MAX_SURFACE_NUM	10
 #define DESCRIPTOR_NUM 12
 
-struct media_state {
-    unsigned long state_base;
-    void 	      *state_ptr;
-    unsigned int  binding_table_entry_count;
-    unsigned long vfe_state_offset;
-    unsigned long interface_descriptor_offset[DESCRIPTOR_NUM];
-    unsigned long ipicture_kernel_offset;
-    unsigned long frame_forward_kernel_offset;
-    unsigned long frame_backward_kernel_offset;
-    unsigned long frame_f_b_kernel_offset;
-    unsigned long ipicture_field_kernel_offset;
-    unsigned long field_forward_kernel_offset;
-    unsigned long field_backward_kernel_offset;
-    unsigned long field_f_b_kernel_offset;
-    unsigned long dual_prime_kernel_offset;
-    unsigned long null_kernel_offset;
-    unsigned long surface_offsets[MAX_SURFACE_NUM];
-    unsigned long binding_table_offset;
-    unsigned int  is_g4x:1;
-    unsigned int  is_965_q:1;
+struct media_kernel_obj {
+	dri_bo *bo;
 };
-struct media_state media_state;
 
-static int map_buffer(struct  drm_memory_block *mem)
-{
-    return (drmMap(xvmc_driver->fd, 
-		mem->handle, mem->size, &mem->ptr));
-}
+struct interface_descriptor_obj {
+	dri_bo *bo;
+	struct media_kernel_obj kernels[DESCRIPTOR_NUM];
+};
 
-static void unmap_buffer(struct  drm_memory_block *mem)
-{
-    drmUnmap(mem->ptr, mem->size);
-}
+struct vfe_state_obj {
+	dri_bo *bo;
+	struct interface_descriptor_obj interface;
+};
 
-static Status destroy_context(Display *display, XvMCContext *context)
-{
-    struct i965_xvmc_context *private_context;
-    private_context = context->privData;
-    unmap_buffer(&private_context->static_buffer);
-    unmap_buffer(&private_context->blocks);
+struct surface_obj {
+	dri_bo *bo;
+};
 
-    Xfree(private_context);
-    return Success;
-}
+struct surface_state_obj {
+	struct surface_obj surface;
+	dri_bo *bo;
+};
+
+struct binding_table_obj {
+	dri_bo *bo;
+	struct surface_state_obj surface_states[MAX_SURFACE_NUM];
+};
 
-static Status create_surface(Display *display,
-	XvMCContext *context, XvMCSurface *surface, int priv_count,
-	CARD32 *priv_data)
+struct indirect_data_obj {
+	dri_bo *bo;
+};
+
+struct media_state {
+	unsigned int is_g4x:1;
+	unsigned int is_965_q:1;
+
+	struct vfe_state_obj vfe_state;
+	struct binding_table_obj binding_table;
+	struct indirect_data_obj indirect_data;
+};
+struct media_state media_state;
+
+static void free_object(struct media_state *s)
 {
-    struct i965_xvmc_surface *priv_surface = 
-	(struct i965_xvmc_surface *)priv_data;
-    if (map_buffer(&priv_surface->buffer))
+	int i;
+#define FREE_ONE_BO(bo) drm_intel_bo_unreference(bo)
+	FREE_ONE_BO(s->vfe_state.bo);
+	FREE_ONE_BO(s->vfe_state.interface.bo);
+	for (i = 0; i < DESCRIPTOR_NUM; i++)
+		FREE_ONE_BO(s->vfe_state.interface.kernels[i].bo);
+	FREE_ONE_BO(s->binding_table.bo);
+	for (i = 0; i < MAX_SURFACE_NUM; i++)
+		FREE_ONE_BO(s->binding_table.surface_states[i].bo);
+	FREE_ONE_BO(s->indirect_data.bo);
+}
+
+static int alloc_object(struct media_state *s)
+{
+	int i;
+
+	for (i = 0; i < MAX_SURFACE_NUM; i++) {
+		s->binding_table.surface_states[i].bo =
+		    drm_intel_bo_alloc(xvmc_driver->bufmgr, "surface_state",
+				       sizeof(struct brw_surface_state),
+				       0x1000);
+		if (!s->binding_table.surface_states[i].bo)
+			goto out;
+	}
+	return 0;
+out:
+	free_object(s);
 	return BadAlloc;
-    surface->privData = priv_data;
-    return Success;
 }
 
-static Status destroy_surface(Display *display, XvMCSurface *surface)
+static Status destroy_context(Display * display, XvMCContext * context)
 {
-    struct i965_xvmc_surface *priv_surface = 
-	surface->privData;
-    unmap_buffer(&priv_surface->buffer);
-    return Success;
+	struct intel_xvmc_context *intel_ctx;
+	intel_ctx = context->privData;
+	Xfree(intel_ctx->hw);
+	free(intel_ctx);
+	return Success;
 }
 
+#define STRIDE(w)               (w)
+#define SIZE_YUV420(w, h)       (h * (STRIDE(w) + STRIDE(w >> 1)))
+
 static void flush()
 {
-    struct brw_mi_flush flush;
-    memset(&flush, 0, sizeof(flush));
-    flush.opcode = CMD_MI_FLUSH;
-    flush.flags = (1<<1);
-    BATCH_STRUCT(flush);
+	struct brw_mi_flush flush;
+	memset(&flush, 0, sizeof(flush));
+	flush.opcode = CMD_MI_FLUSH;
+	flush.flags = (1 << 1);
+	BATCH_STRUCT(flush);
 }
 
 static void clear_sf_state()
 {
-    struct brw_sf_unit_state sf;
-    memset(&sf, 0, sizeof(sf));
-    /* TODO */
+	struct brw_sf_unit_state sf;
+	memset(&sf, 0, sizeof(sf));
+	/* TODO */
 }
 
-
 /* urb fence must be aligned to cacheline */
 static void align_urb_fence()
 {
-    int i, offset_to_next_cacheline;
-    unsigned long batch_offset;
-    BATCH_LOCALS;
-    BEGIN_BATCH(3);
-    batch_offset = (void *)batch_ptr - xvmc_driver->alloc.ptr;
-    offset_to_next_cacheline = ALIGN(batch_offset, 64) - batch_offset; 
-    if (offset_to_next_cacheline <= 12 && offset_to_next_cacheline != 0) {
-	for (i = 0; i < offset_to_next_cacheline/4; i++)
-	    OUT_BATCH(0);
-	ADVANCE_BATCH();
-    }
+	BATCH_LOCALS;
+	int i, offset_to_next_cacheline;
+	unsigned long batch_offset;
+	BEGIN_BATCH(3);
+	batch_offset = (void *)batch_ptr - xvmc_driver->alloc.ptr;
+	offset_to_next_cacheline = ALIGN(batch_offset, 64) - batch_offset;
+	if (offset_to_next_cacheline <= 12 && offset_to_next_cacheline != 0) {
+		for (i = 0; i < offset_to_next_cacheline / 4; i++)
+			OUT_BATCH(0);
+		ADVANCE_BATCH();
+	}
 }
 
 /* setup urb layout for media */
 static void urb_layout()
 {
-    BATCH_LOCALS;
-    align_urb_fence();
-    BEGIN_BATCH(3);
-    OUT_BATCH(BRW_URB_FENCE |
-	    UF0_VFE_REALLOC |
-	    UF0_CS_REALLOC |
-	    1);
-    OUT_BATCH(0);
-    OUT_BATCH(((URB_SIZE)<< UF2_VFE_FENCE_SHIFT) |	/* VFE_SIZE */
-	    ((URB_SIZE)<< UF2_CS_FENCE_SHIFT));		/* CS_SIZE is 0 */
-    ADVANCE_BATCH();
-}
-
-/* clear previous urb layout */
-static void clear_urb_state()
-{
-    BATCH_LOCALS;
-    align_urb_fence();
-    BEGIN_BATCH(3);
-    OUT_BATCH(BRW_URB_FENCE |
-	    UF0_CS_REALLOC |
-	    UF0_SF_REALLOC |
-	    UF0_CLIP_REALLOC |
-	    UF0_GS_REALLOC |
-	    UF0_VS_REALLOC |
-	    1);
-    OUT_BATCH((0 << UF1_CLIP_FENCE_SHIFT) |
-	    (0 << UF1_GS_FENCE_SHIFT) |
-	    (0 << UF1_VS_FENCE_SHIFT));
-    OUT_BATCH((0 << UF2_CS_FENCE_SHIFT) |
-	    (0 << UF2_SF_FENCE_SHIFT));
-    ADVANCE_BATCH();
+	BATCH_LOCALS;
+	align_urb_fence();
+	BEGIN_BATCH(3);
+	OUT_BATCH(BRW_URB_FENCE |
+		  UF0_VFE_REALLOC |
+		  UF0_CS_REALLOC |
+		  UF0_SF_REALLOC |
+		  UF0_CLIP_REALLOC | UF0_GS_REALLOC | UF0_VS_REALLOC | 1);
+	OUT_BATCH((0 << UF1_CLIP_FENCE_SHIFT) |
+		  (0 << UF1_GS_FENCE_SHIFT) | (0 << UF1_VS_FENCE_SHIFT));
+
+	OUT_BATCH(((URB_SIZE) << UF2_VFE_FENCE_SHIFT) |	/* VFE_SIZE */
+		  ((URB_SIZE) << UF2_CS_FENCE_SHIFT));	/* CS_SIZE is 0 */
+	ADVANCE_BATCH();
 }
 
 static void media_state_pointers(struct media_state *media_state)
 {
-    BATCH_LOCALS;
-    BEGIN_BATCH(3);
-    OUT_BATCH(BRW_MEDIA_STATE_POINTERS|1);
-    OUT_BATCH(0);
-    OUT_BATCH(media_state->vfe_state_offset);
-    ADVANCE_BATCH();
-}
-
-static void cs_urb_layout()
-{
-    BATCH_LOCALS;
-    BEGIN_BATCH(2);
-    OUT_BATCH(BRW_CS_URB_STATE | 0);
-    OUT_BATCH((0 << 4) |    /* URB Entry Allocation Size */
-	      (0 << 0));    /* Number of URB Entries */
-    ADVANCE_BATCH();
+	BATCH_LOCALS;
+	BEGIN_BATCH(3);
+	OUT_BATCH(BRW_MEDIA_STATE_POINTERS | 1);
+	OUT_BATCH(0);
+	OUT_RELOC(media_state->vfe_state.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	ADVANCE_BATCH();
 }
 
 /* setup 2D surface for media_read or media_write 
  */
-static void setup_media_surface(struct media_state *media_state,
-	int surface_num, unsigned long offset, int w, int h)
-{
-    struct brw_surface_state *ss;
-    ss = media_state->state_ptr +
-	(media_state->surface_offsets[surface_num] - media_state->state_base);
-    memset(ss, 0, sizeof(struct brw_surface_state));
-    ss->ss0.surface_type = BRW_SURFACE_2D;
-    ss->ss0.surface_format = BRW_SURFACEFORMAT_R8_SINT;
-    ss->ss1.base_addr = offset;
-    ss->ss2.width = w - 1;
-    ss->ss2.height = h - 1;
-    ss->ss3.pitch = w - 1;
-}
-
-static void setup_surfaces(struct media_state *media_state, 
-	unsigned long dst_offset, unsigned long past_offset, 
-	unsigned long future_offset, 
-	int w, int h)
-{
-    setup_media_surface(media_state, 0, dst_offset, w, h);
-    setup_media_surface(media_state, 1, dst_offset+w*h, w/2, h/2);
-    setup_media_surface(media_state, 2, dst_offset+w*h + w*h/4, w/2, h/2);
-    if (past_offset) {
-	setup_media_surface(media_state, 4, past_offset, w, h);
-	setup_media_surface(media_state, 5, past_offset+w*h, w/2, h/2);
-	setup_media_surface(media_state, 6, past_offset+w*h + w*h/4, w/2, h/2);
-    }
-    if (future_offset) {
-	setup_media_surface(media_state, 7, future_offset, w, h);
-	setup_media_surface(media_state, 8, future_offset+w*h, w/2, h/2);
-	setup_media_surface(media_state, 9, future_offset+w*h + w*h/4, w/2, h/2);
-    }
+static Status setup_media_surface(struct media_state *media_state,
+				  int surface_num, dri_bo * bo,
+				  unsigned long offset, int w, int h,
+				  Bool write)
+{
+	struct brw_surface_state s, *ss = &s;
+
+	memset(ss, 0, sizeof(struct brw_surface_state));
+	ss->ss0.surface_type = BRW_SURFACE_2D;
+	ss->ss0.surface_format = BRW_SURFACEFORMAT_R8_SINT;
+	ss->ss1.base_addr = offset + bo->offset;
+	ss->ss2.width = w - 1;
+	ss->ss2.height = h - 1;
+	ss->ss3.pitch = w - 1;
+
+	if (media_state->binding_table.surface_states[surface_num].bo)
+		drm_intel_bo_unreference(media_state->
+					 binding_table.surface_states
+					 [surface_num].bo);
+	media_state->binding_table.surface_states[surface_num].bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "surface_state",
+			       sizeof(struct brw_surface_state), 0x1000);
+	if (!media_state->binding_table.surface_states[surface_num].bo)
+		return BadAlloc;
+
+	drm_intel_bo_subdata(media_state->
+			     binding_table.surface_states[surface_num].bo, 0,
+			     sizeof(*ss), ss);
+
+	drm_intel_bo_emit_reloc(media_state->
+				binding_table.surface_states[surface_num].bo,
+				offsetof(struct brw_surface_state, ss1), bo,
+				offset, I915_GEM_DOMAIN_RENDER,
+				write ? I915_GEM_DOMAIN_RENDER : 0);
+
+	return Success;
 }
+
+static Status setup_surfaces(struct media_state *media_state,
+			     dri_bo * dst_bo, dri_bo * past_bo,
+			     dri_bo * future_bo, int w, int h)
+{
+	Status ret;
+	ret = setup_media_surface(media_state, 0, dst_bo, 0, w, h, TRUE);
+	if (ret != Success)
+		return ret;
+	ret =
+	    setup_media_surface(media_state, 1, dst_bo, w * h, w / 2, h / 2,
+				TRUE);
+	if (ret != Success)
+		return ret;
+	ret =
+	    setup_media_surface(media_state, 2, dst_bo, w * h + w * h / 4,
+				w / 2, h / 2, TRUE);
+	if (ret != Success)
+		return ret;
+	if (past_bo) {
+		ret =
+		    setup_media_surface(media_state, 4, past_bo, 0, w, h,
+					FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(media_state, 5, past_bo, w * h, w / 2,
+					h / 2, FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(media_state, 6, past_bo,
+					w * h + w * h / 4, w / 2, h / 2, FALSE);
+		if (ret != Success)
+			return ret;
+	}
+	if (future_bo) {
+		ret =
+		    setup_media_surface(media_state, 7, future_bo, 0, w, h,
+					FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(media_state, 8, future_bo, w * h, w / 2,
+					h / 2, FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(media_state, 9, future_bo,
+					w * h + w * h / 4, w / 2, h / 2, FALSE);
+		if (ret != Success)
+			return ret;
+	}
+	return Success;
+}
+
 /* BUFFER SURFACE has a strange format
  * the size of the surface is in part of w h and d component
  */
 
-static void setup_blocks(struct media_state *media_state, 
-	unsigned long offset, unsigned int block_size)
+static Status setup_blocks(struct media_state *media_state,
+			   unsigned int block_size)
 {
-    union element{
+	union element {
 		struct {
 			unsigned int w:7;
 			unsigned int h:13;
 			unsigned int d:7;
 			unsigned int pad:7;
-		}whd;
-		unsigned int size;	
-    }e;
-    struct brw_surface_state *ss;
-    ss = media_state->state_ptr +
-	(media_state->surface_offsets[3] - media_state->state_base);
-    memset(ss, 0, sizeof(struct brw_surface_state));
-    ss->ss0.surface_type = BRW_SURFACE_BUFFER;
-    ss->ss0.surface_format = BRW_SURFACEFORMAT_R8_UINT;
-    ss->ss1.base_addr = offset;
-    e.size = block_size - 1;
-    ss->ss2.width = e.whd.w;
-    ss->ss2.height = e.whd.h;
-    ss->ss3.depth = e.whd.d;
-    ss->ss3.pitch = block_size - 1;
+		} whd;
+		unsigned int size;
+	} e;
+	struct brw_surface_state ss;
+	memset(&ss, 0, sizeof(struct brw_surface_state));
+	ss.ss0.surface_type = BRW_SURFACE_BUFFER;
+	ss.ss0.surface_format = BRW_SURFACEFORMAT_R8_UINT;
+	ss.ss1.base_addr = media_state->indirect_data.bo->offset;
+
+	e.size = block_size - 1;
+	ss.ss2.width = e.whd.w;
+	ss.ss2.height = e.whd.h;
+	ss.ss3.depth = e.whd.d;
+	ss.ss3.pitch = block_size - 1;
+
+	if (media_state->binding_table.surface_states[3].bo)
+		drm_intel_bo_unreference(media_state->
+					 binding_table.surface_states[3].bo);
+
+	media_state->binding_table.surface_states[3].bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "surface_state",
+			       sizeof(struct brw_surface_state), 0x1000);
+	if (!media_state->binding_table.surface_states[3].bo)
+		return BadAlloc;
+
+	drm_intel_bo_subdata(media_state->binding_table.surface_states[3].bo, 0,
+			     sizeof(ss), &ss);
+
+	drm_intel_bo_emit_reloc(media_state->binding_table.surface_states[3].bo,
+				offsetof(struct brw_surface_state, ss1),
+				media_state->indirect_data.bo, 0,
+				I915_GEM_DOMAIN_SAMPLER, 0);
+	return Success;
 }
 
 /* setup state base address */
-static void state_base_address(int offset)
+static void state_base_address()
 {
-    BATCH_LOCALS;
-    BEGIN_BATCH(6);
-    OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4);
-    OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(0 | BASE_ADDRESS_MODIFY); 
-    OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH((0xFFFFF<<12) | BASE_ADDRESS_MODIFY);
-    ADVANCE_BATCH();
+	BATCH_LOCALS;
+	BEGIN_BATCH(6);
+	OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4);
+	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+	OUT_BATCH(0xFFFFF000 | BASE_ADDRESS_MODIFY);
+	ADVANCE_BATCH();
 }
 
 /* select media pipeline */
 static void pipeline_select(struct media_state *media_state)
 {
-    BATCH_LOCALS;
-    BEGIN_BATCH(1);
-    if (media_state->is_g4x)
-	    OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-    else
-	    OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-    ADVANCE_BATCH();
+	BATCH_LOCALS;
+	BEGIN_BATCH(1);
+	if (media_state->is_g4x)
+		OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
+	else
+		OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
+	ADVANCE_BATCH();
 }
 
 /* kick media object to gpu */
-static void send_media_object(XvMCMacroBlock *mb, int offset, enum interface interface)
+static void send_media_object(XvMCMacroBlock * mb, int offset,
+			      enum interface interface)
 {
-    BATCH_LOCALS;
-    BEGIN_BATCH(13);
-    OUT_BATCH(BRW_MEDIA_OBJECT|11);
-    OUT_BATCH(interface);
-    if (media_state.is_965_q) {
-	OUT_BATCH(0);
-	OUT_BATCH(0);
-    }else {
-	OUT_BATCH(6*128);
-	OUT_BATCH(offset);
-    }
-    
-    OUT_BATCH(mb->x<<4);                 //g1.0
-    OUT_BATCH(mb->y<<4);
-    OUT_BATCH(offset);               //g1.8
-    OUT_BATCH_SHORT(mb->coded_block_pattern);  //g1.12
-    OUT_BATCH_SHORT(mb->PMV[0][0][0]);         //g1.14
-    OUT_BATCH_SHORT(mb->PMV[0][0][1]);         //g1.16
-    OUT_BATCH_SHORT(mb->PMV[0][1][0]);         //g1.18
-    OUT_BATCH_SHORT(mb->PMV[0][1][1]);         //g1.20
-    
-    OUT_BATCH_SHORT(mb->PMV[1][0][0]);         //g1.22 
-    OUT_BATCH_SHORT(mb->PMV[1][0][1]);         //g1.24
-    OUT_BATCH_SHORT(mb->PMV[1][1][0]);         //g1.26
-    OUT_BATCH_SHORT(mb->PMV[1][1][1]);         //g1.28
-    OUT_BATCH_CHAR(mb->dct_type);              //g1.30
-    OUT_BATCH_CHAR(mb->motion_vertical_field_select);//g1.31
-    
-    if (media_state.is_965_q) 
-	OUT_BATCH(0x0);
-    else
-	OUT_BATCH(0xffffffff);
-    ADVANCE_BATCH();
-}
-
-static void binding_tables(struct media_state *media_state)
-{
-    unsigned int *binding_table;
-    int i;
-    binding_table = media_state->state_ptr +
-	(media_state->binding_table_offset - media_state->state_base);
-    for (i = 0; i < MAX_SURFACE_NUM; i++)
-	binding_table[i] = media_state->surface_offsets[i];
-}
-
-static void media_kernels(struct media_state *media_state)
-{
-	void *kernel; 
-#define LOAD_KERNEL(name) kernel = media_state->state_ptr +\
-	(media_state->name##_kernel_offset - media_state->state_base);\
-	memcpy(kernel, name##_kernel_static, sizeof(name##_kernel_static));
-#define LOAD_KERNEL_IGD(name) kernel = media_state->state_ptr +\
-	(media_state->name##_kernel_offset - media_state->state_base);\
-	memcpy(kernel, name##_igd_kernel_static, sizeof(name##_igd_kernel_static));
+	BATCH_LOCALS;
+	BEGIN_BATCH(13);
+	OUT_BATCH(BRW_MEDIA_OBJECT | 11);
+	OUT_BATCH(interface);
+	if (media_state.is_965_q) {
+		OUT_BATCH(0);
+		OUT_BATCH(0);
+	} else {
+		OUT_BATCH(6 * 128);
+		OUT_RELOC(media_state.indirect_data.bo,
+			  I915_GEM_DOMAIN_INSTRUCTION, 0, offset);
+	}
+
+	OUT_BATCH(mb->x << 4);	//g1.0
+	OUT_BATCH(mb->y << 4);
+	OUT_RELOC(media_state.indirect_data.bo,	//g1.8
+		  I915_GEM_DOMAIN_INSTRUCTION, 0, offset);
+	OUT_BATCH_SHORT(mb->coded_block_pattern);	//g1.12
+	OUT_BATCH_SHORT(mb->PMV[0][0][0]);	//g1.14
+	OUT_BATCH_SHORT(mb->PMV[0][0][1]);	//g1.16
+	OUT_BATCH_SHORT(mb->PMV[0][1][0]);	//g1.18
+	OUT_BATCH_SHORT(mb->PMV[0][1][1]);	//g1.20
+
+	OUT_BATCH_SHORT(mb->PMV[1][0][0]);	//g1.22
+	OUT_BATCH_SHORT(mb->PMV[1][0][1]);	//g1.24
+	OUT_BATCH_SHORT(mb->PMV[1][1][0]);	//g1.26
+	OUT_BATCH_SHORT(mb->PMV[1][1][1]);	//g1.28
+	OUT_BATCH_CHAR(mb->dct_type);	//g1.30
+	OUT_BATCH_CHAR(mb->motion_vertical_field_select);	//g1.31
+
+	if (media_state.is_965_q)
+		OUT_BATCH(0x0);
+	else
+		OUT_BATCH(0xffffffff);
+	ADVANCE_BATCH();
+}
+
+static Status binding_tables(struct media_state *media_state)
+{
+	unsigned int binding_table[MAX_SURFACE_NUM];
+	int i;
+
+	if (media_state->binding_table.bo)
+		drm_intel_bo_unreference(media_state->binding_table.bo);
+	media_state->binding_table.bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "binding_table",
+			       MAX_SURFACE_NUM * 4, 0x1000);
+	if (!media_state->binding_table.bo)
+		return BadAlloc;
+
+	for (i = 0; i < MAX_SURFACE_NUM; i++)
+		binding_table[i] =
+		    media_state->binding_table.surface_states[i].bo->offset;
+	drm_intel_bo_subdata(media_state->binding_table.bo, 0,
+			     sizeof(binding_table), binding_table);
+
+	for (i = 0; i < MAX_SURFACE_NUM; i++)
+		drm_intel_bo_emit_reloc(media_state->binding_table.bo,
+					i * sizeof(unsigned int),
+					media_state->
+					binding_table.surface_states[i].bo, 0,
+					I915_GEM_DOMAIN_INSTRUCTION, 0);
+	return Success;
+}
+
+static int media_kernels(struct media_state *media_state)
+{
+	struct kernel_struct *kernels;
+	int kernel_array_size, i;
 
-	LOAD_KERNEL(ipicture);
-	LOAD_KERNEL(null);
 	if (media_state->is_g4x) {
-		LOAD_KERNEL_IGD(frame_forward);
-		LOAD_KERNEL_IGD(field_forward);
-		LOAD_KERNEL_IGD(frame_backward);
-		LOAD_KERNEL_IGD(field_backward);
-		LOAD_KERNEL_IGD(frame_f_b);
-		LOAD_KERNEL_IGD(field_f_b);
-		LOAD_KERNEL_IGD(dual_prime);
-
-	}else {
-		LOAD_KERNEL(frame_forward);
-		LOAD_KERNEL(field_forward);
-		LOAD_KERNEL(frame_backward);
-		LOAD_KERNEL(field_backward);
-		LOAD_KERNEL(frame_f_b);
-		LOAD_KERNEL(field_f_b);
-		LOAD_KERNEL(dual_prime);
-	}
-}
-
-static void setup_interface(struct media_state *media_state, 
-	enum interface interface, unsigned int kernel_offset)
-{
-    struct brw_interface_descriptor *desc;
-    desc = media_state->state_ptr +
-	(media_state->interface_descriptor_offset[interface] 
-	 - media_state->state_base);
-    memset(desc, 0, sizeof(*desc));
-    desc->desc0.grf_reg_blocks = 15;
-    desc->desc0.kernel_start_pointer = kernel_offset >> 6;
-    desc->desc1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
-
-    /* use same binding table for all interface
-     * may change this if it affect performance
-     */
-    desc->desc3.binding_table_entry_count = MAX_SURFACE_NUM;
-    desc->desc3.binding_table_pointer = media_state->binding_table_offset >> 5;
-}
-
-static void interface_descriptor(struct media_state *media_state)
-{
-	setup_interface(media_state, INTRA_INTERFACE, 
-		media_state->ipicture_kernel_offset);
-	setup_interface(media_state, NULL_INTERFACE, 
-		media_state->null_kernel_offset);
-	setup_interface(media_state, FORWARD_INTERFACE, 
-		media_state->frame_forward_kernel_offset);
-	setup_interface(media_state, FIELD_FORWARD_INTERFACE, 
-		media_state->field_forward_kernel_offset);
-	setup_interface(media_state, BACKWARD_INTERFACE, 
-		media_state->frame_backward_kernel_offset);
-	setup_interface(media_state, FIELD_BACKWARD_INTERFACE, 
-		media_state->field_backward_kernel_offset);
-	setup_interface(media_state, F_B_INTERFACE, 
-		media_state->frame_f_b_kernel_offset);
-	setup_interface(media_state, FIELD_F_B_INTERFACE, 
-		media_state->field_f_b_kernel_offset);
-	setup_interface(media_state, DUAL_PRIME_INTERFACE,
-		media_state->dual_prime_kernel_offset);
-}
-
-static void vfe_state(struct media_state *media_state)
-{
-	struct brw_vfe_state *state;
-	state = media_state->state_ptr +
-	    (media_state->vfe_state_offset - media_state->state_base);
-	memset(state, 0, sizeof(*state));
-	/* no scratch space */
-	state->vfe1.vfe_mode = VFE_GENERIC_MODE;
-	state->vfe1.num_urb_entries = 1; 
-	/* XXX TODO */
-	/* should carefully caculate those values for performance */
-	state->vfe1.urb_entry_alloc_size = 2; 
-	state->vfe1.max_threads = 31; 
-	state->vfe2.interface_descriptor_base = 
-		media_state->interface_descriptor_offset[0] >> 4;
-}
-
-static void calc_state_layouts(struct media_state *media_state)
-{
-    int i;
-    media_state->vfe_state_offset = ALIGN(media_state->state_base, 64);
-    media_state->interface_descriptor_offset[0] = 
-	ALIGN(media_state->vfe_state_offset + sizeof(struct brw_vfe_state), 64);
-    for (i = 1; i < DESCRIPTOR_NUM; i++)
-	media_state->interface_descriptor_offset[i] = 
-	    media_state->interface_descriptor_offset[i-1]
-	    + sizeof(struct brw_interface_descriptor);
-    media_state->binding_table_offset = 
-	ALIGN(media_state->interface_descriptor_offset[DESCRIPTOR_NUM - 1]
-		+ sizeof(struct brw_interface_descriptor), 64);
-    media_state->surface_offsets[0] = 
-	ALIGN(media_state->binding_table_offset
-		+ 4*media_state->binding_table_entry_count , 32);
-    for (i = 1; i < MAX_SURFACE_NUM; i++)
-	media_state->surface_offsets[i] = 
-	    ALIGN(media_state->surface_offsets[i - 1] 
-		    + sizeof(struct brw_surface_state) , 32);
-    media_state->ipicture_kernel_offset = 
-	ALIGN(media_state->surface_offsets[MAX_SURFACE_NUM - 1] 
-		+ sizeof(struct brw_surface_state) , 64);
-
-    media_state->frame_forward_kernel_offset = 
-	    ALIGN(media_state->ipicture_kernel_offset + 
-			    sizeof(ipicture_kernel_static), 64);
-    if(!media_state->is_g4x) {
-	    media_state->field_forward_kernel_offset = 
-		    ALIGN(media_state->frame_forward_kernel_offset + 
-				    sizeof(frame_forward_kernel_static), 64);
-	    media_state->frame_backward_kernel_offset = 
-		    ALIGN(media_state->field_forward_kernel_offset + 
-				    sizeof(field_forward_kernel_static), 64);
-	    media_state->field_backward_kernel_offset = 
-		    ALIGN(media_state->frame_backward_kernel_offset + 
-				    sizeof(frame_backward_kernel_static), 64);
-	    media_state->frame_f_b_kernel_offset = 
-		    ALIGN(media_state->field_backward_kernel_offset + 
-				    sizeof(field_backward_kernel_static), 64);
-	    media_state->field_f_b_kernel_offset = 
-		    ALIGN(media_state->frame_f_b_kernel_offset + 
-				    sizeof(frame_f_b_kernel_static), 64);
-	    media_state->null_kernel_offset =
-		    ALIGN(media_state->field_f_b_kernel_offset +
-				    sizeof(field_f_b_kernel_static), 64);
-	    media_state->dual_prime_kernel_offset =
-		    ALIGN(media_state->null_kernel_offset +
-				    sizeof(null_kernel_static), 64);
-    } else {
-	    media_state->field_forward_kernel_offset = 
-		    ALIGN(media_state->frame_forward_kernel_offset + 
-				    sizeof(frame_forward_igd_kernel_static), 64);
-	    media_state->frame_backward_kernel_offset = 
-		    ALIGN(media_state->field_forward_kernel_offset + 
-				    sizeof(field_forward_igd_kernel_static), 64);
-	    media_state->field_backward_kernel_offset = 
-		    ALIGN(media_state->frame_backward_kernel_offset + 
-				    sizeof(frame_backward_igd_kernel_static), 64);
-	    media_state->frame_f_b_kernel_offset = 
-		    ALIGN(media_state->field_backward_kernel_offset + 
-				    sizeof(field_backward_igd_kernel_static), 64);
-	    media_state->field_f_b_kernel_offset = 
-		    ALIGN(media_state->frame_f_b_kernel_offset + 
-				    sizeof(frame_f_b_igd_kernel_static), 64);
-	    media_state->null_kernel_offset =
-		    ALIGN(media_state->field_f_b_kernel_offset +
-				    sizeof(field_f_b_igd_kernel_static), 64);
-	    media_state->dual_prime_kernel_offset =
-		    ALIGN(media_state->null_kernel_offset +
-				    sizeof(null_kernel_static), 64);
-    }
-}
-
-static Status render_surface(Display *display, 
-	XvMCContext *context,
-	unsigned int picture_structure,
-	XvMCSurface *target_surface,
-	XvMCSurface *past_surface,
-	XvMCSurface *future_surface,
-	unsigned int flags,
-	unsigned int num_macroblocks,
-	unsigned int first_macroblock,
-	XvMCMacroBlockArray *macroblock_array,
-	XvMCBlockArray *blocks)
-{
-
-    intel_xvmc_context_ptr intel_ctx;
-    int i, j;
-    struct i965_xvmc_context *i965_ctx;
-    XvMCMacroBlock *mb;
-    struct i965_xvmc_surface *priv_target_surface = 
-	target_surface->privData;
-    struct i965_xvmc_surface *priv_past_surface = 
-	past_surface?past_surface->privData:0;
-    struct i965_xvmc_surface *priv_future_surface = 
-	future_surface?future_surface->privData:0;
-    unsigned short *block_ptr;
-    intel_ctx = intel_xvmc_find_context(context->context_id);
-    i965_ctx = context->privData;
-    if (!intel_ctx) {
-	XVMC_ERR("Can't find intel xvmc context\n");
-	return BadValue;
-    }
-    setup_surfaces(&media_state, 
-	    priv_target_surface->buffer.offset, 
-	    past_surface? priv_past_surface->buffer.offset:0, 
-	    future_surface?priv_future_surface->buffer.offset:0, 
-	    context->width, context->height);
-
-    block_ptr = i965_ctx->blocks.ptr;
-    for (i = first_macroblock; 
-	    i < num_macroblocks + first_macroblock; i++) {
-	unsigned short *mb_block_ptr;
-	mb = &macroblock_array->macro_blocks[i];
-	mb_block_ptr = &blocks->blocks[(mb->index<<6)];
-	if (mb->coded_block_pattern & 0x20)  {
-	    for (j = 0; j < 8; j++)
-		memcpy(block_ptr + 16*j, mb_block_ptr + 8*j, 16);	
-	    mb_block_ptr += 64;
-	}
-
-	if (mb->coded_block_pattern & 0x10)  {
-	    for (j = 0; j < 8; j++)
-		memcpy(block_ptr + 16*j + 8, mb_block_ptr + 8*j, 16);	
-	    mb_block_ptr += 64;
-	}
-	block_ptr += 2*64;
-	if (mb->coded_block_pattern & 0x08)  {
-	    for (j = 0; j < 8; j++)
-		memcpy(block_ptr + 16*j, mb_block_ptr + 8*j, 16);	
-	    mb_block_ptr += 64;
-	}
-
-	if (mb->coded_block_pattern & 0x04)  {
-	    for (j = 0; j < 8; j++)
-		memcpy(block_ptr + 16*j + 8, mb_block_ptr + 8*j, 16);	
-	    mb_block_ptr += 64;
-	}
-
-	block_ptr += 2*64;
-	if (mb->coded_block_pattern & 0x2) {
-	    memcpy(block_ptr, mb_block_ptr, 128);
-	    mb_block_ptr += 64;
-	}
-
-	block_ptr += 64;
-	if (mb->coded_block_pattern & 0x1) 
-	    memcpy(block_ptr, mb_block_ptr, 128);
-	block_ptr += 64;
-    }
-
-    {
-	int block_offset;
-	block_offset = media_state.is_965_q?0:i965_ctx->blocks.offset;
-	LOCK_HARDWARE(intel_ctx->hw_context);
-	state_base_address(block_offset);
-	flush();	
-	clear_sf_state();
-	clear_urb_state();
-	pipeline_select(&media_state);
-	urb_layout();	
-	media_state_pointers(&media_state);
-	cs_urb_layout();
-
-	for (i = first_macroblock; 
-		i < num_macroblocks + first_macroblock; 
-		i++, block_offset += 128*6) {
-	    mb = &macroblock_array->macro_blocks[i];
-
-	    if (mb->macroblock_type & XVMC_MB_TYPE_INTRA) {
-		send_media_object(mb, block_offset, INTRA_INTERFACE);
-	    } else {
-		if (((mb->motion_type & 3) == XVMC_PREDICTION_FRAME)) {
-		    if ((mb->macroblock_type&XVMC_MB_TYPE_MOTION_FORWARD))
-		    {
-			if (((mb->macroblock_type&XVMC_MB_TYPE_MOTION_BACKWARD)))
-			    send_media_object(mb, block_offset, F_B_INTERFACE);
-			else
-			    send_media_object(mb, block_offset, FORWARD_INTERFACE);
-		    } else if ((mb->macroblock_type&XVMC_MB_TYPE_MOTION_BACKWARD))
-		    {
-			send_media_object(mb, block_offset, BACKWARD_INTERFACE);
-		    }
-		} else if ((mb->motion_type & 3) == XVMC_PREDICTION_FIELD) {
-		    if ((mb->macroblock_type&XVMC_MB_TYPE_MOTION_FORWARD))
-		    {
-			if (((mb->macroblock_type&XVMC_MB_TYPE_MOTION_BACKWARD)))	
-			    send_media_object(mb, block_offset, FIELD_F_B_INTERFACE);
-			else 
-
-			    send_media_object(mb, block_offset, FIELD_FORWARD_INTERFACE);
-		    } else if ((mb->macroblock_type&XVMC_MB_TYPE_MOTION_BACKWARD))
-		    {
-			send_media_object(mb, block_offset, FIELD_BACKWARD_INTERFACE);
-		    }
-		}else {
-		    send_media_object(mb, block_offset, DUAL_PRIME_INTERFACE);
-		}
-	    }
+		kernels = kernels_igd;
+		kernel_array_size = ARRAY_SIZE(kernels_igd);
+	} else {
+		kernels = kernels_965;
+		kernel_array_size = ARRAY_SIZE(kernels_965);
 	}
-	intelFlushBatch(TRUE);
-	UNLOCK_HARDWARE(intel_ctx->hw_context);
-    }
-    return Success;
+
+	for (i = 0; i < kernel_array_size; i++) {
+		media_state->vfe_state.interface.kernels[i].bo =
+		    drm_intel_bo_alloc(xvmc_driver->bufmgr, "kernel",
+				       kernels[i].size, 0x1000);
+		if (!media_state->vfe_state.interface.kernels[i].bo)
+			goto out;
+	}
+
+	for (i = 0; i < kernel_array_size; i++) {
+		dri_bo *bo = media_state->vfe_state.interface.kernels[i].bo;
+		drm_intel_bo_subdata(bo, 0, kernels[i].size, kernels[i].bin);
+	}
+	return 0;
+out:
+	free_object(media_state);
+	return BadAlloc;
 }
 
-static Status put_surface(Display *display,XvMCSurface *surface,
-	Drawable draw, short srcx, short srcy,
-	unsigned short srcw, unsigned short srch,
-	short destx, short desty,
-	unsigned short destw, unsigned short desth,
-	int flags, struct intel_xvmc_command *data)
+static void setup_interface(struct media_state *media_state, enum interface i)
 {
-	struct i965_xvmc_surface *private_surface =
-		surface->privData;
+	struct brw_interface_descriptor desc;
+	memset(&desc, 0, sizeof(desc));
 
-	data->surf_offset = private_surface->buffer.offset;
+	desc.desc0.grf_reg_blocks = 15;
+	desc.desc0.kernel_start_pointer =
+	    media_state->vfe_state.interface.kernels[i].bo->offset >> 6;
+
+	desc.desc1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
+
+	/* use same binding table for all interface
+	 * may change this if it affect performance
+	 */
+	desc.desc3.binding_table_entry_count = MAX_SURFACE_NUM;
+	desc.desc3.binding_table_pointer =
+	    media_state->binding_table.bo->offset >> 5;
+
+	drm_intel_bo_subdata(media_state->vfe_state.interface.bo,
+			     i * sizeof(desc), sizeof(desc), &desc);
+
+	drm_intel_bo_emit_reloc(media_state->vfe_state.interface.bo,
+				i * sizeof(desc) +
+				offsetof(struct brw_interface_descriptor,
+					 desc0),
+				media_state->vfe_state.interface.kernels[i].bo,
+				desc.desc0.grf_reg_blocks,
+				I915_GEM_DOMAIN_INSTRUCTION, 0);
+
+	drm_intel_bo_emit_reloc(media_state->vfe_state.interface.bo,
+				i * sizeof(desc) +
+				offsetof(struct brw_interface_descriptor,
+					 desc3), media_state->binding_table.bo,
+				desc.desc3.binding_table_entry_count,
+				I915_GEM_DOMAIN_INSTRUCTION, 0);
+}
+
+static Status interface_descriptor(struct media_state *media_state)
+{
+	if (media_state->vfe_state.interface.bo)
+		drm_intel_bo_unreference(media_state->vfe_state.interface.bo);
+	media_state->vfe_state.interface.bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "interfaces",
+			       DESCRIPTOR_NUM *
+			       sizeof(struct brw_interface_descriptor), 0x1000);
+	if (!media_state->vfe_state.interface.bo)
+		return BadAlloc;
+
+	setup_interface(media_state, INTRA_INTERFACE);
+	setup_interface(media_state, NULL_INTERFACE);
+	setup_interface(media_state, FORWARD_INTERFACE);
+	setup_interface(media_state, FIELD_FORWARD_INTERFACE);
+	setup_interface(media_state, BACKWARD_INTERFACE);
+	setup_interface(media_state, FIELD_BACKWARD_INTERFACE);
+	setup_interface(media_state, F_B_INTERFACE);
+	setup_interface(media_state, FIELD_F_B_INTERFACE);
+	setup_interface(media_state, DUAL_PRIME_INTERFACE);
 	return Success;
 }
 
-static Status get_surface_status(Display *display,
-	XvMCSurface *surface, int *stats)
+static Status vfe_state(struct media_state *media_state)
 {
-    *stats = 0;
-    return 0;
+	struct brw_vfe_state state;
+	memset(&state, 0, sizeof(state));
+
+	/* no scratch space */
+	state.vfe1.vfe_mode = VFE_GENERIC_MODE;
+	state.vfe1.num_urb_entries = 1;
+	/* XXX TODO */
+	/* should carefully caculate those values for performance */
+	state.vfe1.urb_entry_alloc_size = 2;
+	state.vfe1.max_threads = 31;
+	state.vfe2.interface_descriptor_base =
+	    media_state->vfe_state.interface.bo->offset >> 4;
+
+	if (media_state->vfe_state.bo)
+		drm_intel_bo_unreference(media_state->vfe_state.bo);
+	media_state->vfe_state.bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+						       "vfe state",
+						       sizeof(struct
+							      brw_vfe_state),
+						       0x1000);
+	if (!media_state->vfe_state.bo)
+		return BadAlloc;
+
+	drm_intel_bo_subdata(media_state->vfe_state.bo, 0, sizeof(state),
+			     &state);
+
+	drm_intel_bo_emit_reloc(media_state->vfe_state.bo,
+				offsetof(struct brw_vfe_state, vfe2),
+				media_state->vfe_state.interface.bo, 0,
+				I915_GEM_DOMAIN_INSTRUCTION, 0);
+	return Success;
 }
 
-static Status create_context(Display *display, XvMCContext *context,
-	int priv_count, CARD32 *priv_data)
-{
-    struct i965_xvmc_context *i965_ctx;
-    i965_ctx = (struct i965_xvmc_context *)priv_data;
-    context->privData = i965_ctx;
-    if (map_buffer(&i965_ctx->static_buffer))
-	return BadAlloc;
-    if(map_buffer(&i965_ctx->blocks))
-	return BadAlloc;
-    {
-	media_state.state_base = i965_ctx->static_buffer.offset;
-	media_state.state_ptr = i965_ctx->static_buffer.ptr;
-	media_state.is_g4x = i965_ctx->is_g4x;
-	media_state.is_965_q = i965_ctx->is_965_q;
-	media_state.binding_table_entry_count = MAX_SURFACE_NUM;
-	calc_state_layouts(&media_state);
-	vfe_state(&media_state);
-	interface_descriptor(&media_state); 
-	media_kernels(&media_state);
-	setup_blocks(&media_state, 
-		i965_ctx->blocks.offset, 
-		6*context->width*context->height*sizeof(short));
+static Status render_surface(Display * display,
+			     XvMCContext * context,
+			     unsigned int picture_structure,
+			     XvMCSurface * target_surface,
+			     XvMCSurface * past_surface,
+			     XvMCSurface * future_surface,
+			     unsigned int flags,
+			     unsigned int num_macroblocks,
+			     unsigned int first_macroblock,
+			     XvMCMacroBlockArray * macroblock_array,
+			     XvMCBlockArray * blocks)
+{
+
+	intel_xvmc_context_ptr intel_ctx;
+	int i, j;
+	struct i965_xvmc_context *i965_ctx;
+	XvMCMacroBlock *mb;
+	struct intel_xvmc_surface *priv_target_surface =
+	    target_surface->privData;
+	struct intel_xvmc_surface *priv_past_surface =
+	    past_surface ? past_surface->privData : 0;
+	struct intel_xvmc_surface *priv_future_surface =
+	    future_surface ? future_surface->privData : 0;
+	unsigned short *block_ptr;
+	intel_ctx = context->privData;
+	i965_ctx = context->privData;
+	if (!intel_ctx) {
+		XVMC_ERR("Can't find intel xvmc context\n");
+		return BadValue;
+	}
+
+	if (media_state.indirect_data.bo) {
+		drm_intel_gem_bo_unmap_gtt(media_state.
+					   indirect_data.bo);
+
+		drm_intel_bo_unreference(media_state.indirect_data.bo);
+	}
+	media_state.indirect_data.bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+							  "indirect data",
+							  128 * 6 *
+							  num_macroblocks, 64);
+	if (!media_state.indirect_data.bo)
+		return BadAlloc;
+	setup_surfaces(&media_state,
+		       priv_target_surface->bo,
+		       past_surface ? priv_past_surface->bo : NULL,
+		       future_surface ? priv_future_surface->bo : NULL,
+		       context->width, context->height);
+	setup_blocks(&media_state, 128 * 6 * num_macroblocks);
 	binding_tables(&media_state);
-    }
-    return Success;
+	interface_descriptor(&media_state);
+	vfe_state(&media_state);
+
+	drm_intel_gem_bo_map_gtt(media_state.indirect_data.bo);
+
+	block_ptr = media_state.indirect_data.bo->virtual;
+	for (i = first_macroblock; i < num_macroblocks + first_macroblock; i++) {
+		unsigned short *mb_block_ptr;
+		mb = &macroblock_array->macro_blocks[i];
+		mb_block_ptr = &blocks->blocks[(mb->index << 6)];
+		if (mb->coded_block_pattern & 0x20) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j, mb_block_ptr + 8 * j,
+				       16);
+			mb_block_ptr += 64;
+		}
+
+		if (mb->coded_block_pattern & 0x10) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j + 8,
+				       mb_block_ptr + 8 * j, 16);
+			mb_block_ptr += 64;
+		}
+		block_ptr += 2 * 64;
+		if (mb->coded_block_pattern & 0x08) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j, mb_block_ptr + 8 * j,
+				       16);
+			mb_block_ptr += 64;
+		}
+
+		if (mb->coded_block_pattern & 0x04) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j + 8,
+				       mb_block_ptr + 8 * j, 16);
+			mb_block_ptr += 64;
+		}
+
+		block_ptr += 2 * 64;
+		if (mb->coded_block_pattern & 0x2) {
+			memcpy(block_ptr, mb_block_ptr, 128);
+			mb_block_ptr += 64;
+		}
+
+		block_ptr += 64;
+		if (mb->coded_block_pattern & 0x1)
+			memcpy(block_ptr, mb_block_ptr, 128);
+		block_ptr += 64;
+	}
+	{
+		int block_offset = 0;
+		LOCK_HARDWARE(intel_ctx->hw_context);
+		state_base_address();
+		flush();
+		clear_sf_state();
+		pipeline_select(&media_state);
+		urb_layout();
+		media_state_pointers(&media_state);
+		for (i = first_macroblock;
+		     i < num_macroblocks + first_macroblock;
+		     i++, block_offset += 128 * 6) {
+			mb = &macroblock_array->macro_blocks[i];
+
+			if (mb->macroblock_type & XVMC_MB_TYPE_INTRA) {
+				send_media_object(mb, block_offset,
+						  INTRA_INTERFACE);
+			} else {
+				if (((mb->motion_type & 3) ==
+				     XVMC_PREDICTION_FRAME)) {
+					if ((mb->macroblock_type &
+					     XVMC_MB_TYPE_MOTION_FORWARD)) {
+						if (((mb->macroblock_type &
+						      XVMC_MB_TYPE_MOTION_BACKWARD)))
+							send_media_object(mb,
+									  block_offset,
+									  F_B_INTERFACE);
+						else
+							send_media_object(mb,
+									  block_offset,
+									  FORWARD_INTERFACE);
+					} else
+					    if ((mb->macroblock_type &
+						 XVMC_MB_TYPE_MOTION_BACKWARD))
+					{
+						send_media_object(mb,
+								  block_offset,
+								  BACKWARD_INTERFACE);
+					}
+				} else if ((mb->motion_type & 3) ==
+					   XVMC_PREDICTION_FIELD) {
+					if ((mb->macroblock_type &
+					     XVMC_MB_TYPE_MOTION_FORWARD)) {
+						if (((mb->macroblock_type &
+						      XVMC_MB_TYPE_MOTION_BACKWARD)))
+							send_media_object(mb,
+									  block_offset,
+									  FIELD_F_B_INTERFACE);
+						else
+
+							send_media_object(mb,
+									  block_offset,
+									  FIELD_FORWARD_INTERFACE);
+					} else
+					    if ((mb->macroblock_type &
+						 XVMC_MB_TYPE_MOTION_BACKWARD))
+					{
+						send_media_object(mb,
+								  block_offset,
+								  FIELD_BACKWARD_INTERFACE);
+					}
+				} else {
+					send_media_object(mb, block_offset,
+							  DUAL_PRIME_INTERFACE);
+				}
+			}
+		}
+		intelFlushBatch(TRUE);
+		UNLOCK_HARDWARE(intel_ctx->hw_context);
+	}
+	return Success;
+}
+
+static Status create_context(Display * display, XvMCContext * context,
+			     int priv_count, CARD32 * priv_data)
+{
+	struct intel_xvmc_context *intel_ctx;
+	struct intel_xvmc_hw_context *hw_ctx;
+	hw_ctx = (struct intel_xvmc_hw_context *)priv_data;
+
+	intel_ctx = calloc(1, sizeof(struct intel_xvmc_context));
+	if (!intel_ctx)
+		return BadAlloc;
+	intel_ctx->hw = hw_ctx;
+	intel_ctx->surface_bo_size
+		= SIZE_YUV420(context->width, context->height);
+	context->privData = intel_ctx;
+
+	media_state.is_g4x = hw_ctx->i965.is_g4x;
+	media_state.is_965_q = hw_ctx->i965.is_965_q;
+
+	if (alloc_object(&media_state))
+		return BadAlloc;
+	if (media_kernels(&media_state))
+		return BadAlloc;
+	return Success;
 }
 
 struct _intel_xvmc_driver i965_xvmc_mc_driver = {
-    .type               = XVMC_I965_MPEG2_MC,
-    .create_context     = create_context,
-    .destroy_context    = destroy_context,
-    .create_surface     = create_surface,
-    .destroy_surface    = destroy_surface,
-    .render_surface     = render_surface,
-    .put_surface        = put_surface,
-    .get_surface_status = get_surface_status,
+	.type = XVMC_I965_MPEG2_MC,
+	.create_context = create_context,
+	.destroy_context = destroy_context,
+	.render_surface = render_surface,
 };
-
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.c new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.c	2008-08-02 07:12:46.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.c	2011-02-08 11:14:00.000000000 +0100
@@ -45,228 +45,132 @@
 
 #include "intel_xvmc.h"
 #include "intel_batchbuffer.h"
-
+#include "brw_defines.h"
+#include "brw_structs.h"
 #define MI_BATCH_BUFFER_END     (0xA << 23)
-
+#define BATCH_SIZE 8*1024	/* one bo is allocated each time, so the size can be small */
 static int intelEmitIrqLocked(void)
 {
-   drmI830IrqEmit ie;
-   int ret, seq;
+	drmI830IrqEmit ie;
+	int ret, seq;
 
-   ie.irq_seq = &seq;
-   ret = drmCommandWriteRead(xvmc_driver->fd, DRM_I830_IRQ_EMIT,
-                             &ie, sizeof(ie));
-
-   if ( ret ) {
-      fprintf(stderr, "%s: drmI830IrqEmit: %d\n", __FUNCTION__, ret);
-      exit(1);
-   }
+	ie.irq_seq = &seq;
+	ret = drmCommandWriteRead(xvmc_driver->fd, DRM_I830_IRQ_EMIT,
+				  &ie, sizeof(ie));
+
+	if (ret) {
+		fprintf(stderr, "%s: drmI830IrqEmit: %d\n", __FUNCTION__, ret);
+		exit(1);
+	}
 
-   return seq;
+	return seq;
 }
 
 static void intelWaitIrq(int seq)
 {
-   int ret;
-   drmI830IrqWait iw;
+	int ret;
+	drmI830IrqWait iw;
 
-   iw.irq_seq = seq;
+	iw.irq_seq = seq;
 
-   do {
-      ret = drmCommandWrite(xvmc_driver->fd, DRM_I830_IRQ_WAIT, &iw, sizeof(iw) );
-   } while (ret == -EAGAIN || ret == -EINTR);
-
-   if (ret) {
-      fprintf(stderr, "%s: drmI830IrqWait: %d\n", __FUNCTION__, ret);
-      exit(1);
-   }
+	do {
+		ret =
+		    drmCommandWrite(xvmc_driver->fd, DRM_I830_IRQ_WAIT, &iw,
+				    sizeof(iw));
+	} while (ret == -EAGAIN || ret == -EINTR);
+
+	if (ret) {
+		fprintf(stderr, "%s: drmI830IrqWait: %d\n", __FUNCTION__, ret);
+		exit(1);
+	}
+}
+
+static void i965_end_batch(void)
+{
+	unsigned int size = xvmc_driver->batch.ptr -
+	    xvmc_driver->batch.init_ptr;
+	if ((size & 4) == 0) {
+		*(unsigned int *)xvmc_driver->batch.ptr = 0;
+		xvmc_driver->batch.ptr += 4;
+	}
+	*(unsigned int *)xvmc_driver->batch.ptr = MI_BATCH_BUFFER_END;
+	xvmc_driver->batch.ptr += 4;
 }
 
-static void intelDestroyBatchBuffer(void)
+Bool intelInitBatchBuffer(void)
 {
-   if (xvmc_driver->alloc.offset) {
-       xvmc_driver->alloc.ptr = NULL;
-       xvmc_driver->alloc.offset = 0;
-   } else if (xvmc_driver->alloc.ptr) {
-      free(xvmc_driver->alloc.ptr);
-      xvmc_driver->alloc.ptr = NULL;
-   }
+	int i;
 
-   memset(&xvmc_driver->batch, 0, sizeof(xvmc_driver->batch));
+	if ((xvmc_driver->batch.buf =
+	     drm_intel_bo_alloc(xvmc_driver->bufmgr,
+				"batch buffer", BATCH_SIZE, 0x1000)) == NULL) {
+		fprintf(stderr, "unable to alloc batch buffer\n");
+		return False;
+	}
+
+	drm_intel_gem_bo_map_gtt(xvmc_driver->batch.buf);
+
+	xvmc_driver->batch.init_ptr = xvmc_driver->batch.buf->virtual;
+	xvmc_driver->batch.size = BATCH_SIZE;
+	xvmc_driver->batch.space = BATCH_SIZE;
+	xvmc_driver->batch.ptr = xvmc_driver->batch.init_ptr;
+	return True;
 }
 
-
-Bool intelInitBatchBuffer(void)
+void intelFiniBatchBuffer(void)
 {
-    if (drmMap(xvmc_driver->fd,
-		xvmc_driver->batchbuffer.handle,
-		xvmc_driver->batchbuffer.size,
-		(drmAddress *)&xvmc_driver->batchbuffer.map) != 0) {
-	XVMC_ERR("fail to map batch buffer\n");
-	return False;
-    }
-
-    if (xvmc_driver->batchbuffer.map) {
-	xvmc_driver->alloc.size = xvmc_driver->batchbuffer.size;
-	xvmc_driver->alloc.offset = xvmc_driver->batchbuffer.offset;
-	xvmc_driver->alloc.ptr = xvmc_driver->batchbuffer.map;
-    } else {
-	xvmc_driver->alloc.size = 8 * 1024;
-	xvmc_driver->alloc.offset = 0;
-	xvmc_driver->alloc.ptr = malloc(xvmc_driver->alloc.size);
-    }
-
-    xvmc_driver->alloc.active_buf = 0;
-    assert(xvmc_driver->alloc.ptr);
-    return True;
+	drm_intel_gem_bo_unmap_gtt(xvmc_driver->batch.buf);
+
+	drm_intel_bo_unreference(xvmc_driver->batch.buf);
 }
 
-void intelFiniBatchBuffer(void)
+void intelFlushBatch(Bool refill)
 {
-    if (xvmc_driver->batchbuffer.map) {
-        drmUnmap(xvmc_driver->batchbuffer.map, xvmc_driver->batchbuffer.size);
-        xvmc_driver->batchbuffer.map = NULL;
-    }
-    intelDestroyBatchBuffer();
+	i965_end_batch();
+
+	drm_intel_gem_bo_unmap_gtt(xvmc_driver->batch.buf);
+
+	drm_intel_bo_exec(xvmc_driver->batch.buf,
+			  xvmc_driver->batch.ptr - xvmc_driver->batch.init_ptr,
+			  0, 0, 0);
+
+	drm_intel_bo_unreference(xvmc_driver->batch.buf);
+	if ((xvmc_driver->batch.buf =
+	     drm_intel_bo_alloc(xvmc_driver->bufmgr,
+				"batch buffer", BATCH_SIZE, 0x1000)) == NULL) {
+		fprintf(stderr, "unable to alloc batch buffer\n");
+	}
+
+	drm_intel_gem_bo_map_gtt(xvmc_driver->batch.buf);
+
+	xvmc_driver->batch.init_ptr = xvmc_driver->batch.buf->virtual;
+	xvmc_driver->batch.size = BATCH_SIZE;
+	xvmc_driver->batch.space = BATCH_SIZE;
+	xvmc_driver->batch.ptr = xvmc_driver->batch.init_ptr;
 }
 
-static void intelBatchbufferRequireSpace(unsigned int sz)
+void intelBatchbufferRequireSpace(int size)
 {
-   if (xvmc_driver->batch.space < sz)
-      intelFlushBatch(TRUE);
+	assert(xvmc_driver->batch.ptr - xvmc_driver->batch.init_ptr + size <
+	       xvmc_driver->batch.size - 8);
+	if (xvmc_driver->batch.ptr - xvmc_driver->batch.init_ptr + size
+	    >= xvmc_driver->batch.size - 8)
+		intelFlushBatch(1);
 }
 
 void intelBatchbufferData(const void *data, unsigned bytes, unsigned flags)
 {
-   assert((bytes & 0x3) == 0);
+	intelBatchbufferRequireSpace(bytes);
+	memcpy(xvmc_driver->batch.ptr, data, bytes);
+	xvmc_driver->batch.ptr += bytes;
+	xvmc_driver->batch.space -= bytes;
+}
 
-   intelBatchbufferRequireSpace(bytes);
-   memcpy(xvmc_driver->batch.ptr, data, bytes);
-   xvmc_driver->batch.ptr += bytes;
-   xvmc_driver->batch.space -= bytes;
-
-   assert(xvmc_driver->batch.space >= 0);
-}
-
-#define MI_FLUSH                ((0 << 29) | (4 << 23))
-#define FLUSH_MAP_CACHE         (1 << 0)
-#define FLUSH_RENDER_CACHE      (0 << 2)
-#define FLUSH_WRITE_DIRTY_STATE (1 << 4)
-
-static void intelRefillBatchLocked(Bool allow_unlock)
-{
-   unsigned half = xvmc_driver->alloc.size >> 1;
-   unsigned buf = (xvmc_driver->alloc.active_buf ^= 1);
-   unsigned dword[2];
-
-   dword[0] = MI_FLUSH | FLUSH_WRITE_DIRTY_STATE | FLUSH_RENDER_CACHE | FLUSH_MAP_CACHE;
-   dword[1] = 0;
-   intelCmdIoctl((char *)&dword[0], sizeof(dword));
-   xvmc_driver->alloc.irq_emitted = intelEmitIrqLocked();
-
-   if (xvmc_driver->alloc.irq_emitted) {
-       intelWaitIrq(xvmc_driver->alloc.irq_emitted);
-   }
-
-   xvmc_driver->batch.start_offset = xvmc_driver->alloc.offset + buf * half;
-   xvmc_driver->batch.ptr = (unsigned char *)xvmc_driver->alloc.ptr + buf * half;
-   xvmc_driver->batch.size = half - 8;
-   xvmc_driver->batch.space = half - 8;
-   assert(xvmc_driver->batch.space >= 0);
-}
-
-
-static void intelFlushBatchLocked(Bool ignore_cliprects,
-				  Bool refill,
-				  Bool allow_unlock)
-{
-   drmI830BatchBuffer batch;
-
-   if (xvmc_driver->batch.space != xvmc_driver->batch.size) {
-
-      batch.start = xvmc_driver->batch.start_offset;
-      batch.used = xvmc_driver->batch.size - xvmc_driver->batch.space;
-      batch.cliprects = 0;
-      batch.num_cliprects = 0;
-      batch.DR1 = 0;
-      batch.DR4 = 0;
-
-      if (xvmc_driver->alloc.offset) {
-          if ((batch.used & 0x4) == 0) {
-              ((int *)xvmc_driver->batch.ptr)[0] = 0;
-              ((int *)xvmc_driver->batch.ptr)[1] = MI_BATCH_BUFFER_END;
-              batch.used += 0x8;
-              xvmc_driver->batch.ptr += 0x8;
-          } else {
-              ((int *)xvmc_driver->batch.ptr)[0] = MI_BATCH_BUFFER_END;
-              batch.used += 0x4;
-              xvmc_driver->batch.ptr += 0x4;
-          }
-      }
-
-      xvmc_driver->batch.start_offset += batch.used;
-      xvmc_driver->batch.size -= batch.used;
-
-      if (xvmc_driver->batch.size < 8) {
-         refill = TRUE;
-         xvmc_driver->batch.space = xvmc_driver->batch.size = 0;
-      }
-      else {
-         xvmc_driver->batch.size -= 8;
-         xvmc_driver->batch.space = xvmc_driver->batch.size;
-      }
-
-      assert(xvmc_driver->batch.space >= 0);
-      assert(batch.start >= xvmc_driver->alloc.offset);
-      assert(batch.start < xvmc_driver->alloc.offset + xvmc_driver->alloc.size);
-      assert(batch.start + batch.used > xvmc_driver->alloc.offset);
-      assert(batch.start + batch.used <= xvmc_driver->alloc.offset + xvmc_driver->alloc.size);
-
-      if (xvmc_driver->alloc.offset) {
-          if (drmCommandWrite(xvmc_driver->fd, DRM_I830_BATCHBUFFER, &batch, sizeof(batch))) {
-              fprintf(stderr, "DRM_I830_BATCHBUFFER: %d\n",  -errno);
-              exit(1);
-          }
-      } else {
-         drmI830CmdBuffer cmd;
-         cmd.buf = (char *)xvmc_driver->alloc.ptr + batch.start;
-         cmd.sz = batch.used;
-         cmd.DR1 = batch.DR1;
-         cmd.DR4 = batch.DR4;
-         cmd.num_cliprects = batch.num_cliprects;
-         cmd.cliprects = batch.cliprects;
-
-         if (drmCommandWrite(xvmc_driver->fd, DRM_I830_CMDBUFFER, 
-                             &cmd, sizeof(cmd))) {
-            fprintf(stderr, "DRM_I915_CMDBUFFER: %d\n",  -errno);
-            exit(1);
-         }
-      }
-   }
-
-   if (refill)
-      intelRefillBatchLocked(allow_unlock);
-}
-
-void intelFlushBatch(Bool refill )
-{
-   intelFlushBatchLocked(FALSE, refill, TRUE);
-}
-
-void intelCmdIoctl(char *buf, unsigned used)
-{
-   drmI830CmdBuffer cmd;
-
-   cmd.buf = buf;
-   cmd.sz = used;
-   cmd.cliprects = 0;
-   cmd.num_cliprects = 0;
-   cmd.DR1 = 0;
-   cmd.DR4 = 0;
-
-   if (drmCommandWrite(xvmc_driver->fd, DRM_I830_CMDBUFFER, 
-                       &cmd, sizeof(cmd))) {
-      fprintf(stderr, "DRM_I830_CMDBUFFER: %d\n",  -errno);
-      exit(1);
-   }
+void intel_batch_emit_reloc(dri_bo * bo, uint32_t read_domain,
+			    uint32_t write_domain, uint32_t delta,
+			    unsigned char *ptr)
+{
+	drm_intel_bo_emit_reloc(xvmc_driver->batch.buf,
+				ptr - xvmc_driver->batch.init_ptr, bo, delta,
+				read_domain, write_domain);
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.h new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.h	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_batchbuffer.h	2011-02-08 11:14:00.000000000 +0100
@@ -10,6 +10,7 @@ extern int VERBOSE;
 
 #define BEGIN_BATCH(n)                                                  \
     do {                                                                \
+	assert(xvmc_driver->batch.space >= (n) *4);			\
         if (xvmc_driver->batch.space < (n)*4)                           \
             intelFlushBatch(TRUE);                            		\
         batch_ptr = xvmc_driver->batch.ptr;                             \
@@ -21,6 +22,13 @@ extern int VERBOSE;
         batch_ptr += 4;                                                 \
     } while (0)
 
+#define OUT_RELOC(bo,read_domains,write_domains,delta)  \
+    do { \
+        *(unsigned int *)batch_ptr = delta + bo->offset; \
+        intel_batch_emit_reloc(bo, read_domains, write_domains, delta, batch_ptr); \
+        batch_ptr += 4;                                                 \
+    } while (0)
+
 #define OUT_BATCH_SHORT(n)                                              \
     do {                                                                \
         *(short *)batch_ptr = (n);                                      \
@@ -44,4 +52,7 @@ extern void intelBatchbufferData(const v
 extern Bool intelInitBatchBuffer(void);
 extern void intelFiniBatchBuffer(void);
 extern void intelCmdIoctl(char *, unsigned);
+extern void intel_batch_emit_reloc(dri_bo * bo, uint32_t read_domain,
+				   uint32_t write_domain, uint32_t delta,
+				   unsigned char *);
 #endif /* _INTEL_BATCHBUFFER_H */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c	2011-01-22 22:15:16.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c	2011-02-08 11:14:00.000000000 +0100
@@ -25,6 +25,11 @@
  *
  */
 #include "intel_xvmc.h"
+#include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
+#include <xcb/dri2.h>
+#include <X11/Xlib-xcb.h>
+#include <X11/extensions/dri2tokens.h>
 
 /* global */
 struct _intel_xvmc_driver *xvmc_driver = NULL;
@@ -32,222 +37,160 @@ struct _intel_xvmc_driver *xvmc_driver =
 /* Lookup tables to speed common calculations for coded_block_pattern */
 /* each block is ((8*8) * sizeof(short)) */
 unsigned int mb_bytes_420[] = {
-    0, /* 0 */
-    128, /* 1 */
-    128, /* 10 */
-    256, /* 11 */
-    128, /* 100 */
-    256, /* 101 */
-    256, /* 110 */
-    384, /* 111 */
-    128, /* 1000 */
-    256, /* 1001 */
-    256, /* 1010 */
-    384, /* 1011 */
-    256, /* 1100 */
-    384, /* 1101 */
-    384, /* 1110 */
-    512, /* 1111 */
-    128, /* 10000 */
-    256, /* 10001 */
-    256, /* 10010 */
-    384, /* 10011 */
-    256, /* 10100 */
-    384, /* 10101 */
-    384, /* 10110 */
-    512, /* 10111 */
-    256, /* 11000 */
-    384, /* 11001 */
-    384, /* 11010 */
-    512, /* 11011 */
-    384, /* 11100 */
-    512, /* 11101 */
-    512, /* 11110 */
-    640, /* 11111 */
-    128, /* 100000 */
-    256, /* 100001 */
-    256, /* 100010 */
-    384, /* 100011 */
-    256, /* 100100 */
-    384, /* 100101 */
-    384, /* 100110 */
-    512, /* 100111 */
-    256, /* 101000 */
-    384, /* 101001 */
-    384, /* 101010 */
-    512, /* 101011 */
-    384, /* 101100 */
-    512, /* 101101 */
-    512, /* 101110 */
-    640, /* 101111 */
-    256, /* 110000 */
-    384, /* 110001 */
-    384, /* 110010 */
-    512, /* 110011 */
-    384, /* 110100 */
-    512, /* 110101 */
-    512, /* 110110 */
-    640, /* 110111 */
-    384, /* 111000 */
-    512, /* 111001 */
-    512, /* 111010 */
-    640, /* 111011 */
-    512, /* 111100 */
-    640, /* 111101 */
-    640, /* 111110 */
-    768  /* 111111 */
+	0,			/* 0 */
+	128,			/* 1 */
+	128,			/* 10 */
+	256,			/* 11 */
+	128,			/* 100 */
+	256,			/* 101 */
+	256,			/* 110 */
+	384,			/* 111 */
+	128,			/* 1000 */
+	256,			/* 1001 */
+	256,			/* 1010 */
+	384,			/* 1011 */
+	256,			/* 1100 */
+	384,			/* 1101 */
+	384,			/* 1110 */
+	512,			/* 1111 */
+	128,			/* 10000 */
+	256,			/* 10001 */
+	256,			/* 10010 */
+	384,			/* 10011 */
+	256,			/* 10100 */
+	384,			/* 10101 */
+	384,			/* 10110 */
+	512,			/* 10111 */
+	256,			/* 11000 */
+	384,			/* 11001 */
+	384,			/* 11010 */
+	512,			/* 11011 */
+	384,			/* 11100 */
+	512,			/* 11101 */
+	512,			/* 11110 */
+	640,			/* 11111 */
+	128,			/* 100000 */
+	256,			/* 100001 */
+	256,			/* 100010 */
+	384,			/* 100011 */
+	256,			/* 100100 */
+	384,			/* 100101 */
+	384,			/* 100110 */
+	512,			/* 100111 */
+	256,			/* 101000 */
+	384,			/* 101001 */
+	384,			/* 101010 */
+	512,			/* 101011 */
+	384,			/* 101100 */
+	512,			/* 101101 */
+	512,			/* 101110 */
+	640,			/* 101111 */
+	256,			/* 110000 */
+	384,			/* 110001 */
+	384,			/* 110010 */
+	512,			/* 110011 */
+	384,			/* 110100 */
+	512,			/* 110101 */
+	512,			/* 110110 */
+	640,			/* 110111 */
+	384,			/* 111000 */
+	512,			/* 111001 */
+	512,			/* 111010 */
+	640,			/* 111011 */
+	512,			/* 111100 */
+	640,			/* 111101 */
+	640,			/* 111110 */
+	768			/* 111111 */
 };
 
-int debug;
-
-static int error_base;
-static int event_base;
-
-static void intel_xvmc_debug_init(void)
-{
-    if (getenv("INTEL_XVMC_DEBUG"))
-	debug = 1;
-}
-
-/* locking */
-static void intel_xvmc_try_heavy_lock(drm_context_t ctx)
-{
-    drmGetLock(xvmc_driver->fd, ctx, 0);
-}
-
 void LOCK_HARDWARE(drm_context_t ctx)
 {
-    char __ret = 0;
-
-    PPTHREAD_MUTEX_LOCK();
-    assert(!xvmc_driver->locked);
-
-    DRM_CAS(xvmc_driver->driHwLock, ctx,
-            (DRM_LOCK_HELD | ctx), __ret);
+	char __ret = 0;
 
-    if (__ret)
-	intel_xvmc_try_heavy_lock(ctx);
+	PPTHREAD_MUTEX_LOCK();
+	assert(!xvmc_driver->locked);
 
-    xvmc_driver->locked = 1;
+	xvmc_driver->locked = 1;
 }
 
 void UNLOCK_HARDWARE(drm_context_t ctx)
 {
-    xvmc_driver->locked = 0;
-    DRM_UNLOCK(xvmc_driver->fd, xvmc_driver->driHwLock, ctx);
-    PPTHREAD_MUTEX_UNLOCK();
-}
-
-static intel_xvmc_context_ptr intel_xvmc_new_context(Display *dpy)
-{
-    intel_xvmc_context_ptr ret;
-
-    ret = (intel_xvmc_context_ptr)calloc(1, sizeof(intel_xvmc_context_t));
-    if (!ret)
-	return NULL;
-
-    if (!xvmc_driver->ctx_list)
-	ret->next = NULL;
-    else
-	ret->next = xvmc_driver->ctx_list;
-    xvmc_driver->ctx_list = ret;
-    xvmc_driver->num_ctx++;
-
-    return ret;
+	xvmc_driver->locked = 0;
 
+	PPTHREAD_MUTEX_UNLOCK();
 }
 
-static void intel_xvmc_free_context(XID id)
+static int
+dri2_connect(Display *display)
 {
-    intel_xvmc_context_ptr p = xvmc_driver->ctx_list;
-    intel_xvmc_context_ptr pre = p;
+	xcb_dri2_query_version_cookie_t query_version_cookie;
+	xcb_dri2_query_version_reply_t *query_version_reply;
+	xcb_dri2_connect_cookie_t connect_cookie;
+	xcb_dri2_connect_reply_t *connect_reply;
+	xcb_dri2_authenticate_cookie_t auth_cookie;
+	xcb_dri2_authenticate_reply_t *auth_reply;
+	xcb_screen_t *root;
+	xcb_connection_t *c = XGetXCBConnection(display);
+	drm_magic_t magic;
+	const xcb_query_extension_reply_t *dri2_reply;
+	char *device_name;
+	int len;
 
-    while(p) {
-	if (p->context && p->context->context_id == id) {
-	    if (p == xvmc_driver->ctx_list)
-		xvmc_driver->ctx_list = p->next;
-	    else
-		pre->next = p->next;
-	    break;
-	}
-	pre = p;
-	p = p->next;
-    }
+	root = xcb_aux_get_screen(c, DefaultScreen(display));
 
-    if (p) {
-	free(p);
-	xvmc_driver->num_ctx--;
-    }
-}
+	dri2_reply = xcb_get_extension_data(c, &xcb_dri2_id);
 
-intel_xvmc_context_ptr intel_xvmc_find_context(XID id)
-{
-    intel_xvmc_context_ptr p = xvmc_driver->ctx_list;
-
-    while(p) {
-	if (p->context && p->context->context_id == id)
-	    return p;
-	p = p->next;
-    }
-    return NULL;
-}
-
-static intel_xvmc_surface_ptr intel_xvmc_new_surface(Display *dpy)
-{
-    intel_xvmc_surface_ptr ret;
-
-    ret = (intel_xvmc_surface_ptr)calloc(1, sizeof(intel_xvmc_surface_t));
-    if (!ret)
-	return NULL;
-
-    if (!xvmc_driver->surf_list)
-	ret->next = NULL;
-    else
-	ret->next = xvmc_driver->surf_list;
-    xvmc_driver->surf_list = ret;
-    xvmc_driver->num_surf++;
+	if (!dri2_reply) {
+		XVMC_ERR("DRI2 required");
+		return BadValue;
+	}
 
-    ret->image = NULL;
-    ret->gc_init = FALSE;
+	/* Query the extension and make our first use of it at the same time. */
+	query_version_cookie = xcb_dri2_query_version(c, 1, 0);
+	connect_cookie = xcb_dri2_connect(c, root->root, DRI2DriverDRI);
+
+	query_version_reply =
+		xcb_dri2_query_version_reply(c, query_version_cookie, NULL);
+	connect_reply = xcb_dri2_connect_reply(c, connect_cookie, NULL);
 
-    return ret;
+	if (!query_version_reply) {
+		XVMC_ERR("DRI2 required");
+		return BadValue;
+	}
+	free(query_version_reply);
 
-}
+	len = xcb_dri2_connect_device_name_length(connect_reply);
+	device_name = malloc(len + 1);
+	if (!device_name) {
+		XVMC_ERR("malloc failure");
+		return BadAlloc;
+	}
+	strncpy(device_name, xcb_dri2_connect_device_name(connect_reply), len);
+	device_name[len] = 0;
+	xvmc_driver->fd = open(device_name, O_RDWR);
+	free(device_name);
+	free(connect_reply);
+	if (xvmc_driver->fd < 0) {
+		XVMC_ERR("Failed to open drm device: %s\n", strerror(errno));
+		return BadValue;
+	}
 
-static void intel_xvmc_free_surface(XID id)
-{
-    intel_xvmc_surface_ptr p = xvmc_driver->surf_list;
-    intel_xvmc_surface_ptr pre = p;
+	if (drmGetMagic(xvmc_driver->fd, &magic)) {
+		XVMC_ERR("Failed to get magic\n");
+		return BadValue;
+	}
 
-    while(p) {
-	if (p->surface && p->surface->surface_id == id) {
-	    if (p == xvmc_driver->surf_list)
-		xvmc_driver->surf_list = p->next;
-	    else
-		pre->next = p->next;
-	    break;
+	auth_cookie = xcb_dri2_authenticate(c, root->root, magic);
+	auth_reply = xcb_dri2_authenticate_reply(c, auth_cookie, NULL);
+	if (!auth_reply) {
+		XVMC_ERR("Failed to authenticate magic %d\n", magic);
+		return BadValue;
 	}
-	pre = p;
-	p = p->next;
-    }
+	free(auth_reply);
 
-    if (p) {
-	free(p);
-	xvmc_driver->num_surf--;
-    }
+	return Success;
 }
 
-intel_xvmc_surface_ptr intel_xvmc_find_surface(XID id)
-{
-    intel_xvmc_surface_ptr p = xvmc_driver->surf_list;
-
-    while(p) {
-	if (p->surface && p->surface->surface_id == id)
-	    return p;
-	p = p->next;
-    }
-    return NULL;
-}
 /*
 * Function: XvMCCreateContext
 * Description: Create a XvMC context for the given surface parameters.
@@ -264,190 +207,137 @@ intel_xvmc_surface_ptr intel_xvmc_find_s
 *        returned by XvMCListSurfaceTypes.
 * Returns: Status
 */
-_X_EXPORT Status XvMCCreateContext(Display *display, XvPortID port,
-                         int surface_type_id, int width, int height,
-                         int flags, XvMCContext *context)
-{
-    Status ret;
-    drm_sarea_t *pSAREA;
-    char *curBusID;
-    CARD32 *priv_data = NULL;
-    struct _intel_xvmc_common *comm;
-    drm_magic_t magic;
-    int major, minor;
-    int priv_count;
-    int isCapable;
-    int screen = DefaultScreen(display);
-    intel_xvmc_context_ptr intel_ctx;
-    int fd;
-
-    /* Verify Obvious things first */
-    if (!display || !context)
-        return BadValue;
-
-    if (!(flags & XVMC_DIRECT)) {
-        XVMC_ERR("Indirect Rendering not supported! Using Direct.");
-        return BadValue;
-    }
-
-    intel_xvmc_debug_init();
-
-    /*
-       Width, Height, and flags are checked against surface_type_id
-       and port for validity inside the X server, no need to check
-       here.
-    */
-    context->surface_type_id = surface_type_id;
-    context->width = (unsigned short)((width + 15) & ~15);
-    context->height = (unsigned short)((height + 15) & ~15);
-    context->flags = flags;
-    context->port = port;
-
-    if (!XvMCQueryExtension(display, &event_base, &error_base)) {
-        XVMC_ERR("XvMCExtension is not available!");
-        return BadValue;
-    }
-    ret = XvMCQueryVersion(display, &major, &minor);
-    if (ret) {
-        XVMC_ERR("XvMCQueryVersion Failed, unable to determine protocol version.");
-	return ret;
-    }
+_X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port,
+				   int surface_type_id, int width, int height,
+				   int flags, XvMCContext * context)
+{
+	Status ret;
+	CARD32 *priv_data = NULL;
+	struct intel_xvmc_hw_context *comm;
+	int major, minor;
+	int error_base;
+	int event_base;
+	int priv_count;
+	int isCapable;
+	int screen = DefaultScreen(display);
+	intel_xvmc_context_ptr intel_ctx;
+	int fd;
+	char *driverName = NULL, *deviceName = NULL;
 
-    /* XXX: major and minor could be checked in future for XvMC
-     * protocol capability (i.e H.264/AVC decode available)
-     */
-
-    /*
-      Pass control to the X server to create a drm_context_t for us and
-      validate the with/height and flags.
-    */
-    if ((ret = _xvmc_create_context(display, context, &priv_count, &priv_data))) {
-        XVMC_ERR("Unable to create XvMC Context.");
-        return ret;
-    }
-    XVMC_DBG("new context %d created\n", (int)context->context_id);
-
-    comm = (struct _intel_xvmc_common *)priv_data;
-
-    if (xvmc_driver == NULL || xvmc_driver->type != comm->type) {
-	switch (comm->type) {
-	    case XVMC_I915_MPEG2_MC:
-		xvmc_driver = &i915_xvmc_mc_driver;
-		break;
-	    case XVMC_I965_MPEG2_MC:
-		xvmc_driver = &i965_xvmc_mc_driver;
-		break;
-	    case XVMC_I945_MPEG2_VLD:
-	    case XVMC_I965_MPEG2_VLD:
-	    default:
-		XVMC_ERR("unimplemented xvmc type %d", comm->type);
-		XFree(priv_data);
-		priv_data = NULL;
+	/* Verify Obvious things first */
+	if (!display || !context)
+		return BadValue;
+
+	if (!(flags & XVMC_DIRECT)) {
+		XVMC_ERR("Indirect Rendering not supported! Using Direct.");
 		return BadValue;
 	}
-    }
 
-    if (xvmc_driver == NULL || xvmc_driver->type != comm->type) {
-	XVMC_ERR("fail to load xvmc driver for type %d\n", comm->type);
-	return BadValue;
-    }
+	/*
+	   Width, Height, and flags are checked against surface_type_id
+	   and port for validity inside the X server, no need to check
+	   here.
+	 */
+	context->surface_type_id = surface_type_id;
+	context->width = (unsigned short)((width + 15) & ~15);
+	context->height = (unsigned short)((height + 15) & ~15);
+	context->flags = flags;
+	context->port = port;
 
-    XVMC_INFO("decoder type is %s", intel_xvmc_decoder_string(comm->type));
+	if (!XvMCQueryExtension(display, &event_base, &error_base)) {
+		XVMC_ERR("XvMCExtension is not available!");
+		return BadValue;
+	}
 
-    xvmc_driver->sarea_size = comm->sarea_size;
-    xvmc_driver->batchbuffer.handle = comm->batchbuffer.handle;
-    xvmc_driver->batchbuffer.offset = comm->batchbuffer.offset;
-    xvmc_driver->batchbuffer.size = comm->batchbuffer.size;
-
-    /* assign local ctx info */
-    intel_ctx = intel_xvmc_new_context(display);
-    if (!intel_ctx) {
-	XVMC_ERR("Intel XvMC context create fail\n");
-	return BadAlloc;
-    }
-    intel_ctx->context = context;
-
-    ret = uniDRIQueryDirectRenderingCapable(display, screen,
-                                            &isCapable);
-    if (!ret || !isCapable) {
-	XVMC_ERR("Direct Rendering is not available on this system!");
-	XFree(priv_data);
-        return BadValue;
-    }
+	ret = XvMCQueryVersion(display, &major, &minor);
+	if (ret) {
+		XVMC_ERR
+		    ("XvMCQueryVersion Failed, unable to determine protocol version.");
+		return ret;
+	}
 
-    if (!uniDRIOpenConnection(display, screen,
-                              &xvmc_driver->hsarea, &curBusID)) {
-        XVMC_ERR("Could not open DRI connection to X server!");
-	XFree(priv_data);
-        return BadValue;
-    }
+	/* XXX: major and minor could be checked in future for XvMC
+	 * protocol capability (i.e H.264/AVC decode available)
+	 */
+
+	/*
+	   Pass control to the X server to create a drm_context_t for us and
+	   validate the with/height and flags.
+	 */
+	if ((ret =
+	     _xvmc_create_context(display, context, &priv_count, &priv_data))) {
+		XVMC_ERR("Unable to create XvMC Context.");
+		return ret;
+	}
 
-    /* Open DRI Device */
-    if((fd = drmOpen("i915", curBusID)) < 0) {
-        XVMC_ERR("DRM Device could not be opened.");
-        XFree(priv_data);
-        XFree(curBusID);
-        return BadValue;
-    }
-
-    xvmc_driver->fd = fd;
-
-    strncpy(xvmc_driver->busID, curBusID, 20);
-    xvmc_driver->busID[20] = '\0';
-    XFree(curBusID);
-
-    /* Get magic number */
-    drmGetMagic(xvmc_driver->fd, &magic);
-    // context->flags = (unsigned long)magic;
-
-    if (!uniDRIAuthConnection(display, screen, magic)) {
-	XVMC_ERR("[XvMC]: X server did not allow DRI. Check permissions.");
-	xvmc_driver = NULL;
-	XFree(priv_data);
-        return BadAlloc;
-    }
+	comm = (struct intel_xvmc_hw_context *)priv_data;
 
-    /*
-     * Map DRI Sarea. we always want it right?
-     */
-    if (drmMap(xvmc_driver->fd, xvmc_driver->hsarea,
-               xvmc_driver->sarea_size, &xvmc_driver->sarea_address) < 0) {
-        XVMC_ERR("Unable to map DRI SAREA.\n");
-	xvmc_driver = NULL;
-	XFree(priv_data);
-        return BadAlloc;
-    }
-    pSAREA = (drm_sarea_t *)xvmc_driver->sarea_address;
-    xvmc_driver->driHwLock = (drmLock *)&pSAREA->lock;
-    pthread_mutex_init(&xvmc_driver->ctxmutex, NULL);
-
-    /* context_id is alloc in _xvmc_create_context */
-    if (!uniDRICreateContext(display, screen, DefaultVisual(display, screen),
-			     context->context_id,
-                             &intel_ctx->hw_context)) {
-        XVMC_ERR("Could not create DRI context for xvmc ctx %d.",
-		 (int)context->context_id);
-	XFree(priv_data);
-        context->privData = NULL;
-        drmUnmap(xvmc_driver->sarea_address, xvmc_driver->sarea_size);
-        return BadAlloc;
-    }
-
-    /* call driver hook.
-     * driver hook should free priv_data after return if success.*/
-    ret = (xvmc_driver->create_context)(display, context, priv_count, priv_data);
-    if (ret) {
-	XVMC_ERR("driver create context failed\n");
-	XFree(priv_data);
-	drmUnmap(xvmc_driver->sarea_address, xvmc_driver->sarea_size);
-	return ret;
-    }
+	if (xvmc_driver == NULL || xvmc_driver->type != comm->type) {
+		switch (comm->type) {
+		case XVMC_I915_MPEG2_MC:
+			xvmc_driver = &i915_xvmc_mc_driver;
+			break;
+		case XVMC_I965_MPEG2_MC:
+			xvmc_driver = &i965_xvmc_mc_driver;
+			break;
+		case XVMC_I965_MPEG2_VLD:
+			xvmc_driver = &xvmc_vld_driver;
+			break;
+		case XVMC_I945_MPEG2_VLD:
+		default:
+			XVMC_ERR("unimplemented xvmc type %d", comm->type);
+			XFree(priv_data);
+			priv_data = NULL;
+			return BadValue;
+		}
+	}
+
+	if (xvmc_driver == NULL || xvmc_driver->type != comm->type) {
+		XVMC_ERR("fail to load xvmc driver for type %d\n", comm->type);
+		return BadValue;
+	}
+
+	XVMC_INFO("decoder type is %s", intel_xvmc_decoder_string(comm->type));
 
-    intelInitBatchBuffer();
+	/* check DRI2 */
+	ret = Success;
+	xvmc_driver->fd = -1;
 
-    intel_xvmc_dump_open();
+	ret = dri2_connect(display);
+	if (ret != Success) {
+		XFree(priv_data);
+		context->privData = NULL;
+		if (xvmc_driver->fd >= 0)
+			close(xvmc_driver->fd);
+		xvmc_driver = NULL;
+		return ret;
+	}
+
+	if ((xvmc_driver->bufmgr =
+	     intel_bufmgr_gem_init(xvmc_driver->fd, 1024 * 64)) == NULL) {
+		XVMC_ERR("Can't init bufmgr\n");
+		return BadAlloc;
+	}
+	drm_intel_bufmgr_gem_enable_reuse(xvmc_driver->bufmgr);
 
-    return Success;
+	/* call driver hook.
+	 * driver hook should free priv_data after return if success.*/
+	ret =
+	    (xvmc_driver->create_context) (display, context, priv_count,
+					   priv_data);
+	if (ret) {
+		XVMC_ERR("driver create context failed\n");
+		XFree(priv_data);
+		context->privData = NULL;
+		xvmc_driver = NULL;
+		return ret;
+	}
+
+	pthread_mutex_init(&xvmc_driver->ctxmutex, NULL);
+	intelInitBatchBuffer();
+	intel_xvmc_dump_open();
+
+	return Success;
 }
 
 /*
@@ -459,204 +349,218 @@ _X_EXPORT Status XvMCCreateContext(Displ
  *   context - The context to be destroyed.
  *
  */
-_X_EXPORT Status XvMCDestroyContext(Display *display, XvMCContext *context)
+_X_EXPORT Status XvMCDestroyContext(Display * display, XvMCContext * context)
 {
-    Status ret;
-    int screen;
+	Status ret;
+	int screen;
 
-    if (!display || !context)
-        return XvMCBadContext;
-    screen = DefaultScreen(display);
-    ret = (xvmc_driver->destroy_context)(display, context);
-    if (ret) {
-	XVMC_ERR("destroy context fail\n");
-	return ret;
-    }
-
-    uniDRIDestroyContext(display, screen, context->context_id);
-    intel_xvmc_free_context(context->context_id);
-
-    ret = _xvmc_destroy_context(display, context);
-    if (ret != Success) {
-	XVMC_ERR("_xvmc_destroy_context fail\n");
-	return ret;
-    }
+	if (!display || !context)
+		return XvMCBadContext;
+	screen = DefaultScreen(display);
+	ret = (xvmc_driver->destroy_context) (display, context);
+	if (ret) {
+		XVMC_ERR("destroy context fail\n");
+		return ret;
+	}
 
-    if (xvmc_driver->num_ctx == 0) {
-	uniDRICloseConnection(display, screen);
+	intelFiniBatchBuffer();
 
-	pthread_mutex_destroy(&xvmc_driver->ctxmutex);
+	dri_bufmgr_destroy(xvmc_driver->bufmgr);
 
-	drmUnmap(xvmc_driver->sarea_address, xvmc_driver->sarea_size);
+	ret = _xvmc_destroy_context(display, context);
+	if (ret != Success) {
+		XVMC_ERR("_xvmc_destroy_context fail\n");
+		return ret;
+	}
 
-	if (xvmc_driver->fd >= 0)
-	    drmClose(xvmc_driver->fd);
-	xvmc_driver->fd = -1;
+	if (xvmc_driver->num_ctx == 0) {
+		pthread_mutex_destroy(&xvmc_driver->ctxmutex);
 
-	intelFiniBatchBuffer();
+		if (xvmc_driver->fd >= 0)
+			close(xvmc_driver->fd);
 
-	intel_xvmc_dump_close();
-    }
-    return Success;
+		xvmc_driver->fd = -1;
+		intel_xvmc_dump_close();
+	}
+	return Success;
 }
 
 /*
  * Function: XvMCCreateSurface
  */
-_X_EXPORT Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *surface)
+_X_EXPORT Status XvMCCreateSurface(Display * display, XvMCContext * context,
+				   XvMCSurface * surface)
 {
-    Status ret;
-    int priv_count;
-    CARD32 *priv_data;
-    intel_xvmc_surface_ptr intel_surf = NULL;
-
-    if (!display || !context)
-        return XvMCBadContext;
-
-    if (!surface)
-	return XvMCBadSurface;
-
-    intel_surf = intel_xvmc_new_surface(display);
-    if (!intel_surf)
-	return BadAlloc;
-    intel_surf->surface = surface;
-
-    if ((ret = _xvmc_create_surface(display, context, surface,
-                                    &priv_count, &priv_data))) {
-        XVMC_ERR("Unable to create XvMCSurface.");
-        return ret;
-    }
-
-    intel_surf->image = XvCreateImage(display, context->port,
-	    FOURCC_XVMC, (char *)&intel_surf->data, surface->width,
-	    surface->height);
-    if (!intel_surf->image) {
-	XVMC_ERR("Can't create XvImage for surface\n");
-	_xvmc_destroy_surface(display, surface);
-	intel_xvmc_free_surface(surface->surface_id);
-	return BadAlloc;
-    }
-    intel_surf->image->data = (char *)&intel_surf->data;
-
-    ret = (xvmc_driver->create_surface)(display, context, surface, priv_count,
-	    priv_data);
-    if (ret) {
-	XVMC_ERR("create surface failed\n");
-	return ret;
-    }
+	Status ret;
+	int priv_count;
+	CARD32 *priv_data;
+	intel_xvmc_surface_ptr intel_surf = NULL;
+	struct intel_xvmc_context *intel_ctx;
+
+	if (!display || !context)
+		return XvMCBadContext;
+
+	if (!surface)
+		return XvMCBadSurface;
+
+	intel_ctx = context->privData;
+
+	if ((ret = _xvmc_create_surface(display, context, surface,
+					&priv_count, &priv_data))) {
+		XVMC_ERR("Unable to create XvMCSurface.");
+		return ret;
+	}
 
-    return Success;
-}
+	XFree(priv_data);
 
+	surface->privData = calloc(1, sizeof(struct intel_xvmc_surface));
+
+	if (!(intel_surf = surface->privData)) {
+		PPTHREAD_MUTEX_UNLOCK();
+		return BadAlloc;
+	}
+
+	intel_surf->bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+					      "surface",
+					      intel_ctx->surface_bo_size,
+					      GTT_PAGE_SIZE);
+	if (!intel_surf->bo) {
+		free(intel_surf);
+		return BadAlloc;
+	}
+
+	drm_intel_bo_disable_reuse(intel_surf->bo);
+
+	intel_surf = surface->privData;
+	intel_surf->context = context;
+
+	intel_surf->image = XvCreateImage(display, context->port,
+					  FOURCC_XVMC,
+					  (char *) &intel_surf->gem_handle,
+					  surface->width, surface->height);
+	if (!intel_surf->image) {
+		XVMC_ERR("Can't create XvImage for surface\n");
+		free(intel_surf);
+		_xvmc_destroy_surface(display, surface);
+		return BadAlloc;
+	}
+
+	return Success;
+}
 
 /*
  * Function: XvMCDestroySurface
  */
-_X_EXPORT Status XvMCDestroySurface(Display *display, XvMCSurface *surface)
+_X_EXPORT Status XvMCDestroySurface(Display * display, XvMCSurface * surface)
 {
-    intel_xvmc_surface_ptr intel_surf;
+	intel_xvmc_surface_ptr intel_surf;
 
-    if (!display || !surface)
-        return XvMCBadSurface;
+	if (!display || !surface)
+		return XvMCBadSurface;
 
-    intel_surf = intel_xvmc_find_surface(surface->surface_id);
-    if (!intel_surf)
-	return XvMCBadSurface;
+	intel_surf = surface->privData;
+	if (!intel_surf)
+		return XvMCBadSurface;
 
-    XFree(intel_surf->image);
-    if (intel_surf->gc_init)
-	XFreeGC(display, intel_surf->gc);
-    intel_xvmc_free_surface(surface->surface_id);
+	XFree(intel_surf->image);
+	if (intel_surf->gc_init)
+		XFreeGC(display, intel_surf->gc);
 
-    (xvmc_driver->destroy_surface)(display, surface);
+	drm_intel_bo_unreference(intel_surf->bo);
 
-    _xvmc_destroy_surface(display, surface);
+	free(intel_surf);
 
-    return Success;
+	_xvmc_destroy_surface(display, surface);
+
+	return Success;
 }
 
 /*
  * Function: XvMCCreateBlocks
  */
-_X_EXPORT Status XvMCCreateBlocks(Display *display, XvMCContext *context,
-                        unsigned int num_blocks,
-                        XvMCBlockArray *block)
+_X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context,
+				  unsigned int num_blocks,
+				  XvMCBlockArray * block)
 {
-    Status ret;
-    if (!display || !context || !num_blocks || !block)
-        return BadValue;
-
-    memset(block, 0, sizeof(XvMCBlockArray));
+	Status ret;
+	if (!display || !context || !num_blocks || !block)
+		return BadValue;
 
-    if (!(block->blocks = (short *)malloc((num_blocks << 6) * sizeof(short))))
-        return BadAlloc;
+	memset(block, 0, sizeof(XvMCBlockArray));
 
-    block->num_blocks = num_blocks;
-    block->context_id = context->context_id;
-    block->privData = NULL;
+	if (!
+	    (block->blocks =
+	     (short *)malloc((num_blocks << 6) * sizeof(short))))
+		return BadAlloc;
+
+	block->num_blocks = num_blocks;
+	block->context_id = context->context_id;
+	block->privData = NULL;
 
-    return Success;
+	return Success;
 }
 
 /*
  * Function: XvMCDestroyBlocks
  */
-_X_EXPORT Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block)
+_X_EXPORT Status XvMCDestroyBlocks(Display * display, XvMCBlockArray * block)
 {
-    Status ret;
-    if (!display || !block)
-        return BadValue;
+	Status ret;
+	if (!display || !block)
+		return BadValue;
 
-    if (block->blocks)
-        free(block->blocks);
+	if (block->blocks)
+		free(block->blocks);
 
-    block->context_id = 0;
-    block->num_blocks = 0;
-    block->blocks = NULL;
-    block->privData = NULL;
+	block->context_id = 0;
+	block->num_blocks = 0;
+	block->blocks = NULL;
+	block->privData = NULL;
 
-    return Success;
+	return Success;
 }
 
 /*
  * Function: XvMCCreateMacroBlocks
  */
-_X_EXPORT Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context,
-                             unsigned int num_blocks,
-                             XvMCMacroBlockArray *blocks)
+_X_EXPORT Status XvMCCreateMacroBlocks(Display * display, XvMCContext * context,
+				       unsigned int num_blocks,
+				       XvMCMacroBlockArray * blocks)
 {
-    if (!display || !context || !blocks || !num_blocks)
-        return BadValue;
-
-    memset(blocks, 0, sizeof(XvMCMacroBlockArray));
-    blocks->macro_blocks = (XvMCMacroBlock *)malloc(num_blocks * sizeof(XvMCMacroBlock));
-
-    if (!blocks->macro_blocks)
-        return BadAlloc;
+	if (!display || !context || !blocks || !num_blocks)
+		return BadValue;
 
-    blocks->num_blocks = num_blocks;
-    blocks->context_id = context->context_id;
-    blocks->privData = NULL;
+	memset(blocks, 0, sizeof(XvMCMacroBlockArray));
+	blocks->macro_blocks =
+	    (XvMCMacroBlock *) malloc(num_blocks * sizeof(XvMCMacroBlock));
+
+	if (!blocks->macro_blocks)
+		return BadAlloc;
+
+	blocks->num_blocks = num_blocks;
+	blocks->context_id = context->context_id;
+	blocks->privData = NULL;
 
-    return Success;
+	return Success;
 }
 
 /*
  * Function: XvMCDestroyMacroBlocks
  */
-_X_EXPORT Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *block)
+_X_EXPORT Status XvMCDestroyMacroBlocks(Display * display,
+					XvMCMacroBlockArray * block)
 {
-    if (!display || !block)
-        return BadValue;
-    if (block->macro_blocks)
-        free(block->macro_blocks);
-
-    block->context_id = 0;
-    block->num_blocks = 0;
-    block->macro_blocks = NULL;
-    block->privData = NULL;
+	if (!display || !block)
+		return BadValue;
+	if (block->macro_blocks)
+		free(block->macro_blocks);
+
+	block->context_id = 0;
+	block->num_blocks = 0;
+	block->macro_blocks = NULL;
+	block->privData = NULL;
 
-    return Success;
+	return Success;
 }
 
 /*
@@ -666,40 +570,43 @@ _X_EXPORT Status XvMCDestroyMacroBlocks(
  *  macroblock structures it dispatched the hardware commands to execute
  *  them.
  */
-_X_EXPORT Status XvMCRenderSurface(Display *display, XvMCContext *context,
-                         unsigned int picture_structure,
-                         XvMCSurface *target_surface,
-                         XvMCSurface *past_surface,
-                         XvMCSurface *future_surface,
-                         unsigned int flags,
-                         unsigned int num_macroblocks,
-                         unsigned int first_macroblock,
-                         XvMCMacroBlockArray *macroblock_array,
-                         XvMCBlockArray *blocks)
-{
-    Status ret;
-
-    if (!display || !context) {
-        XVMC_ERR("Invalid Display, Context or Target!");
-        return XvMCBadContext;
-    }
-    if (!target_surface)
-	return XvMCBadSurface;
-
-    intel_xvmc_dump_render(context, picture_structure, target_surface,
-	    past_surface, future_surface, flags, num_macroblocks,
-	    first_macroblock, macroblock_array, blocks);
-
-    ret = (xvmc_driver->render_surface)(display, context, picture_structure,
-	    target_surface, past_surface, future_surface, flags,
-	    num_macroblocks, first_macroblock, macroblock_array,
-	    blocks);
+_X_EXPORT Status XvMCRenderSurface(Display * display, XvMCContext * context,
+				   unsigned int picture_structure,
+				   XvMCSurface * target_surface,
+				   XvMCSurface * past_surface,
+				   XvMCSurface * future_surface,
+				   unsigned int flags,
+				   unsigned int num_macroblocks,
+				   unsigned int first_macroblock,
+				   XvMCMacroBlockArray * macroblock_array,
+				   XvMCBlockArray * blocks)
+{
+	Status ret;
+
+	if (!display || !context) {
+		XVMC_ERR("Invalid Display, Context or Target!");
+		return XvMCBadContext;
+	}
+	if (!target_surface)
+		return XvMCBadSurface;
 
-    if (ret) {
-	XVMC_ERR("render surface fail\n");
-	return ret;
-    }
-    return Success;
+	intel_xvmc_dump_render(context, picture_structure, target_surface,
+			       past_surface, future_surface, flags,
+			       num_macroblocks, first_macroblock,
+			       macroblock_array, blocks);
+
+	ret =
+	    (xvmc_driver->render_surface) (display, context, picture_structure,
+					   target_surface, past_surface,
+					   future_surface, flags,
+					   num_macroblocks, first_macroblock,
+					   macroblock_array, blocks);
+
+	if (ret) {
+		XVMC_ERR("render surface fail\n");
+		return ret;
+	}
+	return Success;
 }
 
 /*
@@ -727,46 +634,40 @@ _X_EXPORT Status XvMCRenderSurface(Displ
  *	XVMC_BOTTOM_FIELD - Display only the Bottom Field of the surface.
  *	XVMC_FRAME_PICTURE - Display both fields or frame.
  */
-_X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface,
-                      Drawable draw, short srcx, short srcy,
-                      unsigned short srcw, unsigned short srch,
-                      short destx, short desty,
-                      unsigned short destw, unsigned short desth,
-                      int flags)
-{
-    Status ret = Success;
-    XvMCContext *context;
-    intel_xvmc_context_ptr intel_ctx;
-    intel_xvmc_surface_ptr intel_surf;
-
-    if (!display || !surface)
-        return XvMCBadSurface;
-
-    intel_ctx = intel_xvmc_find_context(surface->context_id);
-    intel_surf = intel_xvmc_find_surface(surface->surface_id);
-    if (!intel_ctx || !intel_surf)
-	return XvMCBadSurface;
-    context = intel_ctx->context;
-
-    if (intel_surf->gc_init == FALSE) {
-	intel_surf->gc = XCreateGC(display, draw, 0, NULL);
-	intel_surf->gc_init = TRUE;
-    } else if (draw != intel_surf->last_draw) {
-	XFreeGC(display, intel_surf->gc);
-	intel_surf->gc = XCreateGC(display, draw, 0, NULL);
-    }
-    intel_surf->last_draw = draw;
-    /* fill intel_surf->data */
-    ret = (xvmc_driver->put_surface)(display, surface, draw, srcx, srcy,
-	    srcw, srch, destx, desty, destw, desth, flags, &intel_surf->data);
-    if (ret) {
-	XVMC_ERR("put surface fail\n");
+_X_EXPORT Status XvMCPutSurface(Display * display, XvMCSurface * surface,
+				Drawable draw, short srcx, short srcy,
+				unsigned short srcw, unsigned short srch,
+				short destx, short desty,
+				unsigned short destw, unsigned short desth,
+				int flags)
+{
+	Status ret = Success;
+	XvMCContext *context;
+	intel_xvmc_surface_ptr intel_surf;
+
+	if (!display || !surface)
+		return XvMCBadSurface;
+
+	intel_surf = surface->privData;
+	context = intel_surf->context;
+	if (!context || !intel_surf)
+		return XvMCBadSurface;
+
+	if (intel_surf->gc_init == FALSE) {
+		intel_surf->gc = XCreateGC(display, draw, 0, NULL);
+		intel_surf->gc_init = TRUE;
+	} else if (draw != intel_surf->last_draw) {
+		XFreeGC(display, intel_surf->gc);
+		intel_surf->gc = XCreateGC(display, draw, 0, NULL);
+	}
+	intel_surf->last_draw = draw;
+
+	drm_intel_bo_flink(intel_surf->bo, &intel_surf->gem_handle);
+
+	ret = XvPutImage(display, context->port, draw, intel_surf->gc,
+			 intel_surf->image, srcx, srcy, srcw, srch, destx,
+			 desty, destw, desth);
 	return ret;
-    }
-    ret = XvPutImage(display, context->port, draw, intel_surf->gc,
-	    intel_surf->image, srcx, srcy, srcw, srch, destx, desty,
-	    destw, desth);
-    return ret;
 }
 
 /*
@@ -775,19 +676,15 @@ _X_EXPORT Status XvMCPutSurface(Display
  *   display - Connection to the X server
  *   surface - The surface to synchronize
  */
-_X_EXPORT Status XvMCSyncSurface(Display *display, XvMCSurface *surface)
+_X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface)
 {
-    Status ret;
-    int stat = 0;
-
-    if (!display || !surface)
-	return XvMCBadSurface;
+	Status ret;
+	int stat = 0;
 
-    do {
-        ret = XvMCGetSurfaceStatus(display, surface, &stat);
-    } while (!ret && (stat & XVMC_RENDERING));
+	if (!display || !surface)
+		return XvMCBadSurface;
 
-    return ret;
+	return ret;
 }
 
 /*
@@ -800,11 +697,12 @@ _X_EXPORT Status XvMCSyncSurface(Display
  *   surface - Surface to flush
  * Returns: Status
  */
-_X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface *surface)
+_X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface * surface)
 {
-    if (!display || !surface)
-	return XvMCBadSurface;
-    return Success;
+	if (!display || !surface)
+		return XvMCBadSurface;
+
+	return Success;
 }
 
 /*
@@ -819,20 +717,15 @@ _X_EXPORT Status XvMCFlushSurface(Displa
  *    XVMC_DISPLAYING - The surface is currently being displayed or a
  *                     display is pending.
  */
-_X_EXPORT Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface, int *stat)
+_X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface,
+				      int *stat)
 {
-    Status ret;
+	if (!display || !surface || !stat)
+		return XvMCBadSurface;
 
-    if (!display || !surface || !stat)
-        return XvMCBadSurface;
+	*stat = 0;
 
-    ret = (xvmc_driver->get_surface_status)(display, surface, stat);
-    if (ret) {
-	XVMC_ERR("get surface status fail\n");
-	return ret;
-    }
-
-    return Success;
+	return Success;
 }
 
 /*
@@ -844,29 +737,15 @@ _X_EXPORT Status XvMCGetSurfaceStatus(Di
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCHideSurface(Display *display, XvMCSurface *surface)
+_X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface)
 {
-    int stat = 0;
-    Status ret;
-
-    if (!display || !surface)
-        return XvMCBadSurface;
-
-    XvMCSyncSurface(display, surface);
-
-    /*
-      Get the status of the surface, if it is not currently displayed
-      we don't need to worry about it.
-    */
-    if ((ret = XvMCGetSurfaceStatus(display, surface, &stat)) != Success)
-        return ret;
+	int stat = 0;
+	Status ret;
 
-    if (!(stat & XVMC_DISPLAYING))
-        return Success;
+	if (!display || !surface)
+		return XvMCBadSurface;
 
-    /* FIXME: */
-    XVMC_ERR("XvMCHideSurface not implemented!\n");
-    return BadValue;
+	return Success;
 }
 
 /*
@@ -883,13 +762,13 @@ _X_EXPORT Status XvMCHideSurface(Display
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCCreateSubpicture(Display *display, XvMCContext *context,
-                            XvMCSubpicture *subpicture,
-                            unsigned short width, unsigned short height,
-                            int xvimage_id)
+_X_EXPORT Status XvMCCreateSubpicture(Display * display, XvMCContext * context,
+				      XvMCSubpicture * subpicture,
+				      unsigned short width,
+				      unsigned short height, int xvimage_id)
 {
-    XVMC_ERR("XvMCCreateSubpicture not implemented!\n");
-    return BadValue;
+	XVMC_ERR("XvMCCreateSubpicture not implemented!\n");
+	return BadValue;
 }
 
 /*
@@ -904,13 +783,13 @@ _X_EXPORT Status XvMCCreateSubpicture(Di
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCClearSubpicture(Display *display, XvMCSubpicture *subpicture,
-                           short x, short y,
-                           unsigned short width, unsigned short height,
-                           unsigned int color)
+_X_EXPORT Status XvMCClearSubpicture(Display * display,
+				     XvMCSubpicture * subpicture, short x,
+				     short y, unsigned short width,
+				     unsigned short height, unsigned int color)
 {
-    XVMC_ERR("XvMCClearSubpicture not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCClearSubpicture not implemented!");
+	return BadValue;
 }
 
 /*
@@ -928,17 +807,17 @@ _X_EXPORT Status XvMCClearSubpicture(Dis
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCCompositeSubpicture(Display *display, XvMCSubpicture *subpicture,
-                               XvImage *image,
-                               short srcx, short srcy,
-                               unsigned short width, unsigned short height,
-                               short dstx, short dsty)
+_X_EXPORT Status XvMCCompositeSubpicture(Display * display,
+					 XvMCSubpicture * subpicture,
+					 XvImage * image, short srcx,
+					 short srcy, unsigned short width,
+					 unsigned short height, short dstx,
+					 short dsty)
 {
-    XVMC_ERR("XvMCCompositeSubpicture not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCCompositeSubpicture not implemented!");
+	return BadValue;
 }
 
-
 /*
  * Function: XvMCDestroySubpicture
  * Description: Destroys the specified subpicture.
@@ -948,13 +827,13 @@ _X_EXPORT Status XvMCCompositeSubpicture
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture)
+_X_EXPORT Status XvMCDestroySubpicture(Display * display,
+				       XvMCSubpicture * subpicture)
 {
-    XVMC_ERR("XvMCDestroySubpicture not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCDestroySubpicture not implemented!");
+	return BadValue;
 }
 
-
 /*
  * Function: XvMCSetSubpicturePalette
  * Description: Set the subpictures palette
@@ -965,11 +844,12 @@ _X_EXPORT Status XvMCDestroySubpicture(D
  *     is num_palette_entries * entry_bytes in size.
  * Returns: Status
  */
-_X_EXPORT Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture,
-                                unsigned char *palette)
+_X_EXPORT Status XvMCSetSubpicturePalette(Display * display,
+					  XvMCSubpicture * subpicture,
+					  unsigned char *palette)
 {
-    XVMC_ERR("XvMCSetSubpicturePalette not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCSetSubpicturePalette not implemented!");
+	return BadValue;
 }
 
 /*
@@ -995,15 +875,16 @@ _X_EXPORT Status XvMCSetSubpicturePalett
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCBlendSubpicture(Display *display, XvMCSurface *target_surface,
-                           XvMCSubpicture *subpicture,
-                           short subx, short suby,
-                           unsigned short subw, unsigned short subh,
-                           short surfx, short surfy,
-                           unsigned short surfw, unsigned short surfh)
+_X_EXPORT Status XvMCBlendSubpicture(Display * display,
+				     XvMCSurface * target_surface,
+				     XvMCSubpicture * subpicture, short subx,
+				     short suby, unsigned short subw,
+				     unsigned short subh, short surfx,
+				     short surfy, unsigned short surfw,
+				     unsigned short surfh)
 {
-    XVMC_ERR("XvMCBlendSubpicture not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCBlendSubpicture not implemented!");
+	return BadValue;
 }
 
 /*
@@ -1032,17 +913,18 @@ _X_EXPORT Status XvMCBlendSubpicture(Dis
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCBlendSubpicture2(Display *display,
-                            XvMCSurface *source_surface,
-                            XvMCSurface *target_surface,
-                            XvMCSubpicture *subpicture,
-                            short subx, short suby,
-                            unsigned short subw, unsigned short subh,
-                            short surfx, short surfy,
-                            unsigned short surfw, unsigned short surfh)
+_X_EXPORT Status XvMCBlendSubpicture2(Display * display,
+				      XvMCSurface * source_surface,
+				      XvMCSurface * target_surface,
+				      XvMCSubpicture * subpicture,
+				      short subx, short suby,
+				      unsigned short subw, unsigned short subh,
+				      short surfx, short surfy,
+				      unsigned short surfw,
+				      unsigned short surfh)
 {
-    XVMC_ERR("XvMCBlendSubpicture2 not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCBlendSubpicture2 not implemented!");
+	return BadValue;
 }
 
 /*
@@ -1055,10 +937,11 @@ _X_EXPORT Status XvMCBlendSubpicture2(Di
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture)
+_X_EXPORT Status XvMCSyncSubpicture(Display * display,
+				    XvMCSubpicture * subpicture)
 {
-    XVMC_ERR("XvMCSyncSubpicture not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCSyncSubpicture not implemented!");
+	return BadValue;
 }
 
 /*
@@ -1072,10 +955,11 @@ _X_EXPORT Status XvMCSyncSubpicture(Disp
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture)
+_X_EXPORT Status XvMCFlushSubpicture(Display * display,
+				     XvMCSubpicture * subpicture)
 {
-    XVMC_ERR("XvMCFlushSubpicture not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCFlushSubpicture not implemented!");
+	return BadValue;
 }
 
 /*
@@ -1092,11 +976,11 @@ _X_EXPORT Status XvMCFlushSubpicture(Dis
  *
  * Returns: Status
  */
-_X_EXPORT Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture,
-                               int *stat)
+_X_EXPORT Status XvMCGetSubpictureStatus(Display * display,
+					 XvMCSubpicture * subpicture, int *stat)
 {
-    XVMC_ERR("XvMCGetSubpictureStatus not implemented!");
-    return BadValue;
+	XVMC_ERR("XvMCGetSubpictureStatus not implemented!");
+	return BadValue;
 }
 
 /*
@@ -1113,12 +997,12 @@ _X_EXPORT Status XvMCGetSubpictureStatus
  * Returns:
  *  An array of XvAttributes.
  */
-_X_EXPORT XvAttribute *XvMCQueryAttributes(Display *display, XvMCContext *context,
-                                 int *number)
+_X_EXPORT XvAttribute *XvMCQueryAttributes(Display * display,
+					   XvMCContext * context, int *number)
 {
-    /* now XvMC has no extra attribs than Xv */
-    *number = 0;
-    return NULL;
+	/* now XvMC has no extra attribs than Xv */
+	*number = 0;
+	return NULL;
 }
 
 /*
@@ -1134,10 +1018,10 @@ _X_EXPORT XvAttribute *XvMCQueryAttribut
  * Returns:
  *  Status
  */
-_X_EXPORT Status XvMCSetAttribute(Display *display, XvMCContext *context,
-                        Atom attribute, int value)
+_X_EXPORT Status XvMCSetAttribute(Display * display, XvMCContext * context,
+				  Atom attribute, int value)
 {
-    return Success;
+	return Success;
 }
 
 /*
@@ -1154,8 +1038,53 @@ _X_EXPORT Status XvMCSetAttribute(Displa
  * Returns:
  *  Status
  */
-_X_EXPORT Status XvMCGetAttribute(Display *display, XvMCContext *context,
-                        Atom attribute, int *value)
+_X_EXPORT Status XvMCGetAttribute(Display * display, XvMCContext * context,
+				  Atom attribute, int *value)
+{
+	return Success;
+}
+
+_X_EXPORT Status XvMCBeginSurface(Display * display, XvMCContext * context,
+				  XvMCSurface * target,
+				  XvMCSurface * past,
+				  XvMCSurface * future,
+				  const XvMCMpegControl * control)
+{
+	if (xvmc_driver->begin_surface(display, context,
+				       target, past, future, control)) {
+		XVMC_ERR("BeginSurface fail\n");
+		return BadValue;
+	}
+	return Success;
+}
+
+_X_EXPORT Status XvMCLoadQMatrix(Display * display, XvMCContext * context,
+				 const XvMCQMatrix * qmx)
 {
-    return Success;
+	if (xvmc_driver->load_qmatrix(display, context, qmx)) {
+		XVMC_ERR("LoadQMatrix fail\n");
+		return BadValue;
+	}
+	return Success;
+}
+
+_X_EXPORT Status XvMCPutSlice(Display * display, XvMCContext * context,
+			      char *slice, int nbytes)
+{
+	if (xvmc_driver->put_slice(display, context, slice, nbytes)) {
+		XVMC_ERR("PutSlice fail\n");
+		return BadValue;
+	}
+	return Success;
+}
+
+_X_EXPORT Status XvMCPutSlice2(Display * display, XvMCContext * context,
+			       char *slice, int nbytes, int slice_code)
+{
+	if (xvmc_driver->put_slice2
+	    (display, context, slice, nbytes, slice_code)) {
+		XVMC_ERR("PutSlice2 fail\n");
+		return BadValue;
+	}
+	return Success;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc_dump.c new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc_dump.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc_dump.c	2008-08-02 07:12:46.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc_dump.c	2011-02-08 11:14:00.000000000 +0100
@@ -33,117 +33,126 @@ static FILE *fp = NULL;
 
 void intel_xvmc_dump_open(void)
 {
-    char *d  = NULL;
+	char *d = NULL;
 
-    if (xvmc_dump)
-	return;
+	if (xvmc_dump)
+		return;
 
-    if (d = getenv("INTEL_XVMC_DUMP"))
-	xvmc_dump = 1;
+	if (d = getenv("INTEL_XVMC_DUMP"))
+		xvmc_dump = 1;
 
-    if (xvmc_dump) {
-	fp = fopen(DUMPFILE, "a");
-	if (!fp)
-	    xvmc_dump = 0;
-    }
+	if (xvmc_dump) {
+		fp = fopen(DUMPFILE, "a");
+		if (!fp)
+			xvmc_dump = 0;
+	}
 }
 
 void intel_xvmc_dump_close(void)
 {
-    if (xvmc_dump) {
-	fclose(fp);
-	xvmc_dump = 0;
-    }
+	if (xvmc_dump) {
+		fclose(fp);
+		xvmc_dump = 0;
+	}
 }
 
-void intel_xvmc_dump_render(XvMCContext *context, unsigned int picture_structure,
-	XvMCSurface *target, XvMCSurface *past, XvMCSurface *future, unsigned int flags,
-	unsigned int num_macroblocks, unsigned int first_macroblock,
-	XvMCMacroBlockArray *macroblock_array, XvMCBlockArray *blocks)
+void intel_xvmc_dump_render(XvMCContext * context,
+			    unsigned int picture_structure,
+			    XvMCSurface * target, XvMCSurface * past,
+			    XvMCSurface * future, unsigned int flags,
+			    unsigned int num_macroblocks,
+			    unsigned int first_macroblock,
+			    XvMCMacroBlockArray * macroblock_array,
+			    XvMCBlockArray * blocks)
 {
-    int i;
-    XvMCMacroBlock *mb;
+	int i;
+	XvMCMacroBlock *mb;
 
-    if (!xvmc_dump)
-	return;
+	if (!xvmc_dump)
+		return;
 
-    fprintf(fp, "========== new surface rendering ==========\n");
-    fprintf(fp, "Context (id:%d) (surface_type_id:%d) (width:%d) (height:%d)\n",
-	    context->context_id, context->surface_type_id, context->width, context->height);
-
-    if (picture_structure == XVMC_FRAME_PICTURE)
-	fprintf(fp, "picture structure: frame picture\n");
-    else if (picture_structure == XVMC_TOP_FIELD)
-	fprintf(fp, "picture structure: top field picture (%s)\n",
-		(flags == XVMC_SECOND_FIELD)?"second":"first");
-    else if (picture_structure == XVMC_BOTTOM_FIELD)
-	fprintf(fp, "picture structure: bottom field picture (%s)\n",
-		(flags == XVMC_SECOND_FIELD)?"second":"first");
-
-    if (!past && !future)
-	fprintf(fp, "picture type: I\n");
-    else if (past && !future)
-	fprintf(fp, "picture type: P\n");
-    else if (past && future)
-	fprintf(fp, "picture type: B\n");
-    else
-	fprintf(fp, "picture type: Bad!\n");
-
-    fprintf(fp, "target picture: id (%d) width (%d) height (%d)\n", target->surface_id,
-	    target->width, target->height);
-    if (past)
-	fprintf(fp, "past picture: id (%d) width (%d) height (%d)\n", past->surface_id,
-		past->width, past->height);
-    if (future)
-	fprintf(fp, "future picture: id (%d) width (%d) height (%d)\n", future->surface_id,
-		future->width, future->height);
-
-    fprintf(fp, "num macroblocks: %d, first macroblocks %d\n", num_macroblocks, first_macroblock);
-
-    for (i = first_macroblock; i < (first_macroblock + num_macroblocks); i++) {
-	mb = &macroblock_array->macro_blocks[i];
-
-	fprintf(fp, "- MB(%d): ", i);
-	fprintf(fp, "x (%d) y (%d)  ", mb->x, mb->y);
-	fprintf(fp, "macroblock type (");
-	if (mb->macroblock_type & XVMC_MB_TYPE_MOTION_FORWARD)
-	    fprintf(fp, "motion_forward ");
-	if (mb->macroblock_type & XVMC_MB_TYPE_MOTION_BACKWARD)
-	    fprintf(fp, "motion_backward ");
-	if (mb->macroblock_type & XVMC_MB_TYPE_PATTERN)
-	    fprintf(fp, "pattern ");
-	if (mb->macroblock_type & XVMC_MB_TYPE_INTRA)
-	    fprintf(fp, "intra ");
-	fprintf(fp, ")  ");
-	fprintf(fp, "mc type ");
-	if (picture_structure == XVMC_FRAME_PICTURE) {
-	    if (mb->motion_type & XVMC_PREDICTION_FIELD)
-		fprintf(fp, "(field)  ");
-	    else if (mb->motion_type & XVMC_PREDICTION_FRAME)
-		fprintf(fp, "(frame)  ");
-	    else if (mb->motion_type & XVMC_PREDICTION_DUAL_PRIME)
-		fprintf(fp, "(dual-prime)  ");
-	    else
-		fprintf(fp, "(unknown %d)  ", mb->motion_type);
-	} else { /* field */
-	    if (mb->motion_type & XVMC_PREDICTION_FIELD)
-		fprintf(fp, "(field)  ");
-	    else if (mb->motion_type & XVMC_PREDICTION_DUAL_PRIME)
-		fprintf(fp, "(dual-prime)  ");
-	    else if (mb->motion_type & XVMC_PREDICTION_16x8)
-		fprintf(fp, "(16x8)  ");
-	    else
-		fprintf(fp, "(unknown %d)  ", mb->motion_type);
-	}
+	fprintf(fp, "========== new surface rendering ==========\n");
+	fprintf(fp,
+		"Context (id:%d) (surface_type_id:%d) (width:%d) (height:%d)\n",
+		(int)context->context_id, context->surface_type_id,
+		context->width, context->height);
+
+	if (picture_structure == XVMC_FRAME_PICTURE)
+		fprintf(fp, "picture structure: frame picture\n");
+	else if (picture_structure == XVMC_TOP_FIELD)
+		fprintf(fp, "picture structure: top field picture (%s)\n",
+			(flags == XVMC_SECOND_FIELD) ? "second" : "first");
+	else if (picture_structure == XVMC_BOTTOM_FIELD)
+		fprintf(fp, "picture structure: bottom field picture (%s)\n",
+			(flags == XVMC_SECOND_FIELD) ? "second" : "first");
+
+	if (!past && !future)
+		fprintf(fp, "picture type: I\n");
+	else if (past && !future)
+		fprintf(fp, "picture type: P\n");
+	else if (past && future)
+		fprintf(fp, "picture type: B\n");
+	else
+		fprintf(fp, "picture type: Bad!\n");
+
+	fprintf(fp, "target picture: id (%d) width (%d) height (%d)\n",
+		(int)target->surface_id, target->width, target->height);
+	if (past)
+		fprintf(fp, "past picture: id (%d) width (%d) height (%d)\n",
+			(int)past->surface_id, past->width, past->height);
+	if (future)
+		fprintf(fp, "future picture: id (%d) width (%d) height (%d)\n",
+			(int)future->surface_id, future->width, future->height);
+
+	fprintf(fp, "num macroblocks: %d, first macroblocks %d\n",
+		num_macroblocks, first_macroblock);
+
+	for (i = first_macroblock; i < (first_macroblock + num_macroblocks);
+	     i++) {
+		mb = &macroblock_array->macro_blocks[i];
+
+		fprintf(fp, "- MB(%d): ", i);
+		fprintf(fp, "x (%d) y (%d)  ", mb->x, mb->y);
+		fprintf(fp, "macroblock type (");
+		if (mb->macroblock_type & XVMC_MB_TYPE_MOTION_FORWARD)
+			fprintf(fp, "motion_forward ");
+		if (mb->macroblock_type & XVMC_MB_TYPE_MOTION_BACKWARD)
+			fprintf(fp, "motion_backward ");
+		if (mb->macroblock_type & XVMC_MB_TYPE_PATTERN)
+			fprintf(fp, "pattern ");
+		if (mb->macroblock_type & XVMC_MB_TYPE_INTRA)
+			fprintf(fp, "intra ");
+		fprintf(fp, ")  ");
+		fprintf(fp, "mc type ");
+		if (picture_structure == XVMC_FRAME_PICTURE) {
+			if (mb->motion_type & XVMC_PREDICTION_FIELD)
+				fprintf(fp, "(field)  ");
+			else if (mb->motion_type & XVMC_PREDICTION_FRAME)
+				fprintf(fp, "(frame)  ");
+			else if (mb->motion_type & XVMC_PREDICTION_DUAL_PRIME)
+				fprintf(fp, "(dual-prime)  ");
+			else
+				fprintf(fp, "(unknown %d)  ", mb->motion_type);
+		} else {	/* field */
+			if (mb->motion_type & XVMC_PREDICTION_FIELD)
+				fprintf(fp, "(field)  ");
+			else if (mb->motion_type & XVMC_PREDICTION_DUAL_PRIME)
+				fprintf(fp, "(dual-prime)  ");
+			else if (mb->motion_type & XVMC_PREDICTION_16x8)
+				fprintf(fp, "(16x8)  ");
+			else
+				fprintf(fp, "(unknown %d)  ", mb->motion_type);
+		}
+
+		if (mb->dct_type == XVMC_DCT_TYPE_FRAME)
+			fprintf(fp, "dct type (frame)  ");
+		else if (mb->dct_type == XVMC_DCT_TYPE_FIELD)
+			fprintf(fp, "dct type (field)  ");
 
-	if (mb->dct_type == XVMC_DCT_TYPE_FRAME)
-	    fprintf(fp, "dct type (frame)  ");
-	else if (mb->dct_type == XVMC_DCT_TYPE_FIELD)
-	    fprintf(fp, "dct type (field)  ");
+		fprintf(fp, "coded_block_pattern (0x%x)\n",
+			mb->coded_block_pattern);
 
-	fprintf(fp, "coded_block_pattern (0x%x)\n", mb->coded_block_pattern);
-
-	/* XXX mv dump */
-    }
+		/* XXX mv dump */
+	}
 
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h	2011-01-22 22:15:16.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h	2011-02-08 11:14:00.000000000 +0100
@@ -51,13 +51,14 @@
 #include <X11/extensions/Xvlib.h>
 #include <X11/extensions/XvMC.h>
 #include <X11/extensions/XvMClib.h>
+#include <X11/extensions/vldXvMC.h>
 #include <drm_sarea.h>
-
-#include "xf86dri.h"
+#include "i915_drm.h"
+#include "intel_bufmgr.h"
 
 #include "intel_batchbuffer.h"
 
-extern int debug;
+#define GTT_PAGE_SIZE 4*1024
 
 #define XVMC_ERR(s, arg...)					\
     do {							\
@@ -69,12 +70,6 @@ extern int debug;
 	fprintf(stderr, "[intel_xvmc] info: " s "\n", ##arg);	\
     } while (0)
 
-#define XVMC_DBG(s, arg...)						\
-    do {								\
-	if (debug)							\
-	    fprintf(stderr, "[intel_xvmc] debug: " s "\n", ##arg);	\
-    } while (0)
-
 /* Subpicture fourcc */
 #define FOURCC_IA44 0x34344149
 
@@ -82,126 +77,121 @@ extern int debug;
   Definitions for temporary wire protocol hooks to be replaced
   when a HW independent libXvMC is created.
 */
-extern Status _xvmc_create_context(Display *dpy, XvMCContext *context,
-				   int *priv_count, CARD32 **priv_data);
+extern Status _xvmc_create_context(Display * dpy, XvMCContext * context,
+				   int *priv_count, CARD32 ** priv_data);
 
-extern Status _xvmc_destroy_context(Display *dpy, XvMCContext *context);
+extern Status _xvmc_destroy_context(Display * dpy, XvMCContext * context);
 
-extern Status _xvmc_create_surface(Display *dpy, XvMCContext *context,
-				   XvMCSurface *surface, int *priv_count,
-				   CARD32 **priv_data);
-
-extern Status _xvmc_destroy_surface(Display *dpy, XvMCSurface *surface);
-
-extern Status  _xvmc_create_subpicture(Display *dpy, XvMCContext *context,
-				       XvMCSubpicture *subpicture,
-				       int *priv_count, uint **priv_data);
-
-extern Status   _xvmc_destroy_subpicture(Display *dpy,
-					 XvMCSubpicture *subpicture);
-
-typedef struct _intel_xvmc_context {
-    XvMCContext *context;
-    drm_context_t hw_context;	/* context id to kernel drm */
-    struct _intel_xvmc_context *next;
-} intel_xvmc_context_t, *intel_xvmc_context_ptr;
-
-typedef struct _intel_xvmc_surface {
-    XvMCSurface *surface;
-    XvImage *image;
-    GC gc;
-    Bool gc_init;
-    Drawable last_draw;
-    struct intel_xvmc_command data;
-    struct _intel_xvmc_surface *next;
-} intel_xvmc_surface_t, *intel_xvmc_surface_ptr;
+extern Status _xvmc_create_surface(Display * dpy, XvMCContext * context,
+				   XvMCSurface * surface, int *priv_count,
+				   CARD32 ** priv_data);
+
+extern Status _xvmc_destroy_surface(Display * dpy, XvMCSurface * surface);
+
+extern Status _xvmc_create_subpicture(Display * dpy, XvMCContext * context,
+				      XvMCSubpicture * subpicture,
+				      int *priv_count, uint ** priv_data);
+
+extern Status _xvmc_destroy_subpicture(Display * dpy,
+				       XvMCSubpicture * subpicture);
+
+struct intel_xvmc_context {
+	struct intel_xvmc_hw_context *hw;
+	uint32_t surface_bo_size;
+	drm_context_t hw_context;	/* context id to kernel drm */
+};
+typedef struct intel_xvmc_context *intel_xvmc_context_ptr;
+
+struct intel_xvmc_surface {
+	XvMCContext *context;
+	XvImage *image;
+	GC gc;
+	Bool gc_init;
+	Drawable last_draw;
+	drm_intel_bo *bo;
+	uint32_t gem_handle;
+};
+typedef struct intel_xvmc_surface *intel_xvmc_surface_ptr;
 
 typedef struct _intel_xvmc_drm_map {
-    drm_handle_t handle;
-    unsigned long offset;
-    unsigned long size;
-    unsigned long bus_addr;
-    drmAddress map;
+	drm_handle_t handle;
+	unsigned long offset;
+	unsigned long size;
+	unsigned long bus_addr;
+	drmAddress map;
 } intel_xvmc_drm_map_t, *intel_xvmc_drm_map_ptr;
 
 typedef struct _intel_xvmc_driver {
-    int type;			/* hw xvmc type - i830_hwmc.h */
-    int screen;			/* current screen num*/
+	int type;		/* hw xvmc type - i830_hwmc.h */
+	int screen;		/* current screen num */
 
-    int fd;			/* drm file handler */
-    drm_handle_t hsarea;	/* DRI open connect */
-    char busID[32];
-
-    unsigned int sarea_size;
-    drmAddress sarea_address;
-
-    struct {
-	unsigned int start_offset;
-	unsigned int size;
-	unsigned int space;
-	unsigned char *ptr;
-    } batch;
-
-    struct
-    {
-        void *ptr;
-        unsigned int size;
-        unsigned int offset;
-        unsigned int active_buf;
-        unsigned int irq_emitted;
-    } alloc;
-    intel_xvmc_drm_map_t batchbuffer;
-    unsigned int last_render;
-
-    sigset_t sa_mask;
-    pthread_mutex_t ctxmutex;
-    int lock;   /* Lightweight lock to avoid locking twice */
-    int locked;
-    drmLock *driHwLock;
-
-    int num_ctx;
-    intel_xvmc_context_ptr ctx_list;
-    int num_surf;
-    intel_xvmc_surface_ptr surf_list;
-
-    void *private;
-
-    /* driver specific xvmc callbacks */
-    Status (*create_context)(Display* display, XvMCContext *context,
-	    int priv_count, CARD32 *priv_data);
-
-    Status (*destroy_context)(Display* display, XvMCContext *context);
-
-    Status (*create_surface)(Display* display, XvMCContext *context,
-	    XvMCSurface *surface, int priv_count, CARD32 *priv_data);
-
-    Status (*destroy_surface)(Display* display, XvMCSurface *surface);
-
-    Status (*render_surface)(Display *display, XvMCContext *context,
-	    unsigned int picture_structure,
-	    XvMCSurface *target_surface,
-	    XvMCSurface *past_surface,
-	    XvMCSurface *future_surface,
-	    unsigned int flags,
-	    unsigned int num_macroblocks,
-	    unsigned int first_macroblock,
-	    XvMCMacroBlockArray *macroblock_array,
-	    XvMCBlockArray *blocks);
-
-    Status (*put_surface)(Display *display, XvMCSurface *surface,
-	    Drawable draw, short srcx, short srcy,
-	    unsigned short srcw, unsigned short srch,
-	    short destx, short desty,
-	    unsigned short destw, unsigned short desth,
-	    int flags, struct intel_xvmc_command *data);
+	int fd;			/* drm file handler */
 
-    Status (*get_surface_status)(Display *display, XvMCSurface *surface, int *stat);
+	dri_bufmgr *bufmgr;
+
+	struct {
+		unsigned int init_offset;
+		unsigned int size;
+		unsigned int space;
+		unsigned char *ptr;
+		unsigned char *init_ptr;
+		dri_bo *buf;
+	} batch;
+
+	struct {
+		void *ptr;
+		unsigned int size;
+		unsigned int offset;
+		unsigned int active_buf;
+		unsigned int irq_emitted;
+	} alloc;
+	intel_xvmc_drm_map_t batchbuffer;
+
+	sigset_t sa_mask;
+	pthread_mutex_t ctxmutex;
+	int locked;
+
+	int num_ctx;
+	intel_xvmc_context_ptr ctx_list;
+	int num_surf;
+	struct intel_xvmc_surface * surf_list;
+
+	void *private;
+
+	/* driver specific xvmc callbacks */
+	 Status(*create_context) (Display * display, XvMCContext * context,
+				  int priv_count, CARD32 * priv_data);
+
+	 Status(*destroy_context) (Display * display, XvMCContext * context);
+
+	 Status(*render_surface) (Display * display, XvMCContext * context,
+				  unsigned int picture_structure,
+				  XvMCSurface * target_surface,
+				  XvMCSurface * past_surface,
+				  XvMCSurface * future_surface,
+				  unsigned int flags,
+				  unsigned int num_macroblocks,
+				  unsigned int first_macroblock,
+				  XvMCMacroBlockArray * macroblock_array,
+				  XvMCBlockArray * blocks);
+
+	 Status(*begin_surface) (Display * display, XvMCContext * context,
+				 XvMCSurface * target_surface,
+				 XvMCSurface * past_surface,
+				 XvMCSurface * future_surface,
+				 const XvMCMpegControl * control);
+	 Status(*load_qmatrix) (Display * display, XvMCContext * context,
+				const XvMCQMatrix * qmx);
+	 Status(*put_slice) (Display * display, XvMCContext * context,
+			     unsigned char *slice, int bytes);
+	 Status(*put_slice2) (Display * display, XvMCContext * context,
+			      unsigned char *slice, int bytes, int slice_code);
 
-    /* XXX more for vld */
 } intel_xvmc_driver_t, *intel_xvmc_driver_ptr;
 
 extern struct _intel_xvmc_driver i915_xvmc_mc_driver;
 extern struct _intel_xvmc_driver i965_xvmc_mc_driver;
+extern struct _intel_xvmc_driver xvmc_vld_driver;
 extern struct _intel_xvmc_driver *xvmc_driver;
 
 #define SET_BLOCKED_SIGSET()   do {    \
@@ -232,34 +222,43 @@ extern struct _intel_xvmc_driver *xvmc_d
 extern void LOCK_HARDWARE(drm_context_t);
 extern void UNLOCK_HARDWARE(drm_context_t);
 
-static inline const char* intel_xvmc_decoder_string(int flag)
+static inline const char *intel_xvmc_decoder_string(int flag)
 {
-    switch (flag) {
+	switch (flag) {
 	case XVMC_I915_MPEG2_MC:
-	    return "i915/945 MPEG2 MC decoder";
+		return "i915/945 MPEG2 MC decoder";
 	case XVMC_I965_MPEG2_MC:
-	    return "i965 MPEG2 MC decoder";
+		return "i965 MPEG2 MC decoder";
 	case XVMC_I945_MPEG2_VLD:
-	    return "i945 MPEG2 VLD decoder";
+		return "i945 MPEG2 VLD decoder";
 	case XVMC_I965_MPEG2_VLD:
-	    return "i965 MPEG2 VLD decoder";
+		return "i965 MPEG2 VLD decoder";
 	default:
-	    return "Unknown decoder";
-    }
+		return "Unknown decoder";
+	}
 }
 
-extern intel_xvmc_context_ptr intel_xvmc_find_context(XID id);
-extern intel_xvmc_surface_ptr intel_xvmc_find_surface(XID id);
-
 extern unsigned int mb_bytes_420[64];
 
 /* dump function */
 extern void intel_xvmc_dump_open(void);
 extern void intel_xvmc_dump_close(void);
-extern void intel_xvmc_dump_render(XvMCContext *context, unsigned int picture_structure,
-	    XvMCSurface *target_surface, XvMCSurface *past_surface,
-	    XvMCSurface *future_surface, unsigned int flags,
-	    unsigned int num_macroblocks, unsigned int first_macroblock,
-	    XvMCMacroBlockArray *macroblock_array, XvMCBlockArray *blocks);
+extern void intel_xvmc_dump_render(XvMCContext * context,
+				   unsigned int picture_structure,
+				   XvMCSurface * target_surface,
+				   XvMCSurface * past_surface,
+				   XvMCSurface * future_surface,
+				   unsigned int flags,
+				   unsigned int num_macroblocks,
+				   unsigned int first_macroblock,
+				   XvMCMacroBlockArray * macroblock_array,
+				   XvMCBlockArray * blocks);
+
+#define	VFE_GENERIC_MODE	0x0
+#define	VFE_VLD_MODE		0x1
+#define VFE_IS_MODE		0x2
+#define VFE_AVC_MC_MODE		0x4
+#define VFE_AVC_IT_MODE		0x7
+#define VFE_VC1_IT_MODE		0x7
 
 #endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.am	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -2,10 +2,12 @@ if XVMC
 lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
 endif
 
+SUBDIRS = shader
+
 libI810XvMC_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
 
-libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
+libI810XvMC_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 libI810XvMC_la_LDFLAGS = -version-number 1:0:0
 libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
@@ -19,108 +21,12 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
         i915_xvmc.h                    \
         i965_xvmc.c                    \
         i965_xvmc.h                    \
+        xvmc_vld.c                     \
+        xvmc_vld.h                     \
         intel_batchbuffer.c            \
-        intel_batchbuffer.h            \
-        xf86dri.c                      \
-        xf86dri.h                      \
-        xf86dristr.h
+        intel_batchbuffer.h
 
 libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread
-
-INTEL_G4A =                         \
-        dual_prime_igd.g4a              \
-        field_backward_igd.g4a          \
-        field_f_b_igd.g4a               \
-        field_forward_igd.g4a           \
-        frame_backward_igd.g4a          \
-        frame_f_b_igd.g4a               \
-        frame_forward_igd.g4a           \
-        dual_prime.g4a              \
-        field_backward.g4a          \
-        field_f_b.g4a               \
-        field_forward.g4a           \
-        frame_backward.g4a          \
-        frame_f_b.g4a               \
-        frame_forward.g4a           \
-        ipicture.g4a                \
-        null.g4a
-
-INTEL_G4I =                                      \
-        addidct.g4i                              \
-        block_clear.g4i                          \
-        read_frame_x0y0_y.g4i                    \
-        read_frame_x0y1_y.g4i                    \
-        read_frame_x1y0_y.g4i                    \
-        read_frame_x1y1_y.g4i                    \
-        read_frame_x0y0_uv.g4i                   \
-        read_frame_x0y1_uv.g4i                   \
-        read_frame_x1y0_uv.g4i                   \
-        read_frame_x1y1_uv.g4i                   \
-        read_frame_x0y0_y_igd.g4i                    \
-        read_frame_x0y1_y_igd.g4i                    \
-        read_frame_x1y0_y_igd.g4i                    \
-        read_frame_x1y1_y_igd.g4i                    \
-        read_frame_x0y0_uv_igd.g4i                   \
-        read_frame_x0y1_uv_igd.g4i                   \
-        read_frame_x1y0_uv_igd.g4i                   \
-        read_frame_x1y1_uv_igd.g4i                   \
-        motion_frame_y.g4i                       \
-        motion_frame_uv.g4i                      \
-        read_field_x0y0_y.g4i                    \
-        read_field_x0y1_y.g4i                    \
-        read_field_x1y0_y.g4i                    \
-        read_field_x1y1_y.g4i                    \
-        read_field_x0y0_uv.g4i                   \
-        read_field_x0y1_uv.g4i                   \
-        read_field_x1y0_uv.g4i                   \
-        read_field_x1y1_uv.g4i                   \
-        read_field_x0y0_y_igd.g4i                    \
-        read_field_x0y1_y_igd.g4i                    \
-        read_field_x1y0_y_igd.g4i                    \
-        read_field_x1y1_y_igd.g4i                    \
-        read_field_x0y0_uv_igd.g4i                   \
-        read_field_x0y1_uv_igd.g4i                   \
-        read_field_x1y0_uv_igd.g4i                   \
-        read_field_x1y1_uv_igd.g4i                   \
-        motion_field_y.g4i                       \
-        motion_field_uv.g4i
-
-INTEL_G4B =                         \
-        dual_prime.g4b              \
-        field_backward.g4b          \
-        field_f_b.g4b               \
-        field_forward.g4b           \
-        frame_backward.g4b          \
-        frame_f_b.g4b               \
-        frame_forward.g4b           \
-        dual_prime_igd.g4b              \
-        field_backward_igd.g4b          \
-        field_f_b_igd.g4b               \
-        field_forward_igd.g4b           \
-        frame_backward_igd.g4b          \
-        frame_f_b_igd.g4b               \
-        frame_forward_igd.g4b           \
-        ipicture.g4b                \
-        null.g4b
-
-EXTRA_DIST =            \
-        $(INTEL_G4A)    \
-        $(INTEL_G4I)    \
-        $(INTEL_G4B)    
-
-if HAVE_GEN4ASM
-
-SUFFIXES = .g4a .g4b
-.g4a.g4b:
-	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
-
-$(INTEL_G4B): $(INTEL_G4I)
-
-BUILT_SOURCES= $(INTEL_G4B)
-
-clean-local:
-	-rm -f $(INTEL_G4B)
-endif
+libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread -ldrm_intel
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.in	2009-06-09 04:54:33.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +39,10 @@ host_triplet = @host@
 subdir = src/xvmc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,39 +57,45 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 libI810XvMC_la_DEPENDENCIES =
 am_libI810XvMC_la_OBJECTS = libI810XvMC_la-I810XvMC.lo
 libI810XvMC_la_OBJECTS = $(am_libI810XvMC_la_OBJECTS)
-libI810XvMC_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libI810XvMC_la_CFLAGS) \
-	$(CFLAGS) $(libI810XvMC_la_LDFLAGS) $(LDFLAGS) -o $@
 @XVMC_TRUE@am_libI810XvMC_la_rpath = -rpath $(libdir)
 libIntelXvMC_la_DEPENDENCIES =
 am_libIntelXvMC_la_OBJECTS = libIntelXvMC_la-intel_xvmc.lo \
 	libIntelXvMC_la-intel_xvmc_dump.lo \
 	libIntelXvMC_la-i915_xvmc.lo libIntelXvMC_la-i965_xvmc.lo \
-	libIntelXvMC_la-intel_batchbuffer.lo \
-	libIntelXvMC_la-xf86dri.lo
+	libIntelXvMC_la-xvmc_vld.lo \
+	libIntelXvMC_la-intel_batchbuffer.lo
 libIntelXvMC_la_OBJECTS = $(am_libIntelXvMC_la_OBJECTS)
-libIntelXvMC_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libIntelXvMC_la_CFLAGS) \
-	$(CFLAGS) $(libIntelXvMC_la_LDFLAGS) $(LDFLAGS) -o $@
 @XVMC_TRUE@am_libIntelXvMC_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libI810XvMC_la_SOURCES) $(libIntelXvMC_la_SOURCES)
 DIST_SOURCES = $(libI810XvMC_la_SOURCES) $(libIntelXvMC_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -94,41 +103,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -136,12 +162,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -149,13 +174,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -169,26 +189,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -200,13 +221,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -220,7 +239,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -231,17 +249,14 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 @XVMC_TRUE@lib_LTLIBRARIES = libI810XvMC.la libIntelXvMC.la
+SUBDIRS = shader
 libI810XvMC_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
 
-libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
+libI810XvMC_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 
 libI810XvMC_la_LDFLAGS = -version-number 1:0:0
@@ -255,111 +270,26 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
         i915_xvmc.h                    \
         i965_xvmc.c                    \
         i965_xvmc.h                    \
+        xvmc_vld.c                     \
+        xvmc_vld.h                     \
         intel_batchbuffer.c            \
-        intel_batchbuffer.h            \
-        xf86dri.c                      \
-        xf86dri.h                      \
-        xf86dristr.h
+        intel_batchbuffer.h
 
 libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 
 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread
-INTEL_G4A = \
-        dual_prime_igd.g4a              \
-        field_backward_igd.g4a          \
-        field_f_b_igd.g4a               \
-        field_forward_igd.g4a           \
-        frame_backward_igd.g4a          \
-        frame_f_b_igd.g4a               \
-        frame_forward_igd.g4a           \
-        dual_prime.g4a              \
-        field_backward.g4a          \
-        field_f_b.g4a               \
-        field_forward.g4a           \
-        frame_backward.g4a          \
-        frame_f_b.g4a               \
-        frame_forward.g4a           \
-        ipicture.g4a                \
-        null.g4a
-
-INTEL_G4I = \
-        addidct.g4i                              \
-        block_clear.g4i                          \
-        read_frame_x0y0_y.g4i                    \
-        read_frame_x0y1_y.g4i                    \
-        read_frame_x1y0_y.g4i                    \
-        read_frame_x1y1_y.g4i                    \
-        read_frame_x0y0_uv.g4i                   \
-        read_frame_x0y1_uv.g4i                   \
-        read_frame_x1y0_uv.g4i                   \
-        read_frame_x1y1_uv.g4i                   \
-        read_frame_x0y0_y_igd.g4i                    \
-        read_frame_x0y1_y_igd.g4i                    \
-        read_frame_x1y0_y_igd.g4i                    \
-        read_frame_x1y1_y_igd.g4i                    \
-        read_frame_x0y0_uv_igd.g4i                   \
-        read_frame_x0y1_uv_igd.g4i                   \
-        read_frame_x1y0_uv_igd.g4i                   \
-        read_frame_x1y1_uv_igd.g4i                   \
-        motion_frame_y.g4i                       \
-        motion_frame_uv.g4i                      \
-        read_field_x0y0_y.g4i                    \
-        read_field_x0y1_y.g4i                    \
-        read_field_x1y0_y.g4i                    \
-        read_field_x1y1_y.g4i                    \
-        read_field_x0y0_uv.g4i                   \
-        read_field_x0y1_uv.g4i                   \
-        read_field_x1y0_uv.g4i                   \
-        read_field_x1y1_uv.g4i                   \
-        read_field_x0y0_y_igd.g4i                    \
-        read_field_x0y1_y_igd.g4i                    \
-        read_field_x1y0_y_igd.g4i                    \
-        read_field_x1y1_y_igd.g4i                    \
-        read_field_x0y0_uv_igd.g4i                   \
-        read_field_x0y1_uv_igd.g4i                   \
-        read_field_x1y0_uv_igd.g4i                   \
-        read_field_x1y1_uv_igd.g4i                   \
-        motion_field_y.g4i                       \
-        motion_field_uv.g4i
-
-INTEL_G4B = \
-        dual_prime.g4b              \
-        field_backward.g4b          \
-        field_f_b.g4b               \
-        field_forward.g4b           \
-        frame_backward.g4b          \
-        frame_f_b.g4b               \
-        frame_forward.g4b           \
-        dual_prime_igd.g4b              \
-        field_backward_igd.g4b          \
-        field_f_b_igd.g4b               \
-        field_forward_igd.g4b           \
-        frame_backward_igd.g4b          \
-        frame_f_b_igd.g4b               \
-        frame_forward_igd.g4b           \
-        ipicture.g4b                \
-        null.g4b
-
-EXTRA_DIST = \
-        $(INTEL_G4A)    \
-        $(INTEL_G4I)    \
-        $(INTEL_G4B)    
-
-@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
-@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread -ldrm_intel
+all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .g4a .g4b .c .lo .o .obj
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -385,21 +315,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -411,9 +341,9 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libI810XvMC.la: $(libI810XvMC_la_OBJECTS) $(libI810XvMC_la_DEPENDENCIES) 
-	$(libI810XvMC_la_LINK) $(am_libI810XvMC_la_rpath) $(libI810XvMC_la_OBJECTS) $(libI810XvMC_la_LIBADD) $(LIBS)
+	$(LINK) $(am_libI810XvMC_la_rpath) $(libI810XvMC_la_LDFLAGS) $(libI810XvMC_la_OBJECTS) $(libI810XvMC_la_LIBADD) $(LIBS)
 libIntelXvMC.la: $(libIntelXvMC_la_OBJECTS) $(libIntelXvMC_la_DEPENDENCIES) 
-	$(libIntelXvMC_la_LINK) $(am_libIntelXvMC_la_rpath) $(libIntelXvMC_la_OBJECTS) $(libIntelXvMC_la_LIBADD) $(LIBS)
+	$(LINK) $(am_libIntelXvMC_la_rpath) $(libIntelXvMC_la_LDFLAGS) $(libIntelXvMC_la_OBJECTS) $(libIntelXvMC_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -427,77 +357,77 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-intel_xvmc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-xf86dri.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-xvmc_vld.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libI810XvMC_la-I810XvMC.lo: I810XvMC.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libI810XvMC_la_CFLAGS) $(CFLAGS) -MT libI810XvMC_la-I810XvMC.lo -MD -MP -MF $(DEPDIR)/libI810XvMC_la-I810XvMC.Tpo -c -o libI810XvMC_la-I810XvMC.lo `test -f 'I810XvMC.c' || echo '$(srcdir)/'`I810XvMC.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libI810XvMC_la-I810XvMC.Tpo $(DEPDIR)/libI810XvMC_la-I810XvMC.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libI810XvMC_la_CFLAGS) $(CFLAGS) -MT libI810XvMC_la-I810XvMC.lo -MD -MP -MF "$(DEPDIR)/libI810XvMC_la-I810XvMC.Tpo" -c -o libI810XvMC_la-I810XvMC.lo `test -f 'I810XvMC.c' || echo '$(srcdir)/'`I810XvMC.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libI810XvMC_la-I810XvMC.Tpo" "$(DEPDIR)/libI810XvMC_la-I810XvMC.Plo"; else rm -f "$(DEPDIR)/libI810XvMC_la-I810XvMC.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='I810XvMC.c' object='libI810XvMC_la-I810XvMC.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libI810XvMC_la_CFLAGS) $(CFLAGS) -c -o libI810XvMC_la-I810XvMC.lo `test -f 'I810XvMC.c' || echo '$(srcdir)/'`I810XvMC.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libI810XvMC_la_CFLAGS) $(CFLAGS) -c -o libI810XvMC_la-I810XvMC.lo `test -f 'I810XvMC.c' || echo '$(srcdir)/'`I810XvMC.c
 
 libIntelXvMC_la-intel_xvmc.lo: intel_xvmc.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-intel_xvmc.lo -MD -MP -MF $(DEPDIR)/libIntelXvMC_la-intel_xvmc.Tpo -c -o libIntelXvMC_la-intel_xvmc.lo `test -f 'intel_xvmc.c' || echo '$(srcdir)/'`intel_xvmc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIntelXvMC_la-intel_xvmc.Tpo $(DEPDIR)/libIntelXvMC_la-intel_xvmc.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-intel_xvmc.lo -MD -MP -MF "$(DEPDIR)/libIntelXvMC_la-intel_xvmc.Tpo" -c -o libIntelXvMC_la-intel_xvmc.lo `test -f 'intel_xvmc.c' || echo '$(srcdir)/'`intel_xvmc.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libIntelXvMC_la-intel_xvmc.Tpo" "$(DEPDIR)/libIntelXvMC_la-intel_xvmc.Plo"; else rm -f "$(DEPDIR)/libIntelXvMC_la-intel_xvmc.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='intel_xvmc.c' object='libIntelXvMC_la-intel_xvmc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-intel_xvmc.lo `test -f 'intel_xvmc.c' || echo '$(srcdir)/'`intel_xvmc.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-intel_xvmc.lo `test -f 'intel_xvmc.c' || echo '$(srcdir)/'`intel_xvmc.c
 
 libIntelXvMC_la-intel_xvmc_dump.lo: intel_xvmc_dump.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-intel_xvmc_dump.lo -MD -MP -MF $(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Tpo -c -o libIntelXvMC_la-intel_xvmc_dump.lo `test -f 'intel_xvmc_dump.c' || echo '$(srcdir)/'`intel_xvmc_dump.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Tpo $(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-intel_xvmc_dump.lo -MD -MP -MF "$(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Tpo" -c -o libIntelXvMC_la-intel_xvmc_dump.lo `test -f 'intel_xvmc_dump.c' || echo '$(srcdir)/'`intel_xvmc_dump.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Tpo" "$(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Plo"; else rm -f "$(DEPDIR)/libIntelXvMC_la-intel_xvmc_dump.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='intel_xvmc_dump.c' object='libIntelXvMC_la-intel_xvmc_dump.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-intel_xvmc_dump.lo `test -f 'intel_xvmc_dump.c' || echo '$(srcdir)/'`intel_xvmc_dump.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-intel_xvmc_dump.lo `test -f 'intel_xvmc_dump.c' || echo '$(srcdir)/'`intel_xvmc_dump.c
 
 libIntelXvMC_la-i915_xvmc.lo: i915_xvmc.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-i915_xvmc.lo -MD -MP -MF $(DEPDIR)/libIntelXvMC_la-i915_xvmc.Tpo -c -o libIntelXvMC_la-i915_xvmc.lo `test -f 'i915_xvmc.c' || echo '$(srcdir)/'`i915_xvmc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIntelXvMC_la-i915_xvmc.Tpo $(DEPDIR)/libIntelXvMC_la-i915_xvmc.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-i915_xvmc.lo -MD -MP -MF "$(DEPDIR)/libIntelXvMC_la-i915_xvmc.Tpo" -c -o libIntelXvMC_la-i915_xvmc.lo `test -f 'i915_xvmc.c' || echo '$(srcdir)/'`i915_xvmc.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libIntelXvMC_la-i915_xvmc.Tpo" "$(DEPDIR)/libIntelXvMC_la-i915_xvmc.Plo"; else rm -f "$(DEPDIR)/libIntelXvMC_la-i915_xvmc.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i915_xvmc.c' object='libIntelXvMC_la-i915_xvmc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-i915_xvmc.lo `test -f 'i915_xvmc.c' || echo '$(srcdir)/'`i915_xvmc.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-i915_xvmc.lo `test -f 'i915_xvmc.c' || echo '$(srcdir)/'`i915_xvmc.c
 
 libIntelXvMC_la-i965_xvmc.lo: i965_xvmc.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-i965_xvmc.lo -MD -MP -MF $(DEPDIR)/libIntelXvMC_la-i965_xvmc.Tpo -c -o libIntelXvMC_la-i965_xvmc.lo `test -f 'i965_xvmc.c' || echo '$(srcdir)/'`i965_xvmc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIntelXvMC_la-i965_xvmc.Tpo $(DEPDIR)/libIntelXvMC_la-i965_xvmc.Plo
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-i965_xvmc.lo -MD -MP -MF "$(DEPDIR)/libIntelXvMC_la-i965_xvmc.Tpo" -c -o libIntelXvMC_la-i965_xvmc.lo `test -f 'i965_xvmc.c' || echo '$(srcdir)/'`i965_xvmc.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libIntelXvMC_la-i965_xvmc.Tpo" "$(DEPDIR)/libIntelXvMC_la-i965_xvmc.Plo"; else rm -f "$(DEPDIR)/libIntelXvMC_la-i965_xvmc.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i965_xvmc.c' object='libIntelXvMC_la-i965_xvmc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-i965_xvmc.lo `test -f 'i965_xvmc.c' || echo '$(srcdir)/'`i965_xvmc.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-i965_xvmc.lo `test -f 'i965_xvmc.c' || echo '$(srcdir)/'`i965_xvmc.c
 
-libIntelXvMC_la-intel_batchbuffer.lo: intel_batchbuffer.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-intel_batchbuffer.lo -MD -MP -MF $(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Tpo -c -o libIntelXvMC_la-intel_batchbuffer.lo `test -f 'intel_batchbuffer.c' || echo '$(srcdir)/'`intel_batchbuffer.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Tpo $(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='intel_batchbuffer.c' object='libIntelXvMC_la-intel_batchbuffer.lo' libtool=yes @AMDEPBACKSLASH@
+libIntelXvMC_la-xvmc_vld.lo: xvmc_vld.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-xvmc_vld.lo -MD -MP -MF "$(DEPDIR)/libIntelXvMC_la-xvmc_vld.Tpo" -c -o libIntelXvMC_la-xvmc_vld.lo `test -f 'xvmc_vld.c' || echo '$(srcdir)/'`xvmc_vld.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libIntelXvMC_la-xvmc_vld.Tpo" "$(DEPDIR)/libIntelXvMC_la-xvmc_vld.Plo"; else rm -f "$(DEPDIR)/libIntelXvMC_la-xvmc_vld.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xvmc_vld.c' object='libIntelXvMC_la-xvmc_vld.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-intel_batchbuffer.lo `test -f 'intel_batchbuffer.c' || echo '$(srcdir)/'`intel_batchbuffer.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-xvmc_vld.lo `test -f 'xvmc_vld.c' || echo '$(srcdir)/'`xvmc_vld.c
 
-libIntelXvMC_la-xf86dri.lo: xf86dri.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-xf86dri.lo -MD -MP -MF $(DEPDIR)/libIntelXvMC_la-xf86dri.Tpo -c -o libIntelXvMC_la-xf86dri.lo `test -f 'xf86dri.c' || echo '$(srcdir)/'`xf86dri.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIntelXvMC_la-xf86dri.Tpo $(DEPDIR)/libIntelXvMC_la-xf86dri.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xf86dri.c' object='libIntelXvMC_la-xf86dri.lo' libtool=yes @AMDEPBACKSLASH@
+libIntelXvMC_la-intel_batchbuffer.lo: intel_batchbuffer.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-intel_batchbuffer.lo -MD -MP -MF "$(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Tpo" -c -o libIntelXvMC_la-intel_batchbuffer.lo `test -f 'intel_batchbuffer.c' || echo '$(srcdir)/'`intel_batchbuffer.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Tpo" "$(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Plo"; else rm -f "$(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='intel_batchbuffer.c' object='libIntelXvMC_la-intel_batchbuffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-xf86dri.lo `test -f 'xf86dri.c' || echo '$(srcdir)/'`xf86dri.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-intel_batchbuffer.lo `test -f 'intel_batchbuffer.c' || echo '$(srcdir)/'`intel_batchbuffer.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -505,41 +435,130 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -553,21 +572,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -578,24 +598,38 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-recursive
 all-am: Makefile $(LTLIBRARIES)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -611,90 +645,74 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@HAVE_GEN4ASM_FALSE@clean-local:
-clean: clean-am
+clean: clean-recursive
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
-info: info-am
+info: info-recursive
 
 info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-am
-
 install-exec-am: install-libLTLIBRARIES
 
-install-html: install-html-am
-
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
 
-.MAKE: install-am install-strip
+uninstall-info: uninstall-info-recursive
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-local ctags distclean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-recursive ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
-
-@HAVE_GEN4ASM_TRUE@.g4a.g4b:
-@HAVE_GEN4ASM_TRUE@	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
-
-@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am uninstall-libLTLIBRARIES
 
-@HAVE_GEN4ASM_TRUE@clean-local:
-@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B)
 # 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 -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1 @@
+SUBDIRS = mc vld 
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,532 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/xvmc/shader
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRIVER_NAME = @DRIVER_NAME@
+DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
+DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
+DRM_CFLAGS = @DRM_CFLAGS@
+DRM_LIBS = @DRM_LIBS@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
+GREP = @GREP@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = mc vld 
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/xvmc/shader/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  src/xvmc/shader/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,152 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (8) g1.0<1>UD g76.0<8,8,1>UD{align1};
+//mov (8) g2.0<1>UD g77.0<8,8,1>UD{align1};
+
+mov (16) g44.1<2>UB 0W {align1};
+mov (16) g45.1<2>UB 0W {align1};
+mov (16) g46.1<2>UB 0W {align1};
+mov (16) g47.1<2>UB 0W {align1};
+mov (16) g48.1<2>UB 0W {align1};
+mov (16) g49.1<2>UB 0W {align1};
+mov (16) g50.1<2>UB 0W {align1};
+mov (16) g51.1<2>UB 0W {align1};
+
+and.nz (1) null g1.30<1,1,1>UB 1UW {align1};       //dct_type
+(f0) jmpi field_dct;
+//jmpi field_dct;
+add (16) g28.0<1>W g3.0<16,16,1>W g28.0<16,16,2>UB {align1};
+add (16) g29.0<1>W g4.0<16,16,1>W g29.0<16,16,2>UB {align1};
+add (16) g30.0<1>W g5.0<16,16,1>W g30.0<16,16,2>UB {align1};
+add (16) g31.0<1>W g6.0<16,16,1>W g31.0<16,16,2>UB {align1};
+add (16) g32.0<1>W g7.0<16,16,1>W g32.0<16,16,2>UB {align1};
+add (16) g33.0<1>W g8.0<16,16,1>W g33.0<16,16,2>UB {align1};
+add (16) g34.0<1>W g9.0<16,16,1>W g34.0<16,16,2>UB {align1};
+add (16) g35.0<1>W g10.0<16,16,1>W g35.0<16,16,2>UB {align1};
+add (16) g36.0<1>W g11.0<16,16,1>W g36.0<16,16,2>UB {align1};
+add (16) g37.0<1>W g12.0<16,16,1>W g37.0<16,16,2>UB {align1};
+add (16) g38.0<1>W g13.0<16,16,1>W g38.0<16,16,2>UB {align1};
+add (16) g39.0<1>W g14.0<16,16,1>W g39.0<16,16,2>UB {align1};
+add (16) g40.0<1>W g15.0<16,16,1>W g40.0<16,16,2>UB {align1};
+add (16) g41.0<1>W g16.0<16,16,1>W g41.0<16,16,2>UB {align1};
+add (16) g42.0<1>W g17.0<16,16,1>W g42.0<16,16,2>UB {align1};
+add (16) g43.0<1>W g18.0<16,16,1>W g43.0<16,16,2>UB {align1};
+jmpi write_back;
+
+field_dct:
+add (16) g28.0<1>W g3.0<16,16,1>W g28.0<16,16,2>UB {align1};
+add (16) g29.0<1>W g11.0<16,16,1>W g29.0<16,16,2>UB {align1};
+add (16) g30.0<1>W g4.0<16,16,1>W g30.0<16,16,2>UB {align1};
+add (16) g31.0<1>W g12.0<16,16,1>W g31.0<16,16,2>UB {align1};
+add (16) g32.0<1>W g5.0<16,16,1>W g32.0<16,16,2>UB {align1};
+add (16) g33.0<1>W g13.0<16,16,1>W g33.0<16,16,2>UB {align1};
+add (16) g34.0<1>W g6.0<16,16,1>W g34.0<16,16,2>UB {align1};
+add (16) g35.0<1>W g14.0<16,16,1>W g35.0<16,16,2>UB {align1};
+add (16) g36.0<1>W g7.0<16,16,1>W g36.0<16,16,2>UB {align1};
+add (16) g37.0<1>W g15.0<16,16,1>W g37.0<16,16,2>UB {align1};
+add (16) g38.0<1>W g8.0<16,16,1>W g38.0<16,16,2>UB {align1};
+add (16) g39.0<1>W g16.0<16,16,1>W g39.0<16,16,2>UB {align1};
+add (16) g40.0<1>W g9.0<16,16,1>W g40.0<16,16,2>UB {align1};
+add (16) g41.0<1>W g17.0<16,16,1>W g41.0<16,16,2>UB {align1};
+add (16) g42.0<1>W g10.0<16,16,1>W g42.0<16,16,2>UB {align1};
+add (16) g43.0<1>W g18.0<16,16,1>W g43.0<16,16,2>UB {align1};
+
+write_back:
+mov (1) g1.8<1>UD 0x00F000FUD {align1};
+mov.sat (16) g28.0<2>UB g28.0<16,16,1>W {align1};
+mov.sat (16) g29.0<2>UB g29.0<16,16,1>W {align1};
+mov.sat (16) g30.0<2>UB g30.0<16,16,1>W {align1};
+mov.sat (16) g31.0<2>UB g31.0<16,16,1>W {align1};
+mov.sat (16) g32.0<2>UB g32.0<16,16,1>W {align1};
+mov.sat (16) g33.0<2>UB g33.0<16,16,1>W {align1};
+mov.sat (16) g34.0<2>UB g34.0<16,16,1>W {align1};
+mov.sat (16) g35.0<2>UB g35.0<16,16,1>W {align1};
+mov.sat (16) g36.0<2>UB g36.0<16,16,1>W {align1};
+mov.sat (16) g37.0<2>UB g37.0<16,16,1>W {align1};
+mov.sat (16) g38.0<2>UB g38.0<16,16,1>W {align1};
+mov.sat (16) g39.0<2>UB g39.0<16,16,1>W {align1};
+mov.sat (16) g40.0<2>UB g40.0<16,16,1>W {align1};
+mov.sat (16) g41.0<2>UB g41.0<16,16,1>W {align1};
+mov.sat (16) g42.0<2>UB g42.0<16,16,1>W {align1};
+mov.sat (16) g43.0<2>UB g43.0<16,16,1>W {align1};
+
+mov (16) m1.0<1>UB g28.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g29.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g30.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g31.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB g32.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g33.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB g34.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g35.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB g36.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g37.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB g38.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g39.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB g40.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g41.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB g42.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g43.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(0,0,2,0) mlen 9 rlen 0 {align1};
+
+//U
+mov (1) g1.8<1>UD 0x0070007UD  { align1 };
+shr (2) g1.0<1>UD g1.0<2,2,1>UD 1D {align1};
+add (16) g44.0<1>UW g19.0<16,16,1>W g44.0<16,16,1>UW {align1};
+add (16) g45.0<1>UW g20.0<16,16,1>W g45.0<16,16,1>UW {align1};
+add (16) g46.0<1>UW g21.0<16,16,1>W g46.0<16,16,1>UW {align1};
+add (16) g47.0<1>UW g22.0<16,16,1>W g47.0<16,16,1>UW {align1};
+mov.sat (16) g44.0<2>UB g44.0<16,16,1>UW {align1};
+mov.sat (16) g45.0<2>UB g45.0<16,16,1>UW {align1};
+mov.sat (16) g46.0<2>UB g46.0<16,16,1>UW {align1};
+mov.sat (16) g47.0<2>UB g47.0<16,16,1>UW {align1};
+
+mov (16) m1.0<1>UB g44.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g45.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g46.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g47.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+//V
+add (16) g48.0<1>UW g23.0<16,16,1>W g48.0<16,16,1>UW {align1};
+add (16) g49.0<1>UW g24.0<16,16,1>W g49.0<16,16,1>UW {align1};
+add (16) g50.0<1>UW g25.0<16,16,1>W g50.0<16,16,1>UW {align1};
+add (16) g51.0<1>UW g26.0<16,16,1>W g51.0<16,16,1>UW {align1};
+mov.sat (16) g48.0<2>UB g48.0<16,16,1>UW {align1};
+mov.sat (16) g49.0<2>UB g49.0<16,16,1>UW {align1};
+mov.sat (16) g50.0<2>UB g50.0<16,16,1>UW {align1};
+mov.sat (16) g51.0<2>UB g51.0<16,16,1>UW {align1};
+
+mov (16) m1.0<1>UB g48.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g49.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g50.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g51.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW
+        thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/addidct_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,117 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g84~g107:IDCT data                           */
+//mov (2) g31.0<1>UD g82.12<2,2,1>UW {align1};          //restore x and y
+mov (2) g31.0<1>UD g82.0<2,2,1>UD {align1};          //restore x and y
+
+and.nz (1) null g82.30<1,1,1>UB 0x1UW {align1};       //dct_type
+(f0) jmpi field_dct;
+
+add.sat (32) g58.0<2>UB g84.0<16,16,1>W g58.0<16,16,2>UB {align1 compr};
+add.sat (32) g60.0<2>UB g86.0<16,16,1>W g60.0<16,16,2>UB {align1 compr};
+add.sat (32) g62.0<2>UB g88.0<16,16,1>W g62.0<16,16,2>UB {align1 compr};
+add.sat (32) g64.0<2>UB g90.0<16,16,1>W g64.0<16,16,2>UB {align1 compr};
+add.sat (32) g66.0<2>UB g92.0<16,16,1>W g66.0<16,16,2>UB {align1 compr};
+add.sat (32) g68.0<2>UB g94.0<16,16,1>W g68.0<16,16,2>UB {align1 compr};
+add.sat (32) g70.0<2>UB g96.0<16,16,1>W g70.0<16,16,2>UB {align1 compr};
+add.sat (32) g72.0<2>UB g98.0<16,16,1>W g72.0<16,16,2>UB {align1 compr};
+
+add.sat (32) g74.0<2>UB g100.0<16,16,1>W g74.0<16,16,2>UB {align1 compr};
+add.sat (32) g76.0<2>UB g102.0<16,16,1>W g76.0<16,16,2>UB {align1 compr};
+add.sat (32) g78.0<2>UB g104.0<16,16,1>W g78.0<16,16,2>UB {align1 compr};
+add.sat (32) g80.0<2>UB g106.0<16,16,1>W g80.0<16,16,2>UB {align1 compr};
+jmpi write_back;
+
+field_dct:
+add.sat (16) g58.0<2>UB g84.0<16,16,1>W g58.0<16,16,2>UB {align1};
+add.sat (16) g59.0<2>UB g92.0<16,16,1>W g59.0<16,16,2>UB {align1};
+add.sat (16) g60.0<2>UB g85.0<16,16,1>W g60.0<16,16,2>UB {align1};
+add.sat (16) g61.0<2>UB g93.0<16,16,1>W g61.0<16,16,2>UB {align1};
+add.sat (16) g62.0<2>UB g86.0<16,16,1>W g62.0<16,16,2>UB {align1};
+add.sat (16) g63.0<2>UB g94.0<16,16,1>W g63.0<16,16,2>UB {align1};
+add.sat (16) g64.0<2>UB g87.0<16,16,1>W g64.0<16,16,2>UB {align1};
+add.sat (16) g65.0<2>UB g95.0<16,16,1>W g65.0<16,16,2>UB {align1};
+add.sat (16) g66.0<2>UB g88.0<16,16,1>W g66.0<16,16,2>UB {align1};
+add.sat (16) g67.0<2>UB g96.0<16,16,1>W g67.0<16,16,2>UB {align1};
+add.sat (16) g68.0<2>UB g89.0<16,16,1>W g68.0<16,16,2>UB {align1};
+add.sat (16) g69.0<2>UB g97.0<16,16,1>W g69.0<16,16,2>UB {align1};
+add.sat (16) g70.0<2>UB g90.0<16,16,1>W g70.0<16,16,2>UB {align1};
+add.sat (16) g71.0<2>UB g98.0<16,16,1>W g71.0<16,16,2>UB {align1};
+add.sat (16) g72.0<2>UB g91.0<16,16,1>W g72.0<16,16,2>UB {align1};
+add.sat (16) g73.0<2>UB g99.0<16,16,1>W g73.0<16,16,2>UB {align1};
+/*
+add.sat (16) g74.0<2>UB g100.0<16,16,1>W g74.0<16,16,2>UB {align1};
+add.sat (16) g75.0<2>UB g101.0<16,16,1>W g75.0<16,16,2>UB {align1};
+add.sat (16) g76.0<2>UB g102.0<16,16,1>W g76.0<16,16,2>UB {align1};
+add.sat (16) g77.0<2>UB g103.0<16,16,1>W g77.0<16,16,2>UB {align1};
+add.sat (16) g78.0<2>UB g104.0<16,16,1>W g78.0<16,16,2>UB {align1};
+add.sat (16) g79.0<2>UB g105.0<16,16,1>W g79.0<16,16,2>UB {align1};
+add.sat (16) g80.0<2>UB g106.0<16,16,1>W g80.0<16,16,2>UB {align1};
+add.sat (16) g81.0<2>UB g107.0<16,16,1>W g81.0<16,16,2>UB {align1};
+*/
+add (16) g100.0<1>W g100.0<16,16,1>W g74.0<16,16,2>UB {align1};
+add (16) g101.0<1>W g101.0<16,16,1>W g75.0<16,16,2>UB {align1};
+add (16) g102.0<1>W g102.0<16,16,1>W g76.0<16,16,2>UB {align1};
+add (16) g103.0<1>W g103.0<16,16,1>W g77.0<16,16,2>UB {align1};
+add (16) g104.0<1>W g104.0<16,16,1>W g78.0<16,16,2>UB {align1};
+add (16) g105.0<1>W g105.0<16,16,1>W g79.0<16,16,2>UB {align1};
+add (16) g106.0<1>W g106.0<16,16,1>W g80.0<16,16,2>UB {align1};
+add (16) g107.0<1>W g107.0<16,16,1>W g81.0<16,16,2>UB {align1};
+
+mov.sat (16) g74.0<2>UB g100.0<16,16,1>W {align1};
+mov.sat (16) g75.0<2>UB g101.0<16,16,1>W {align1};
+mov.sat (16) g76.0<2>UB g102.0<16,16,1>W {align1};
+mov.sat (16) g77.0<2>UB g103.0<16,16,1>W {align1};
+mov.sat (16) g78.0<2>UB g104.0<16,16,1>W {align1};
+mov.sat (16) g79.0<2>UB g105.0<16,16,1>W {align1};
+mov.sat (16) g80.0<2>UB g106.0<16,16,1>W {align1};
+mov.sat (16) g81.0<2>UB g107.0<16,16,1>W {align1};
+
+
+write_back:
+mov (1) g31.8<1>UD 0x00F000FUD {align1};
+
+mov (16) m1.0<1>UB  g58.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g59.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g60.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g61.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB  g62.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g63.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB  g64.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g65.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB  g66.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g67.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB  g68.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g69.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB  g70.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g71.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB  g72.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g73.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(0,0,2,0) mlen 9 rlen 0 {align1};
+
+//U
+mov (1) g31.8<1>UD 0x0070007UD  { align1 };
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1D {align1};
+
+mov (16) m1.0<1>UB g74.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g75.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g76.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g77.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+//V
+mov (16) m1.0<1>UB g78.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g79.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g80.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g81.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW
+        thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/block_clear.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/block_clear.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/block_clear.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/block_clear.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *
+ */
+
+and.nz (1) null g2.0<1,1,1>UD 0x1UD{align1};
+(f0) jmpi direct_idct;
+add (1) g2.8<1>UD g76.8<1,1,1>UD 0UD{align1};
+send (16) 0 g3.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g4.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g5.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g6.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g7.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g8.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g9.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g10.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g11.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g12.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g13.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g14.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g15.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g16.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g17.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g18.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g19.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g20.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g21.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g22.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g23<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g24.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g25.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g26.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+direct_idct:
+
+and.nz (1) null g76.12<1,1,1>UW 0x20UW {align1};
+(f0) jmpi next_block;
+mov (8) g3.0<1>UW 0UW {align1}; 
+mov (8) g4.0<1>UW 0UW {align1}; 
+mov (8) g5.0<1>UW 0UW {align1}; 
+mov (8) g6.0<1>UW 0UW {align1}; 
+mov (8) g7.0<1>UW 0UW {align1}; 
+mov (8) g8.0<1>UW 0UW {align1}; 
+mov (8) g9.0<1>UW 0UW {align1}; 
+mov (8) g10.0<1>UW 0UW {align1}; 
+next_block:
+
+and.nz (1) null g1.12<1,1,1>UW 0x10UW {align1};
+(f0) jmpi next_field;
+mov (8) g3.16<1>UW 0UW {align1}; 
+mov (8) g4.16<1>UW 0UW {align1}; 
+mov (8) g5.16<1>UW 0UW {align1}; 
+mov (8) g6.16<1>UW 0UW {align1}; 
+mov (8) g7.16<1>UW 0UW {align1}; 
+mov (8) g8.16<1>UW 0UW {align1}; 
+mov (8) g9.16<1>UW 0UW {align1}; 
+mov (8) g10.16<1>UW 0UW {align1}; 
+next_field:
+and.nz (1) null g1.12<1,1,1>UW 0x8UW {align1};
+(f0) jmpi next_field;
+mov (8) g11.0<1>UW 0UW {align1}; 
+mov (8) g12.0<1>UW 0UW {align1}; 
+mov (8) g13.0<1>UW 0UW {align1}; 
+mov (8) g14.0<1>UW 0UW {align1}; 
+mov (8) g15.0<1>UW 0UW {align1}; 
+mov (8) g16.0<1>UW 0UW {align1}; 
+mov (8) g17.0<1>UW 0UW {align1}; 
+mov (8) g18.0<1>UW 0UW {align1}; 
+next_field:
+and.nz (1) null g1.12<1,1,1>UW 0x4UW {align1};
+(f0) jmpi next_field;
+mov (8) g11.16<1>UW 0UW {align1}; 
+mov (8) g12.16<1>UW 0UW {align1}; 
+mov (8) g13.16<1>UW 0UW {align1}; 
+mov (8) g14.16<1>UW 0UW {align1}; 
+mov (8) g15.16<1>UW 0UW {align1}; 
+mov (8) g16.16<1>UW 0UW {align1}; 
+mov (8) g17.16<1>UW 0UW {align1}; 
+mov (8) g18.16<1>UW 0UW {align1}; 
+next_field:
+
+and.nz (1) null g1.12<1,1,1>UW 0x2UW {align1};
+(f0) jmpi next_field;
+mov (16) g19.0<1>UW 0UW {align1}; 
+mov (16) g20.0<1>UW 0UW {align1}; 
+mov (16) g21.0<1>UW 0UW {align1}; 
+mov (16) g22.0<1>UW 0UW {align1}; 
+next_field:
+
+and.nz (1) null g1.12<1,1,1>UW 0x1UW {align1};
+(f0) jmpi next_field;
+mov (16) g23.0<1>UW 0UW {align1}; 
+mov (16) g24.0<1>UW 0UW {align1}; 
+mov (16) g25.0<1>UW 0UW {align1}; 
+mov (16) g26.0<1>UW 0UW {align1}; 
+next_field:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
+mov (8) g116.0<1>UD g1.0<8,8,1>UD {align1};
+
+/* forward---Y---first vector*/
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`4')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_y.g4i')
+mov (8) g52.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g54.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g56.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g58.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*forward---Y---second vector*/
+asr (2) g115.14<1>W g1.22<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x4UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`4')
+define(`mv1',`g1.22')
+define(`mv2',`g1.24')
+include(`motion_field_y.g4i')
+mov (8) g53.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g55.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g57.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g59.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*forward---UV---first vector*/
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`5')
+define(`surface_v',`6')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_uv.g4i')
+mov (8) g68.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g69.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g70.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g71.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g72.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g73.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g74.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g75.0<1>UW g85.0<8,8,1>UW {align1};
+
+/*forward---UV---second vector */
+asr (2) g115.14<1>W g1.22<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.24')
+define(`mv2',`g1.26')
+include(`motion_field_uv.g4i')
+mov (8) g68.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g69.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g70.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g71.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g72.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g73.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g74.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g75.16<1>UW g85.0<8,8,1>UW {align1};
+
+/*backward---Y---first vector */
+mov(8) g1.0<1>UD g116.0<8,8,1>UD {align1};
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+mov(1) g1.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_y.g4i')
+mov (8) g28.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g30.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g32.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g34.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g36.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g38.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g40.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g42.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*backward---Y---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g2.20<1,1,1>UD 0x8UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_y.g4i')
+
+avg.sat (16) g28.0<1>UW g52.0<16,16,1>UW g28.0<16,16,1>UW {align1};
+avg.sat (16) g29.0<1>UW g53.0<16,16,1>UW g96.0<16,16,1>UW {align1};
+avg.sat (16) g30.0<1>UW g54.0<16,16,1>UW g30.0<16,16,1>UW {align1};
+avg.sat (16) g31.0<1>UW g55.0<16,16,1>UW g97.0<16,16,1>UW {align1};
+avg.sat (16) g32.0<1>UW g56.0<16,16,1>UW g32.0<16,16,1>UW {align1};
+avg.sat (16) g33.0<1>UW g57.0<16,16,1>UW g98.0<16,16,1>UW {align1};
+avg.sat (16) g34.0<1>UW g58.0<16,16,1>UW g34.0<16,16,1>UW {align1};
+avg.sat (16) g35.0<1>UW g59.0<16,16,1>UW g99.0<16,16,1>UW {align1};
+avg.sat (16) g36.0<1>UW g60.0<16,16,1>UW g36.0<16,16,1>UW {align1};
+avg.sat (16) g37.0<1>UW g61.0<16,16,1>UW g100.0<16,16,1>UW {align1};
+avg.sat (16) g38.0<1>UW g62.0<16,16,1>UW g38.0<16,16,1>UW {align1};
+avg.sat (16) g39.0<1>UW g63.0<16,16,1>UW g101.0<16,16,1>UW {align1};
+avg.sat (16) g40.0<1>UW g64.0<16,16,1>UW g40.0<16,16,1>UW {align1};
+avg.sat (16) g41.0<1>UW g65.0<16,16,1>UW g102.0<16,16,1>UW {align1};
+avg.sat (16) g42.0<1>UW g66.0<16,16,1>UW g42.0<16,16,1>UW {align1};
+avg.sat (16) g43.0<1>UW g67.0<16,16,1>UW g103.0<16,16,1>UW {align1};
+
+/*backward---UV---first vector */
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`8')
+define(`surface_v',`9')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_uv.g4i')
+mov (8) g44.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.0<1>UW g85.0<8,8,1>UW {align1};
+
+/*backward---UV---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_uv.g4i')
+mov (8) g44.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.16<1>UW g85.0<8,8,1>UW {align1};
+
+avg.sat (16) g44.0<1>UW g68.0<16,16,1>UW g44.0<16,16,1>UW {align1};
+avg.sat (16) g45.0<1>UW g69.0<16,16,1>UW g45.0<16,16,1>UW {align1};
+avg.sat (16) g46.0<1>UW g70.0<16,16,1>UW g46.0<16,16,1>UW {align1};
+avg.sat (16) g47.0<1>UW g71.0<16,16,1>UW g47.0<16,16,1>UW {align1};
+avg.sat (16) g48.0<1>UW g72.0<16,16,1>UW g48.0<16,16,1>UW {align1};
+avg.sat (16) g49.0<1>UW g73.0<16,16,1>UW g49.0<16,16,1>UW {align1};
+avg.sat (16) g50.0<1>UW g74.0<16,16,1>UW g50.0<16,16,1>UW {align1};
+avg.sat (16) g51.0<1>UW g75.0<16,16,1>UW g51.0<16,16,1>UW {align1};
+
+include(`addidct.g4i')
+
+//send (16) 0 acc0<1>UW g0<8,8,1>UW 
+//	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2486 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10680, 0x00b10380 },
+   { 0x80800042, 0x23a02529, 0x00b106a0, 0x00b10c00 },
+   { 0x80800042, 0x23c02529, 0x00b106c0, 0x00b103c0 },
+   { 0x80800042, 0x23e02529, 0x00b106e0, 0x00b10c20 },
+   { 0x80800042, 0x24002529, 0x00b10700, 0x00b10400 },
+   { 0x80800042, 0x24202529, 0x00b10720, 0x00b10c40 },
+   { 0x80800042, 0x24402529, 0x00b10740, 0x00b10440 },
+   { 0x80800042, 0x24602529, 0x00b10760, 0x00b10c60 },
+   { 0x80800042, 0x24802529, 0x00b10780, 0x00b10480 },
+   { 0x80800042, 0x24a02529, 0x00b107a0, 0x00b10c80 },
+   { 0x80800042, 0x24c02529, 0x00b107c0, 0x00b104c0 },
+   { 0x80800042, 0x24e02529, 0x00b107e0, 0x00b10ca0 },
+   { 0x80800042, 0x25002529, 0x00b10800, 0x00b10500 },
+   { 0x80800042, 0x25202529, 0x00b10820, 0x00b10cc0 },
+   { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
+   { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x80800042, 0x25802529, 0x00b10880, 0x00b10580 },
+   { 0x80800042, 0x25a02529, 0x00b108a0, 0x00b105a0 },
+   { 0x80800042, 0x25c02529, 0x00b108c0, 0x00b105c0 },
+   { 0x80800042, 0x25e02529, 0x00b108e0, 0x00b105e0 },
+   { 0x80800042, 0x26002529, 0x00b10900, 0x00b10600 },
+   { 0x80800042, 0x26202529, 0x00b10920, 0x00b10620 },
+   { 0x80800042, 0x26402529, 0x00b10940, 0x00b10640 },
+   { 0x80800042, 0x26602529, 0x00b10960, 0x00b10660 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2486 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10680, 0x00b10380 },
+   { 0x80800042, 0x23a02529, 0x00b106a0, 0x00b10c00 },
+   { 0x80800042, 0x23c02529, 0x00b106c0, 0x00b103c0 },
+   { 0x80800042, 0x23e02529, 0x00b106e0, 0x00b10c20 },
+   { 0x80800042, 0x24002529, 0x00b10700, 0x00b10400 },
+   { 0x80800042, 0x24202529, 0x00b10720, 0x00b10c40 },
+   { 0x80800042, 0x24402529, 0x00b10740, 0x00b10440 },
+   { 0x80800042, 0x24602529, 0x00b10760, 0x00b10c60 },
+   { 0x80800042, 0x24802529, 0x00b10780, 0x00b10480 },
+   { 0x80800042, 0x24a02529, 0x00b107a0, 0x00b10c80 },
+   { 0x80800042, 0x24c02529, 0x00b107c0, 0x00b104c0 },
+   { 0x80800042, 0x24e02529, 0x00b107e0, 0x00b10ca0 },
+   { 0x80800042, 0x25002529, 0x00b10800, 0x00b10500 },
+   { 0x80800042, 0x25202529, 0x00b10820, 0x00b10cc0 },
+   { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
+   { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x80800042, 0x25802529, 0x00b10880, 0x00b10580 },
+   { 0x80800042, 0x25a02529, 0x00b108a0, 0x00b105a0 },
+   { 0x80800042, 0x25c02529, 0x00b108c0, 0x00b105c0 },
+   { 0x80800042, 0x25e02529, 0x00b108e0, 0x00b105e0 },
+   { 0x80800042, 0x26002529, 0x00b10900, 0x00b10600 },
+   { 0x80800042, 0x26202529, 0x00b10920, 0x00b10620 },
+   { 0x80800042, 0x26402529, 0x00b10940, 0x00b10640 },
+   { 0x80800042, 0x26602529, 0x00b10960, 0x00b10660 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
+mov (8) g116.0<1>UD g1.0<8,8,1>UD {align1};
+
+/* forward---Y---first vector*/
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`4')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_y_igd.g4i')
+mov (8) g52.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g54.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g56.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g58.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*forward---Y---second vector*/
+asr (2) g115.14<1>W g1.22<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x4UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`4')
+define(`mv1',`g1.22')
+define(`mv2',`g1.24')
+include(`motion_field_y_igd.g4i')
+mov (8) g53.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g55.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g57.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g59.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*forward---UV---first vector*/
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`5')
+define(`surface_v',`6')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_uv_igd.g4i')
+mov (8) g68.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g69.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g70.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g71.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g72.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g73.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g74.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g75.0<1>UW g85.0<8,8,1>UW {align1};
+
+/*forward---UV---second vector */
+asr (2) g115.14<1>W g1.22<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.24')
+define(`mv2',`g1.26')
+include(`motion_field_uv_igd.g4i')
+mov (8) g68.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g69.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g70.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g71.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g72.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g73.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g74.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g75.16<1>UW g85.0<8,8,1>UW {align1};
+
+/*backward---Y---first vector */
+mov(8) g1.0<1>UD g116.0<8,8,1>UD {align1};
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+mov(1) g1.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_y_igd.g4i')
+mov (8) g28.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g30.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g32.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g34.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g36.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g38.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g40.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g42.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*backward---Y---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g2.20<1,1,1>UD 0x8UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_y_igd.g4i')
+
+avg.sat (16) g28.0<1>UW g52.0<16,16,1>UW g28.0<16,16,1>UW {align1};
+avg.sat (16) g29.0<1>UW g53.0<16,16,1>UW g96.0<16,16,1>UW {align1};
+avg.sat (16) g30.0<1>UW g54.0<16,16,1>UW g30.0<16,16,1>UW {align1};
+avg.sat (16) g31.0<1>UW g55.0<16,16,1>UW g97.0<16,16,1>UW {align1};
+avg.sat (16) g32.0<1>UW g56.0<16,16,1>UW g32.0<16,16,1>UW {align1};
+avg.sat (16) g33.0<1>UW g57.0<16,16,1>UW g98.0<16,16,1>UW {align1};
+avg.sat (16) g34.0<1>UW g58.0<16,16,1>UW g34.0<16,16,1>UW {align1};
+avg.sat (16) g35.0<1>UW g59.0<16,16,1>UW g99.0<16,16,1>UW {align1};
+avg.sat (16) g36.0<1>UW g60.0<16,16,1>UW g36.0<16,16,1>UW {align1};
+avg.sat (16) g37.0<1>UW g61.0<16,16,1>UW g100.0<16,16,1>UW {align1};
+avg.sat (16) g38.0<1>UW g62.0<16,16,1>UW g38.0<16,16,1>UW {align1};
+avg.sat (16) g39.0<1>UW g63.0<16,16,1>UW g101.0<16,16,1>UW {align1};
+avg.sat (16) g40.0<1>UW g64.0<16,16,1>UW g40.0<16,16,1>UW {align1};
+avg.sat (16) g41.0<1>UW g65.0<16,16,1>UW g102.0<16,16,1>UW {align1};
+avg.sat (16) g42.0<1>UW g66.0<16,16,1>UW g42.0<16,16,1>UW {align1};
+avg.sat (16) g43.0<1>UW g67.0<16,16,1>UW g103.0<16,16,1>UW {align1};
+
+/*backward---UV---first vector */
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`8')
+define(`surface_v',`9')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_uv_igd.g4i')
+mov (8) g44.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.0<1>UW g85.0<8,8,1>UW {align1};
+
+/*backward---UV---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_uv_igd.g4i')
+mov (8) g44.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.16<1>UW g85.0<8,8,1>UW {align1};
+
+avg.sat (16) g44.0<1>UW g68.0<16,16,1>UW g44.0<16,16,1>UW {align1};
+avg.sat (16) g45.0<1>UW g69.0<16,16,1>UW g45.0<16,16,1>UW {align1};
+avg.sat (16) g46.0<1>UW g70.0<16,16,1>UW g46.0<16,16,1>UW {align1};
+avg.sat (16) g47.0<1>UW g71.0<16,16,1>UW g47.0<16,16,1>UW {align1};
+avg.sat (16) g48.0<1>UW g72.0<16,16,1>UW g48.0<16,16,1>UW {align1};
+avg.sat (16) g49.0<1>UW g73.0<16,16,1>UW g49.0<16,16,1>UW {align1};
+avg.sat (16) g50.0<1>UW g74.0<16,16,1>UW g50.0<16,16,1>UW {align1};
+avg.sat (16) g51.0<1>UW g75.0<16,16,1>UW g51.0<16,16,1>UW {align1};
+
+include(`addidct.g4i')
+
+//send (16) 0 acc0<1>UW g0<8,8,1>UW 
+//	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1234 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x26800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x26a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000039 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x28800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000039 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x28900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10680, 0x00b10380 },
+   { 0x80800042, 0x23a02529, 0x00b106a0, 0x00b10c00 },
+   { 0x80800042, 0x23c02529, 0x00b106c0, 0x00b103c0 },
+   { 0x80800042, 0x23e02529, 0x00b106e0, 0x00b10c20 },
+   { 0x80800042, 0x24002529, 0x00b10700, 0x00b10400 },
+   { 0x80800042, 0x24202529, 0x00b10720, 0x00b10c40 },
+   { 0x80800042, 0x24402529, 0x00b10740, 0x00b10440 },
+   { 0x80800042, 0x24602529, 0x00b10760, 0x00b10c60 },
+   { 0x80800042, 0x24802529, 0x00b10780, 0x00b10480 },
+   { 0x80800042, 0x24a02529, 0x00b107a0, 0x00b10c80 },
+   { 0x80800042, 0x24c02529, 0x00b107c0, 0x00b104c0 },
+   { 0x80800042, 0x24e02529, 0x00b107e0, 0x00b10ca0 },
+   { 0x80800042, 0x25002529, 0x00b10800, 0x00b10500 },
+   { 0x80800042, 0x25202529, 0x00b10820, 0x00b10cc0 },
+   { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
+   { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000039 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000039 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x80800042, 0x25802529, 0x00b10880, 0x00b10580 },
+   { 0x80800042, 0x25a02529, 0x00b108a0, 0x00b105a0 },
+   { 0x80800042, 0x25c02529, 0x00b108c0, 0x00b105c0 },
+   { 0x80800042, 0x25e02529, 0x00b108e0, 0x00b105e0 },
+   { 0x80800042, 0x26002529, 0x00b10900, 0x00b10600 },
+   { 0x80800042, 0x26202529, 0x00b10920, 0x00b10620 },
+   { 0x80800042, 0x26402529, 0x00b10940, 0x00b10640 },
+   { 0x80800042, 0x26602529, 0x00b10960, 0x00b10660 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/dual_prime_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1234 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x26800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x26a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000072 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000050 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x28800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000072 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000050 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x28900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10680, 0x00b10380 },
+   { 0x80800042, 0x23a02529, 0x00b106a0, 0x00b10c00 },
+   { 0x80800042, 0x23c02529, 0x00b106c0, 0x00b103c0 },
+   { 0x80800042, 0x23e02529, 0x00b106e0, 0x00b10c20 },
+   { 0x80800042, 0x24002529, 0x00b10700, 0x00b10400 },
+   { 0x80800042, 0x24202529, 0x00b10720, 0x00b10c40 },
+   { 0x80800042, 0x24402529, 0x00b10740, 0x00b10440 },
+   { 0x80800042, 0x24602529, 0x00b10760, 0x00b10c60 },
+   { 0x80800042, 0x24802529, 0x00b10780, 0x00b10480 },
+   { 0x80800042, 0x24a02529, 0x00b107a0, 0x00b10c80 },
+   { 0x80800042, 0x24c02529, 0x00b107c0, 0x00b104c0 },
+   { 0x80800042, 0x24e02529, 0x00b107e0, 0x00b10ca0 },
+   { 0x80800042, 0x25002529, 0x00b10800, 0x00b10500 },
+   { 0x80800042, 0x25202529, 0x00b10820, 0x00b10cc0 },
+   { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
+   { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000072 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000050 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000072 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000050 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x80800042, 0x25802529, 0x00b10880, 0x00b10580 },
+   { 0x80800042, 0x25a02529, 0x00b108a0, 0x00b105a0 },
+   { 0x80800042, 0x25c02529, 0x00b108c0, 0x00b105c0 },
+   { 0x80800042, 0x25e02529, 0x00b108e0, 0x00b105e0 },
+   { 0x80800042, 0x26002529, 0x00b10900, 0x00b10600 },
+   { 0x80800042, 0x26202529, 0x00b10920, 0x00b10620 },
+   { 0x80800042, 0x26402529, 0x00b10940, 0x00b10640 },
+   { 0x80800042, 0x26602529, 0x00b10960, 0x00b10660 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
+
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
+mov (8) g116.0<1>UD g1.0<8,8,1>UD {align1};
+/*Y buffer*/
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+mov(1) g1.8<1>UD 0x007000fUD  { align1 };
+/*first vector*/
+asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_y.g4i')
+mov (8) g28.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g30.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g32.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g34.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g36.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g38.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g40.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g42.0<1>UD g103.0<8,8,1>UD {align1};
+/*second vector*/
+asr (2) g115.14<1>W g1.26<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+
+and.nz (1) null g1.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_y.g4i')
+mov (8) g29.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g31.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g33.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g35.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g37.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g39.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g41.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g43.0<1>UD g103.0<8,8,1>UD {align1};
+/*U buffer, V buffer*/
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+/*first vector*/
+asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`8')
+define(`surface_v',`9')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_uv.g4i')
+mov (8) g44.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.0<1>UW g85.0<8,8,1>UW {align1};
+/*second vector*/
+asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+
+and.nz (1) null g1.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_uv.g4i')
+mov (8) g44.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.16<1>UW g85.0<8,8,1>UW {align1};
+
+include(`addidct.g4i')
+//send (16) 0 acc0<1>UW g0<8,8,1>UW 
+//	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1341 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1341 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,86 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g84~g107:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x50UD {align1};            //jump to the lib to do IQ and IDCT
+
+/*field 0 of Y*/
+asr (2) g31.14<1>W g82.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x2UW {align1};             //motion vertical field select
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) g115.16<1>UW 1UW {align1};           	//0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A52UD {align1};        	//g82.18,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   	//jump to the lib to read reference data 
+
+mov (8) g58.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g68.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g70.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g72.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 1 of Y*/
+asr (2) g31.14<1>W g82.26<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A5AUD {align1};		//g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   	//jump to the lib to read reference data 
+
+mov (8) g59.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g69.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g71.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g73.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 0 of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+
+asr (2) g31.14<1>W g82.18<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A52UD {align1};         //g82.18,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+mov (16) g74.0<1>UW g32.0<8,8,1>UW {align1 compr};
+mov (16) g76.0<1>UW g34.0<8,8,1>UW {align1 compr};
+mov (16) g78.0<1>UW g36.0<8,8,1>UW {align1 compr};
+mov (16) g80.0<1>UW g38.0<8,8,1>UW {align1 compr};
+
+/*field 1 of UV*/
+asr (2) g31.14<1>W g82.26<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A5AUD {align1};         //g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+mov (16) g74.16<1>UW g32.0<8,8,1>UW {align1 compr};
+mov (16) g76.16<1>UW g34.0<8,8,1>UW {align1 compr};
+mov (16) g78.16<1>UW g36.0<8,8,1>UW {align1 compr};
+mov (16) g80.16<1>UW g38.0<8,8,1>UW {align1 compr};
+
+add (1) ip g21.0<1,1,1>UD 0x40UD {align1};          //jump to the lib to add the reference and idct data
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,62 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_backward_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,62 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
+mov (8) g116.0<1>UD g1.0<8,8,1>UD {align1};
+
+/* forward---Y---first vector*/
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`4')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_y.g4i')
+mov (8) g52.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g54.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g56.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g58.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*forward---Y---second vector*/
+asr (2) g115.14<1>W g1.22<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x4UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`4')
+define(`mv1',`g1.22')
+define(`mv2',`g1.24')
+include(`motion_field_y.g4i')
+mov (8) g53.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g55.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g57.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g59.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*forward---UV---first vector*/
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`5')
+define(`surface_v',`6')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_uv.g4i')
+mov (8) g68.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g69.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g70.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g71.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g72.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g73.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g74.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g75.0<1>UW g85.0<8,8,1>UW {align1};
+
+/*forward---UV---second vector */
+asr (2) g115.14<1>W g1.22<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.24')
+define(`mv2',`g1.26')
+include(`motion_field_uv.g4i')
+mov (8) g68.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g69.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g70.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g71.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g72.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g73.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g74.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g75.16<1>UW g85.0<8,8,1>UW {align1};
+
+/*backward---Y---first vector */
+mov(8) g1.0<1>UD g116.0<8,8,1>UD {align1};
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+mov(1) g1.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_y.g4i')
+mov (8) g28.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g30.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g32.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g34.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g36.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g38.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g40.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g42.0<1>UD g103.0<8,8,1>UD {align1};
+
+/*backward---Y---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g2.20<1,1,1>UD 0x8UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_y.g4i')
+
+avg.sat (16) g28.0<1>UW g52.0<16,16,1>UW g28.0<16,16,1>UW {align1};
+avg.sat (16) g29.0<1>UW g53.0<16,16,1>UW g96.0<16,16,1>UW {align1};
+avg.sat (16) g30.0<1>UW g54.0<16,16,1>UW g30.0<16,16,1>UW {align1};
+avg.sat (16) g31.0<1>UW g55.0<16,16,1>UW g97.0<16,16,1>UW {align1};
+avg.sat (16) g32.0<1>UW g56.0<16,16,1>UW g32.0<16,16,1>UW {align1};
+avg.sat (16) g33.0<1>UW g57.0<16,16,1>UW g98.0<16,16,1>UW {align1};
+avg.sat (16) g34.0<1>UW g58.0<16,16,1>UW g34.0<16,16,1>UW {align1};
+avg.sat (16) g35.0<1>UW g59.0<16,16,1>UW g99.0<16,16,1>UW {align1};
+avg.sat (16) g36.0<1>UW g60.0<16,16,1>UW g36.0<16,16,1>UW {align1};
+avg.sat (16) g37.0<1>UW g61.0<16,16,1>UW g100.0<16,16,1>UW {align1};
+avg.sat (16) g38.0<1>UW g62.0<16,16,1>UW g38.0<16,16,1>UW {align1};
+avg.sat (16) g39.0<1>UW g63.0<16,16,1>UW g101.0<16,16,1>UW {align1};
+avg.sat (16) g40.0<1>UW g64.0<16,16,1>UW g40.0<16,16,1>UW {align1};
+avg.sat (16) g41.0<1>UW g65.0<16,16,1>UW g102.0<16,16,1>UW {align1};
+avg.sat (16) g42.0<1>UW g66.0<16,16,1>UW g42.0<16,16,1>UW {align1};
+avg.sat (16) g43.0<1>UW g67.0<16,16,1>UW g103.0<16,16,1>UW {align1};
+
+/*backward---UV---first vector */
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`8')
+define(`surface_v',`9')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
+include(`motion_field_uv.g4i')
+mov (8) g44.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.0<1>UW g85.0<8,8,1>UW {align1};
+
+/*backward---UV---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.26')
+define(`mv2',`g1.28')
+include(`motion_field_uv.g4i')
+mov (8) g44.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.16<1>UW g85.0<8,8,1>UW {align1};
+
+avg.sat (16) g44.0<1>UW g68.0<16,16,1>UW g44.0<16,16,1>UW {align1};
+avg.sat (16) g45.0<1>UW g69.0<16,16,1>UW g45.0<16,16,1>UW {align1};
+avg.sat (16) g46.0<1>UW g70.0<16,16,1>UW g46.0<16,16,1>UW {align1};
+avg.sat (16) g47.0<1>UW g71.0<16,16,1>UW g47.0<16,16,1>UW {align1};
+avg.sat (16) g48.0<1>UW g72.0<16,16,1>UW g48.0<16,16,1>UW {align1};
+avg.sat (16) g49.0<1>UW g73.0<16,16,1>UW g49.0<16,16,1>UW {align1};
+avg.sat (16) g50.0<1>UW g74.0<16,16,1>UW g50.0<16,16,1>UW {align1};
+avg.sat (16) g51.0<1>UW g75.0<16,16,1>UW g51.0<16,16,1>UW {align1};
+
+include(`addidct.g4i')
+
+//send (16) 0 acc0<1>UW g0<8,8,1>UW 
+//	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2486 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10680, 0x00b10380 },
+   { 0x80800042, 0x23a02529, 0x00b106a0, 0x00b10c00 },
+   { 0x80800042, 0x23c02529, 0x00b106c0, 0x00b103c0 },
+   { 0x80800042, 0x23e02529, 0x00b106e0, 0x00b10c20 },
+   { 0x80800042, 0x24002529, 0x00b10700, 0x00b10400 },
+   { 0x80800042, 0x24202529, 0x00b10720, 0x00b10c40 },
+   { 0x80800042, 0x24402529, 0x00b10740, 0x00b10440 },
+   { 0x80800042, 0x24602529, 0x00b10760, 0x00b10c60 },
+   { 0x80800042, 0x24802529, 0x00b10780, 0x00b10480 },
+   { 0x80800042, 0x24a02529, 0x00b107a0, 0x00b10c80 },
+   { 0x80800042, 0x24c02529, 0x00b107c0, 0x00b104c0 },
+   { 0x80800042, 0x24e02529, 0x00b107e0, 0x00b10ca0 },
+   { 0x80800042, 0x25002529, 0x00b10800, 0x00b10500 },
+   { 0x80800042, 0x25202529, 0x00b10820, 0x00b10cc0 },
+   { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
+   { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x80800042, 0x25802529, 0x00b10880, 0x00b10580 },
+   { 0x80800042, 0x25a02529, 0x00b108a0, 0x00b105a0 },
+   { 0x80800042, 0x25c02529, 0x00b108c0, 0x00b105c0 },
+   { 0x80800042, 0x25e02529, 0x00b108e0, 0x00b105e0 },
+   { 0x80800042, 0x26002529, 0x00b10900, 0x00b10600 },
+   { 0x80800042, 0x26202529, 0x00b10920, 0x00b10620 },
+   { 0x80800042, 0x26402529, 0x00b10940, 0x00b10640 },
+   { 0x80800042, 0x26602529, 0x00b10960, 0x00b10660 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,2486 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x26a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x26e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x27200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x28900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x28b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x28d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x28f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x29100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10680, 0x00b10380 },
+   { 0x80800042, 0x23a02529, 0x00b106a0, 0x00b10c00 },
+   { 0x80800042, 0x23c02529, 0x00b106c0, 0x00b103c0 },
+   { 0x80800042, 0x23e02529, 0x00b106e0, 0x00b10c20 },
+   { 0x80800042, 0x24002529, 0x00b10700, 0x00b10400 },
+   { 0x80800042, 0x24202529, 0x00b10720, 0x00b10c40 },
+   { 0x80800042, 0x24402529, 0x00b10740, 0x00b10440 },
+   { 0x80800042, 0x24602529, 0x00b10760, 0x00b10c60 },
+   { 0x80800042, 0x24802529, 0x00b10780, 0x00b10480 },
+   { 0x80800042, 0x24a02529, 0x00b107a0, 0x00b10c80 },
+   { 0x80800042, 0x24c02529, 0x00b107c0, 0x00b104c0 },
+   { 0x80800042, 0x24e02529, 0x00b107e0, 0x00b10ca0 },
+   { 0x80800042, 0x25002529, 0x00b10800, 0x00b10500 },
+   { 0x80800042, 0x25202529, 0x00b10820, 0x00b10cc0 },
+   { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
+   { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a008 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x80800042, 0x25802529, 0x00b10880, 0x00b10580 },
+   { 0x80800042, 0x25a02529, 0x00b108a0, 0x00b105a0 },
+   { 0x80800042, 0x25c02529, 0x00b108c0, 0x00b105c0 },
+   { 0x80800042, 0x25e02529, 0x00b108e0, 0x00b105e0 },
+   { 0x80800042, 0x26002529, 0x00b10900, 0x00b10600 },
+   { 0x80800042, 0x26202529, 0x00b10920, 0x00b10620 },
+   { 0x80800042, 0x26402529, 0x00b10940, 0x00b10640 },
+   { 0x80800042, 0x26602529, 0x00b10960, 0x00b10660 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,159 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g84~g107:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x50UD {align1};          //jump to the lib to do IQ and IDCT 
+
+/*field 0 forward prediction of Y*/
+asr (2) g31.14<1>W g82.14<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) g115.16<1>UW 0UW {align1};           //0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A4EUD {align1};         //g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   //jump to the lib to read reference data 
+
+mov (8) g58.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g68.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g70.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g72.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 1 forward prediction of Y*/
+asr (2) g31.14<1>W g82.22<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A56UD {align1};         //g82.22,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   //jump to the lib to read reference data 
+
+mov (8) g59.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g69.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g71.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g73.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 0 forward prediction of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+
+asr (2) g31.14<1>W g82.14<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A4EUD {align1};         //g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+mov (16) g74.0<1>UW g32.0<8,8,1>UW {align1 compr};
+mov (16) g76.0<1>UW g34.0<8,8,1>UW {align1 compr};
+mov (16) g78.0<1>UW g36.0<8,8,1>UW {align1 compr};
+mov (16) g80.0<1>UW g38.0<8,8,1>UW {align1 compr};
+
+/*field 1 forward prediction of UV*/
+asr (2) g31.14<1>W g82.22<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A56UD {align1};         //g82.22,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+mov (16) g74.16<1>UW g32.0<8,8,1>UW {align1 compr};
+mov (16) g76.16<1>UW g34.0<8,8,1>UW {align1 compr};
+mov (16) g78.16<1>UW g36.0<8,8,1>UW {align1 compr};
+mov (16) g80.16<1>UW g38.0<8,8,1>UW {align1 compr};
+
+/*field 0 backward prediction of Y*/
+mov(2) g31.0<1>UD g82.0<2,2,1>UD {align1};
+
+asr (2) g31.14<1>W g82.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) g115.16<1>UW 1UW {align1};           //0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A52UD {align1};         //g82.18,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   //jump to the lib to read reference data 
+
+avg (16) g58.0<1>UW g58.0<16,16,1>UW g32.0<16,16,1>UW {align1};
+avg (16) g60.0<1>UW g60.0<16,16,1>UW g33.0<16,16,1>UW {align1};
+avg (16) g62.0<1>UW g62.0<16,16,1>UW g34.0<16,16,1>UW {align1};
+avg (16) g64.0<1>UW g64.0<16,16,1>UW g35.0<16,16,1>UW {align1};
+avg (16) g66.0<1>UW g66.0<16,16,1>UW g36.0<16,16,1>UW {align1};
+avg (16) g68.0<1>UW g68.0<16,16,1>UW g37.0<16,16,1>UW {align1};
+avg (16) g70.0<1>UW g70.0<16,16,1>UW g38.0<16,16,1>UW {align1};
+avg (16) g72.0<1>UW g72.0<16,16,1>UW g39.0<16,16,1>UW {align1};
+
+/*field 1 backward prediction of Y*/
+asr (2) g31.14<1>W g82.26<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A5AUD {align1};         //g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   //jump to the lib to read reference data 
+
+avg (16) g59.0<1>UW g59.0<16,16,1>UW g32.0<16,16,1>UW {align1};
+avg (16) g61.0<1>UW g61.0<16,16,1>UW g33.0<16,16,1>UW {align1};
+avg (16) g63.0<1>UW g63.0<16,16,1>UW g34.0<16,16,1>UW {align1};
+avg (16) g65.0<1>UW g65.0<16,16,1>UW g35.0<16,16,1>UW {align1};
+avg (16) g67.0<1>UW g67.0<16,16,1>UW g36.0<16,16,1>UW {align1};
+avg (16) g69.0<1>UW g69.0<16,16,1>UW g37.0<16,16,1>UW {align1};
+avg (16) g71.0<1>UW g71.0<16,16,1>UW g38.0<16,16,1>UW {align1};
+avg (16) g73.0<1>UW g73.0<16,16,1>UW g39.0<16,16,1>UW {align1};
+
+/*field 0 backward prediction of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+
+asr (2) g31.14<1>W g82.18<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A52UD {align1};         //g82.18,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+avg (16) g74.0<1>UW g74.0<8,8,1>UW g32.0<8,8,1>UW {align1 compr};
+avg (16) g76.0<1>UW g76.0<8,8,1>UW g34.0<8,8,1>UW {align1 compr};
+avg (16) g78.0<1>UW g78.0<8,8,1>UW g36.0<8,8,1>UW {align1 compr};
+avg (16) g80.0<1>UW g80.0<8,8,1>UW g38.0<8,8,1>UW {align1 compr};
+
+/*field 1 backward prediction of UV*/
+asr (2) g31.14<1>W g82.26<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A5AUD {align1};         //g82.26,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+avg (16) g74.16<1>UW g74.16<8,8,1>UW g32.0<8,8,1>UW {align1 compr};
+avg (16) g76.16<1>UW g76.16<8,8,1>UW g34.0<8,8,1>UW {align1 compr};
+avg (16) g78.16<1>UW g78.16<8,8,1>UW g36.0<8,8,1>UW {align1 compr};
+avg (16) g80.16<1>UW g80.16<8,8,1>UW g38.0<8,8,1>UW {align1 compr};
+
+add (1) ip g21.0<1,1,1>UD 0x40UD {align1};          //jump to the lib to add the reference and idct data
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,121 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00200001, 0x23e00021, 0x00450a40, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00800042, 0x27402529, 0x00b10740, 0x00b10400 },
+   { 0x00800042, 0x27802529, 0x00b10780, 0x00b10420 },
+   { 0x00800042, 0x27c02529, 0x00b107c0, 0x00b10440 },
+   { 0x00800042, 0x28002529, 0x00b10800, 0x00b10460 },
+   { 0x00800042, 0x28402529, 0x00b10840, 0x00b10480 },
+   { 0x00800042, 0x28802529, 0x00b10880, 0x00b104a0 },
+   { 0x00800042, 0x28c02529, 0x00b108c0, 0x00b104c0 },
+   { 0x00800042, 0x29002529, 0x00b10900, 0x00b104e0 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00800042, 0x27602529, 0x00b10760, 0x00b10400 },
+   { 0x00800042, 0x27a02529, 0x00b107a0, 0x00b10420 },
+   { 0x00800042, 0x27e02529, 0x00b107e0, 0x00b10440 },
+   { 0x00800042, 0x28202529, 0x00b10820, 0x00b10460 },
+   { 0x00800042, 0x28602529, 0x00b10860, 0x00b10480 },
+   { 0x00800042, 0x28a02529, 0x00b108a0, 0x00b104a0 },
+   { 0x00800042, 0x28e02529, 0x00b108e0, 0x00b104c0 },
+   { 0x00800042, 0x29202529, 0x00b10920, 0x00b104e0 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802042, 0x29402529, 0x008d0940, 0x008d0400 },
+   { 0x00802042, 0x29802529, 0x008d0980, 0x008d0440 },
+   { 0x00802042, 0x29c02529, 0x008d09c0, 0x008d0480 },
+   { 0x00802042, 0x2a002529, 0x008d0a00, 0x008d04c0 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802042, 0x29502529, 0x008d0950, 0x008d0400 },
+   { 0x00802042, 0x29902529, 0x008d0990, 0x008d0440 },
+   { 0x00802042, 0x29d02529, 0x008d09d0, 0x008d0480 },
+   { 0x00802042, 0x2a102529, 0x008d0a10, 0x008d04c0 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_f_b_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,121 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00200001, 0x23e00021, 0x00450a40, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00800042, 0x27402529, 0x00b10740, 0x00b10400 },
+   { 0x00800042, 0x27802529, 0x00b10780, 0x00b10420 },
+   { 0x00800042, 0x27c02529, 0x00b107c0, 0x00b10440 },
+   { 0x00800042, 0x28002529, 0x00b10800, 0x00b10460 },
+   { 0x00800042, 0x28402529, 0x00b10840, 0x00b10480 },
+   { 0x00800042, 0x28802529, 0x00b10880, 0x00b104a0 },
+   { 0x00800042, 0x28c02529, 0x00b108c0, 0x00b104c0 },
+   { 0x00800042, 0x29002529, 0x00b10900, 0x00b104e0 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00800042, 0x27602529, 0x00b10760, 0x00b10400 },
+   { 0x00800042, 0x27a02529, 0x00b107a0, 0x00b10420 },
+   { 0x00800042, 0x27e02529, 0x00b107e0, 0x00b10440 },
+   { 0x00800042, 0x28202529, 0x00b10820, 0x00b10460 },
+   { 0x00800042, 0x28602529, 0x00b10860, 0x00b10480 },
+   { 0x00800042, 0x28a02529, 0x00b108a0, 0x00b104a0 },
+   { 0x00800042, 0x28e02529, 0x00b108e0, 0x00b104c0 },
+   { 0x00800042, 0x29202529, 0x00b10920, 0x00b104e0 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802042, 0x29402529, 0x008d0940, 0x008d0400 },
+   { 0x00802042, 0x29802529, 0x008d0980, 0x008d0440 },
+   { 0x00802042, 0x29c02529, 0x008d09c0, 0x008d0480 },
+   { 0x00802042, 0x2a002529, 0x008d0a00, 0x008d04c0 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5a, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a5a },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802042, 0x29502529, 0x008d0950, 0x008d0400 },
+   { 0x00802042, 0x29902529, 0x008d0990, 0x008d0440 },
+   { 0x00802042, 0x29d02529, 0x008d09d0, 0x008d0480 },
+   { 0x00802042, 0x2a102529, 0x008d0a10, 0x008d04c0 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,121 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
+mov (8) g116.0<1>UD g1.0<8,8,1>UD {align1};
+/*Y buffer*/
+mov(1) g1.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 1UW {align1};
+add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov (1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+/*first vector*/
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`4')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_y.g4i')
+mov (8) g28.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g30.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g32.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g34.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g36.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g38.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g40.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g42.0<1>UD g103.0<8,8,1>UD {align1};
+/*second vector*/
+asr (2) g115.14<1>W g1.22<2,2,1>W 1UW {align1};
+add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+mov (1) g115.8<1>UD 0x1fUD { align1 };              //read 1 line, 32 columns.
+
+and.nz (1) null g1.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`4')
+define(`mv1',`g1.22')
+define(`mv2',`g1.24')
+include(`motion_field_y.g4i')
+mov (8) g29.0<1>UD g96.0<8,8,1>UD {align1};
+mov (8) g31.0<1>UD g97.0<8,8,1>UD {align1};
+mov (8) g33.0<1>UD g98.0<8,8,1>UD {align1};
+mov (8) g35.0<1>UD g99.0<8,8,1>UD {align1};
+mov (8) g37.0<1>UD g100.0<8,8,1>UD {align1};
+mov (8) g39.0<1>UD g101.0<8,8,1>UD {align1};
+mov (8) g41.0<1>UD g102.0<8,8,1>UD {align1};
+mov (8) g43.0<1>UD g103.0<8,8,1>UD {align1};
+/*U buffer,  V buffer*/
+/*first vector*/
+mov(1) g115.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.14<2,2,1>W 2UW {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`5')
+define(`surface_v',`6')
+define(`mv1',`g1.14')
+define(`mv2',`g1.16')
+include(`motion_field_uv.g4i')
+mov (8) g44.0<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.0<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.0<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.0<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.0<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.0<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.0<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.0<1>UW g85.0<8,8,1>UW {align1};
+/*second vector*/
+asr (2) g115.14<1>W g1.22<2,2,1>W 2UW {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+
+and.nz (1) null g1.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.22')
+define(`mv2',`g1.24')
+include(`motion_field_uv.g4i')
+mov (8) g44.16<1>UW g78.0<8,8,1>UW {align1};
+mov (8) g45.16<1>UW g79.0<8,8,1>UW {align1};
+mov (8) g46.16<1>UW g80.0<8,8,1>UW {align1};
+mov (8) g47.16<1>UW g81.0<8,8,1>UW {align1};
+mov (8) g48.16<1>UW g82.0<8,8,1>UW {align1};
+mov (8) g49.16<1>UW g83.0<8,8,1>UW {align1};
+mov (8) g50.16<1>UW g84.0<8,8,1>UW {align1};
+mov (8) g51.16<1>UW g85.0<8,8,1>UW {align1};
+
+include(`addidct.g4i')
+//send (16) 0 acc0<1>UW g0<8,8,1>UW 
+//	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1340 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e2dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e2dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e2dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e2dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1340 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e2dad, 0x0045002e, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23800021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23c00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24000021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24400021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24800021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
+   { 0x0020000c, 0x2e6e2dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000162 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000fa },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x00800040, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x00800040, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x00800040, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x00800040, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x00800040, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c1 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a01 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a41 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a81 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac1 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b01 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b41 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b81 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a01 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a41 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a81 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac1 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b01 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b41 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b81 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x00800040, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x00800040, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x00800040, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x00800040, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x00800040, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x00800040, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x00800040, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c2 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a02 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a42 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a82 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac2 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b02 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b42 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b82 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a02 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a42 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a82 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac2 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b02 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b42 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b82 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x00800040, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x00800040, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x00800040, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x00800040, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x00800040, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x00800040, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x00800040, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c3 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a03 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a43 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a83 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac3 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b03 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b43 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b83 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a03 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a43 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a83 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac3 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b03 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b43 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b83 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x00800040, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x00800040, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x00800040, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x00800040, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x00800040, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x00800040, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x00800040, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b109c4 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a04 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a44 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10a84 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10ac4 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b04 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b44 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10b84 },
+   { 0x00800040, 0x2c004529, 0x00b10c00, 0x00b10a04 },
+   { 0x00800040, 0x2c204529, 0x00b10c20, 0x00b10a44 },
+   { 0x00800040, 0x2c404529, 0x00b10c40, 0x00b10a84 },
+   { 0x00800040, 0x2c604529, 0x00b10c60, 0x00b10ac4 },
+   { 0x00800040, 0x2c804529, 0x00b10c80, 0x00b10b04 },
+   { 0x00800040, 0x2ca04529, 0x00b10ca0, 0x00b10b44 },
+   { 0x00800040, 0x2cc04529, 0x00b10cc0, 0x00b10b84 },
+   { 0x00800040, 0x2ce04529, 0x00b10ce0, 0x00b10bc4 },
+   { 0x00800008, 0x2c002d29, 0x00b10c00, 0x00020002 },
+   { 0x00800008, 0x2c202d29, 0x00b10c20, 0x00020002 },
+   { 0x00800008, 0x2c402d29, 0x00b10c40, 0x00020002 },
+   { 0x00800008, 0x2c602d29, 0x00b10c60, 0x00020002 },
+   { 0x00800008, 0x2c802d29, 0x00b10c80, 0x00020002 },
+   { 0x00800008, 0x2ca02d29, 0x00b10ca0, 0x00020002 },
+   { 0x00800008, 0x2cc02d29, 0x00b10cc0, 0x00020002 },
+   { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10a81 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10ac1 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b01 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b109c2 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a02 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a42 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10a82 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10ac2 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b02 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b42 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10b82 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b109c3 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a03 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a43 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10a83 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10ac3 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b03 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b43 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10b83 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b109c4 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a04 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a44 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10a84 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10ac4 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b04 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000d0 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2bc01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
+   { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
+   { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
+   { 0x80800042, 0x2c604629, 0x00b10a80, 0x00b10ac0 },
+   { 0x80800042, 0x2c804629, 0x00b10ac0, 0x00b10b00 },
+   { 0x80800042, 0x2ca04629, 0x00b10b00, 0x00b10b40 },
+   { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b80 },
+   { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x2c004629, 0x00b109c1, 0x00b10a01 },
+   { 0x80800042, 0x2c204629, 0x00b10a01, 0x00b10a41 },
+   { 0x80800042, 0x2c404629, 0x00b10a41, 0x00b10a81 },
+   { 0x80800042, 0x2c604629, 0x00b10a81, 0x00b10ac1 },
+   { 0x80800042, 0x2c804629, 0x00b10ac1, 0x00b10b01 },
+   { 0x80800042, 0x2ca04629, 0x00b10b01, 0x00b10b41 },
+   { 0x80800042, 0x2cc04629, 0x00b10b41, 0x00b10b81 },
+   { 0x80800042, 0x2ce04629, 0x00b10b81, 0x00b10bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x2c004629, 0x00b109c2, 0x00b10a02 },
+   { 0x80800042, 0x2c204629, 0x00b10a02, 0x00b10a42 },
+   { 0x80800042, 0x2c404629, 0x00b10a42, 0x00b10a82 },
+   { 0x80800042, 0x2c604629, 0x00b10a82, 0x00b10ac2 },
+   { 0x80800042, 0x2c804629, 0x00b10ac2, 0x00b10b02 },
+   { 0x80800042, 0x2ca04629, 0x00b10b02, 0x00b10b42 },
+   { 0x80800042, 0x2cc04629, 0x00b10b42, 0x00b10b82 },
+   { 0x80800042, 0x2ce04629, 0x00b10b82, 0x00b10bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x2c004629, 0x00b109c3, 0x00b10a03 },
+   { 0x80800042, 0x2c204629, 0x00b10a03, 0x00b10a43 },
+   { 0x80800042, 0x2c404629, 0x00b10a43, 0x00b10a83 },
+   { 0x80800042, 0x2c604629, 0x00b10a83, 0x00b10ac3 },
+   { 0x80800042, 0x2c804629, 0x00b10ac3, 0x00b10b03 },
+   { 0x80800042, 0x2ca04629, 0x00b10b03, 0x00b10b43 },
+   { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b83 },
+   { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x29c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x2a801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2ac01d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a80, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac0, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b00, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b40, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b80, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x2c000229, 0x00b109c1, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a01, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a41, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a81, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac1, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b01, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b41, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b81, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x2c000229, 0x00b109c2, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a02, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a42, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a82, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac2, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b02, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b42, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b82, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x2c000229, 0x00b109c3, 0x00000000 },
+   { 0x00800001, 0x2c200229, 0x00b10a03, 0x00000000 },
+   { 0x00800001, 0x2c400229, 0x00b10a43, 0x00000000 },
+   { 0x00800001, 0x2c600229, 0x00b10a83, 0x00000000 },
+   { 0x00800001, 0x2c800229, 0x00b10ac3, 0x00000000 },
+   { 0x00800001, 0x2ca00229, 0x00b10b03, 0x00000000 },
+   { 0x00800001, 0x2cc00229, 0x00b10b43, 0x00000000 },
+   { 0x00800001, 0x2ce00229, 0x00b10b83, 0x00000000 },
+   { 0x00600001, 0x23a00021, 0x008d0c00, 0x00000000 },
+   { 0x00600001, 0x23e00021, 0x008d0c20, 0x00000000 },
+   { 0x00600001, 0x24200021, 0x008d0c40, 0x00000000 },
+   { 0x00600001, 0x24600021, 0x008d0c60, 0x00000000 },
+   { 0x00600001, 0x24a00021, 0x008d0c80, 0x00000000 },
+   { 0x00600001, 0x24e00021, 0x008d0ca0, 0x00000000 },
+   { 0x00600001, 0x25200021, 0x008d0cc0, 0x00000000 },
+   { 0x00600001, 0x25600021, 0x008d0ce0, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e2dad, 0x0045002e, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25800129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25a00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25c00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25e00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26000129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
+   { 0x0020000c, 0x2e6e2dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000144 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ec },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x00800040, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae1 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b01 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b21 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b01 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b21 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b41 },
+   { 0x00800040, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x00800040, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b61 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b81 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b81 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x00800040, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x00800040, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae2 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b02 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b22 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b02 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b22 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b42 },
+   { 0x00800040, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x00800040, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b62 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b82 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b82 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x00800040, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x00800040, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae3 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b03 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b23 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b03 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b23 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b43 },
+   { 0x00800040, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x00800040, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b63 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b83 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b83 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x29c04629, 0x00ad0ac3, 0x00ad0ae3 },
+   { 0x00800040, 0x29e04629, 0x00ad0ae3, 0x00ad0b03 },
+   { 0x00800040, 0x2a004629, 0x00ad0b03, 0x00ad0b23 },
+   { 0x00800040, 0x2a204629, 0x00ad0b23, 0x00ad0b43 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ac4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0ae4 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b04 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b24 },
+   { 0x00800040, 0x29c04529, 0x00ad09c0, 0x00ad0ae4 },
+   { 0x00800040, 0x29e04529, 0x00ad09e0, 0x00ad0b04 },
+   { 0x00800040, 0x2a004529, 0x00ad0a00, 0x00ad0b24 },
+   { 0x00800040, 0x2a204529, 0x00ad0a20, 0x00ad0b44 },
+   { 0x00800040, 0x2a404629, 0x00ad0b63, 0x00ad0b83 },
+   { 0x00800040, 0x2a604629, 0x00ad0b83, 0x00ad0ba3 },
+   { 0x00800040, 0x2a804629, 0x00ad0ba3, 0x00ad0bc3 },
+   { 0x00800040, 0x2aa04629, 0x00ad0bc3, 0x00ad0be3 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b64 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0b84 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0ba4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0bc4 },
+   { 0x00800040, 0x2a404529, 0x00ad0a40, 0x00ad0b84 },
+   { 0x00800040, 0x2a604529, 0x00ad0a60, 0x00ad0ba4 },
+   { 0x00800040, 0x2a804529, 0x00ad0a80, 0x00ad0bc4 },
+   { 0x00800040, 0x2aa04529, 0x00ad0aa0, 0x00ad0be4 },
+   { 0x80800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x80800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x80800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x80800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x80800008, 0x2a402d29, 0x00b10a40, 0x00020002 },
+   { 0x80800008, 0x2a602d29, 0x00b10a60, 0x00020002 },
+   { 0x80800008, 0x2a802d29, 0x00b10a80, 0x00020002 },
+   { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000104 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b21 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b61 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0b81 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ac2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0ae2 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b02 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b22 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b62 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0b82 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0ba2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0bc2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac4 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae4 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b04 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b24 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b64 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b84 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000b0 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00800031, 0x2b401d29, 0x40ad0e60, 0x0218a005 },
+   { 0x00800031, 0x2be01d29, 0x40ad0e60, 0x0218a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
+   { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
+   { 0x80800042, 0x2a204629, 0x00ad0b20, 0x00ad0b40 },
+   { 0x80800042, 0x2a404629, 0x00ad0b60, 0x00ad0b80 },
+   { 0x80800042, 0x2a604629, 0x00ad0b80, 0x00ad0ba0 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0bc0 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac1, 0x00ad0ae1 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae1, 0x00ad0b01 },
+   { 0x80800042, 0x2a004629, 0x00ad0b01, 0x00ad0b21 },
+   { 0x80800042, 0x2a204629, 0x00ad0b21, 0x00ad0b41 },
+   { 0x80800042, 0x2a404629, 0x00ad0b61, 0x00ad0b81 },
+   { 0x80800042, 0x2a604629, 0x00ad0b81, 0x00ad0ba1 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba1, 0x00ad0bc1 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc1, 0x00ad0be1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac2, 0x00ad0ae2 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae2, 0x00ad0b02 },
+   { 0x80800042, 0x2a004629, 0x00ad0b02, 0x00ad0b22 },
+   { 0x80800042, 0x2a204629, 0x00ad0b22, 0x00ad0b42 },
+   { 0x80800042, 0x2a404629, 0x00ad0b62, 0x00ad0b82 },
+   { 0x80800042, 0x2a604629, 0x00ad0b82, 0x00ad0ba2 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba2, 0x00ad0bc2 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc2, 0x00ad0be2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x29c04629, 0x00ad0ac3, 0x00ad0ac3 },
+   { 0x80800042, 0x29e04629, 0x00ad0ae3, 0x00ad0ae3 },
+   { 0x80800042, 0x2a004629, 0x00ad0b03, 0x00ad0b03 },
+   { 0x80800042, 0x2a204629, 0x00ad0b23, 0x00ad0b23 },
+   { 0x80800042, 0x2a404629, 0x00ad0b63, 0x00ad0b63 },
+   { 0x80800042, 0x2a604629, 0x00ad0b83, 0x00ad0b83 },
+   { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba3 },
+   { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x2ac01d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x2b601d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba0, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba1, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba2, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x29c00229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x2a400229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x2a600229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x2a800229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2aa00229, 0x00ad0bc3, 0x00000000 },
+   { 0x00600001, 0x25900129, 0x008d09c0, 0x00000000 },
+   { 0x00600001, 0x25b00129, 0x008d09e0, 0x00000000 },
+   { 0x00600001, 0x25d00129, 0x008d0a00, 0x00000000 },
+   { 0x00600001, 0x25f00129, 0x008d0a20, 0x00000000 },
+   { 0x00600001, 0x26100129, 0x008d0a40, 0x00000000 },
+   { 0x00600001, 0x26300129, 0x008d0a60, 0x00000000 },
+   { 0x00600001, 0x26500129, 0x008d0a80, 0x00000000 },
+   { 0x00600001, 0x26700129, 0x008d0aa0, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,86 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g84~g107:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x50UD {align1};                  //jump to the lib to do IDCT
+
+/*field 0 of Y*/
+asr (2) g31.14<1>W g82.14<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x1UW {align1};             //motion vertical field select
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) g115.16<1>UW 0UW {align1};           	//0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A4EUD {align1};        	//g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   	//jump to the lib to read reference data 
+
+mov (8) g58.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g68.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g70.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g72.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 1 of Y*/
+asr (2) g31.14<1>W g82.22<2,2,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A56UD {align1};        //g82.22,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x20UD {align1};   //jump to the lib to read reference data 
+
+mov (8) g59.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g69.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g71.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g73.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 0 of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+
+asr (2) g31.14<1>W g82.14<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A4EUD {align1};         //g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+mov (16) g74.0<1>UW g32.0<8,8,1>UW {align1 compr};
+mov (16) g76.0<1>UW g34.0<8,8,1>UW {align1 compr};
+mov (16) g78.0<1>UW g36.0<8,8,1>UW {align1 compr};
+mov (16) g80.0<1>UW g38.0<8,8,1>UW {align1 compr};
+
+/*field 1 of UV*/
+asr (2) g31.14<1>W g82.22<2,2,1>W 2W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+mov (1) a0.0<1>UD 0x0A56UD {align1};         //g82.22,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x30UD {align1};   //jump to the lib to read reference data 
+
+mov (16) g74.16<1>UW g32.0<8,8,1>UW {align1 compr};
+mov (16) g76.16<1>UW g34.0<8,8,1>UW {align1 compr};
+mov (16) g78.16<1>UW g36.0<8,8,1>UW {align1 compr};
+mov (16) g80.16<1>UW g38.0<8,8,1>UW {align1 compr};
+
+add (1) ip g21.0<1,1,1>UD 0x40UD {align1};          //jump to the lib to add the reference and idct data
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,62 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/field_forward_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,62 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x2e700169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000020 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a56, 0x00020002 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x00210a5f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a56 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000030 },
+   { 0x00802001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00802001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00802001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00802001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+
+/* shader for backward predict mc
+*/
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
+
+mov (2) g1.14<1>UW g1.18<2,2,1>UW {align1};
+/* save payload */
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1}; 
+/* 8x8 media read/write payload */
+mov (1) g1.8<1>UD 0x0070007UD {align1};  
+/* save payload, again */
+define(`dest', `g118')
+define(`input_surface',	`7')
+define(`mv1',	`g115.14')
+define(`mv2',	`g115.16')
+/* Y */
+/* (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) */
+asr (2) g1.14<1>W g115.14<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g115.0<2,2,1>UD g1.14<2,2,1>W {align1};
+include(`motion_frame_y.g4i')
+/* motion_vector = motion_vector >> 1 */
+/* (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) */
+shr (2) g1.0<1>UD g115.0<2,2,1>UD 1UD {align1};
+asr (2) g115.14<1>W g115.14<2,2,1>W 1W {align1};
+asr (2) g1.14<1>W g115.14<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g1.0<2,2,1>UD g1.14<2,2,1>W {align1};
+/* U */
+define(`input_surface1',	`8')
+define(`input_surface2',	`9')
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+include(`motion_frame_uv.g4i')
+
+/* V */
+/* (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) */
+include(`addidct.g4i')
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,716 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00200001, 0x202e0129, 0x00450032, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e6e, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000012b },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000de },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000092 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000061 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000e5 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x00200008, 0x20200c21, 0x00450e60, 0x00000001 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450e6e, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x008d0040, 0x0414a008 },
+   { 0x00800031, 0x2b401d29, 0x008d0040, 0x0414a009 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,716 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00200001, 0x202e0129, 0x00450032, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e6e, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000256 },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000001bc },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000124 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000c2 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000001ca },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x00200008, 0x20200c21, 0x00450e60, 0x00000001 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450e6e, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x408d0040, 0x0248a008 },
+   { 0x00800031, 0x2b401d29, 0x408d0040, 0x0248a009 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,50 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+/*
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+define(`UV_red',`0xffffffffUD')
+define(`UV_white',`0x7f7f7f7fUD')
+define(`UV_green',`0x00000000UD')
+mov(1) g31.8<1>UD 0x000f000fUD  { align1 };
+mov(16) m1<1>UD 0xFFFFFFFFUD {align1 compr};
+mov(16) m3<1>UD 0xFFFFFFFFUD {align1 compr};
+mov(16) m5<1>UD 0xFFFFFFFFUD {align1 compr};
+mov(16) m7<1>UD 0xFFFFFFFFUD {align1 compr};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(0, 0, 2, 0) mlen 9 rlen 0 { align1 };
+shr (2) g31.0<1>UD g82.0<2,2,1>UD  1UW {align1};
+mov(1) g31.8<1>UD 0x00070007UD  { align1 };
+mov (16) m1<1>UD UV_green {align1 compr};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
+*/
+
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x50UD {align1};  //jump to the lib to do IDCT         
+ 
+//Y, (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) 
+asr (2) g31.14<1>W g82.18<2,2,1>W 1W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g32.16<1>UW 1UW {align1};           //0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A52UD {align1};        //g82.18,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x0UD {align1};   //jump to the lib to read reference data  
+
+//UV, (x', y') = (x >> 1, y >> 1) + (motion_vector.x >> 2, motion_vector.y >> 2)
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g31.14<1>W g82.18<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x10UD {align1};          //jump to the lib to read reference data  
+
+add (1) ip g21.0<1,1,1>UD 0x40UD {align1};          //jump to the lib to add the reference and idct data
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_backward_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,131 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+
+/* shader for forward and backward predict mc
+*/
+/* (x', y') = (x, y) + (motion_vector1.x >> 1, motion_vector1.y >> 1)
+/* (x'', y'') = (x, y) + (motion_vector2.x >> 1, motion_vector2.y >> 1)
+/* f(x, y) = (motion_forward(x`, y`) + motion_backward(x'', y'') + 1) / 2 */
+
+//Save payload
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+include(`block_clear.g4i')
+
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
+mov (1) g1.8<1>UD 0x0070007UD  {align1};
+mov (8) g2.0<1>UD g1.0<8,8,1>UD {align1};
+/* Y */
+//Forward
+asr (2) g1.14<1>W g115.14<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g115.0<2,2,1>UD g1.14<2,2,1>W {align1};
+define(`input_surface',	`4')
+define(`mv1',	`g115.14')
+define(`mv2',	`g115.16')
+include(`motion_frame_y.g4i')
+mov (16) g52.0<1>UD g28.0<16,16,1>UD {align1 compr};
+mov (16) g54.0<1>UD g30.0<16,16,1>UD {align1 compr};
+mov (16) g56.0<1>UD g32.0<16,16,1>UD {align1 compr};
+mov (16) g58.0<1>UD g34.0<16,16,1>UD {align1 compr};
+mov (16) g60.0<1>UD g36.0<16,16,1>UD {align1 compr};
+mov (16) g62.0<1>UD g38.0<16,16,1>UD {align1 compr};
+mov (16) g64.0<1>UD g40.0<16,16,1>UD {align1 compr};
+mov (16) g66.0<1>UD g42.0<16,16,1>UD {align1 compr};
+//Backward
+asr (2) g1.14<1>W g115.18<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g115.0<2,2,1>UD g1.14<2,2,1>W {align1};
+define(`input_surface',	`7')
+define(`mv1',	`g115.18')
+define(`mv2',	`g115.20')
+include(`motion_frame_y.g4i')
+
+//Average
+avg.sat (16) g28.0<1>UW g28.0<16,16,1>UW g52.0<16,16,1>UW {align1};
+avg.sat (16) g29.0<1>UW g29.0<16,16,1>UW g53.0<16,16,1>UW {align1};
+avg.sat (16) g30.0<1>UW g30.0<16,16,1>UW g54.0<16,16,1>UW {align1};
+avg.sat (16) g31.0<1>UW g31.0<16,16,1>UW g55.0<16,16,1>UW {align1};
+avg.sat (16) g32.0<1>UW g32.0<16,16,1>UW g56.0<16,16,1>UW {align1};
+avg.sat (16) g33.0<1>UW g33.0<16,16,1>UW g57.0<16,16,1>UW {align1};
+avg.sat (16) g34.0<1>UW g34.0<16,16,1>UW g58.0<16,16,1>UW {align1};
+avg.sat (16) g35.0<1>UW g35.0<16,16,1>UW g59.0<16,16,1>UW {align1};
+avg.sat (16) g36.0<1>UW g36.0<16,16,1>UW g60.0<16,16,1>UW {align1};
+avg.sat (16) g37.0<1>UW g37.0<16,16,1>UW g61.0<16,16,1>UW {align1};
+avg.sat (16) g38.0<1>UW g38.0<16,16,1>UW g62.0<16,16,1>UW {align1};
+avg.sat (16) g39.0<1>UW g39.0<16,16,1>UW g63.0<16,16,1>UW {align1};
+avg.sat (16) g40.0<1>UW g40.0<16,16,1>UW g64.0<16,16,1>UW {align1};
+avg.sat (16) g41.0<1>UW g41.0<16,16,1>UW g65.0<16,16,1>UW {align1};
+avg.sat (16) g42.0<1>UW g42.0<16,16,1>UW g66.0<16,16,1>UW {align1};
+avg.sat (16) g43.0<1>UW g43.0<16,16,1>UW g67.0<16,16,1>UW {align1};
+
+/* UV */
+//Forward
+shr (2) g1.0<1>UD g115.0<2,2,1>UD 1UD {align1};
+asr (2) g115.14<1>W g115.14<2,2,1>W 1W {align1};
+asr (2) g1.14<1>W g115.14<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g1.0<2,2,1>UD g1.14<2,2,1>W {align1};
+
+define(`input_surface1',	`5')
+define(`input_surface2',	`6')
+define(`mv1',	`g115.14')
+define(`mv2',	`g115.16')
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+include(`motion_frame_uv.g4i')
+mov (16) g122.0<1>UB g44.0<16,16,2>UB {align1};
+mov (16) g122.16<1>UB g45.0<16,16,2>UB {align1};
+mov (16) g123.0<1>UB g46.0<16,16,2>UB {align1};
+mov (16) g123.16<1>UB g47.0<16,16,2>UB {align1};
+mov (16) g124.0<1>UB g48.0<16,16,2>UB {align1};
+mov (16) g124.16<1>UB g49.0<16,16,2>UB {align1};
+mov (16) g125.0<1>UB g50.0<16,16,2>UB {align1};
+mov (16) g125.16<1>UB g51.0<16,16,2>UB {align1};
+//Backward
+asr (2) g115.18<1>W g115.18<2,2,1>W 1W {align1};
+asr (2) g1.14<1>W g115.18<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g1.0<2,2,1>UD g1.14<2,2,1>W {align1};
+define(`input_surface1',	`8')
+define(`input_surface2',	`9')
+define(`mv1',	`g115.18')
+define(`mv2',	`g115.20')
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+include(`motion_frame_uv.g4i')
+
+//Average
+avg.sat (16) g44.0<1>UW g44.0<16,16,1>UW g122.0<16,16,1>UB {align1};
+avg.sat (16) g45.0<1>UW g45.0<16,16,1>UW g122.16<16,16,1>UB {align1};
+avg.sat (16) g46.0<1>UW g46.0<16,16,1>UW g123.0<16,16,1>UB {align1};
+avg.sat (16) g47.0<1>UW g47.0<16,16,1>UW g123.16<16,16,1>UB {align1};
+avg.sat (16) g48.0<1>UW g48.0<16,16,1>UW g124.0<16,16,1>UB {align1};
+avg.sat (16) g49.0<1>UW g49.0<16,16,1>UW g124.16<16,16,1>UB {align1};
+avg.sat (16) g50.0<1>UW g50.0<16,16,1>UW g125.0<16,16,1>UB {align1};
+avg.sat (16) g51.0<1>UW g51.0<16,16,1>UW g125.16<16,16,1>UB {align1};
+
+include(`addidct.g4i')
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1257 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e6e, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000012b },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000de },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000092 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000061 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000e5 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x00802001, 0x26800021, 0x00b10380, 0x00000000 },
+   { 0x00802001, 0x26c00021, 0x00b103c0, 0x00000000 },
+   { 0x00802001, 0x27000021, 0x00b10400, 0x00000000 },
+   { 0x00802001, 0x27400021, 0x00b10440, 0x00000000 },
+   { 0x00802001, 0x27800021, 0x00b10480, 0x00000000 },
+   { 0x00802001, 0x27c00021, 0x00b104c0, 0x00000000 },
+   { 0x00802001, 0x28000021, 0x00b10500, 0x00000000 },
+   { 0x00802001, 0x28400021, 0x00b10540, 0x00000000 },
+   { 0x0020000c, 0x202e3dad, 0x00450e72, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e72, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000012b },
+   { 0x01000005, 0x20000d3c, 0x00210e74, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000de },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000092 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000061 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000e5 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x01000005, 0x20000d3c, 0x00210e74, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10380, 0x00b10680 },
+   { 0x80800042, 0x23a02529, 0x00b103a0, 0x00b106a0 },
+   { 0x80800042, 0x23c02529, 0x00b103c0, 0x00b106c0 },
+   { 0x80800042, 0x23e02529, 0x00b103e0, 0x00b106e0 },
+   { 0x80800042, 0x24002529, 0x00b10400, 0x00b10700 },
+   { 0x80800042, 0x24202529, 0x00b10420, 0x00b10720 },
+   { 0x80800042, 0x24402529, 0x00b10440, 0x00b10740 },
+   { 0x80800042, 0x24602529, 0x00b10460, 0x00b10760 },
+   { 0x80800042, 0x24802529, 0x00b10480, 0x00b10780 },
+   { 0x80800042, 0x24a02529, 0x00b104a0, 0x00b107a0 },
+   { 0x80800042, 0x24c02529, 0x00b104c0, 0x00b107c0 },
+   { 0x80800042, 0x24e02529, 0x00b104e0, 0x00b107e0 },
+   { 0x80800042, 0x25002529, 0x00b10500, 0x00b10800 },
+   { 0x80800042, 0x25202529, 0x00b10520, 0x00b10820 },
+   { 0x80800042, 0x25402529, 0x00b10540, 0x00b10840 },
+   { 0x80800042, 0x25602529, 0x00b10560, 0x00b10860 },
+   { 0x00200008, 0x20200c21, 0x00450e60, 0x00000001 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450e6e, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x008d0040, 0x0414a005 },
+   { 0x00800031, 0x2b401d29, 0x008d0040, 0x0414a006 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2f400231, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x2f500231, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x2f600231, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x2f700231, 0x00b205e0, 0x00000000 },
+   { 0x00800001, 0x2f800231, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x2f900231, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x2fa00231, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x2fb00231, 0x00b20660, 0x00000000 },
+   { 0x0020000c, 0x2e723dad, 0x00450e72, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e72, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x008d0040, 0x0414a008 },
+   { 0x00800031, 0x2b401d29, 0x008d0040, 0x0414a009 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x80800042, 0x25804529, 0x00b10580, 0x00b10f40 },
+   { 0x80800042, 0x25a04529, 0x00b105a0, 0x00b10f50 },
+   { 0x80800042, 0x25c04529, 0x00b105c0, 0x00b10f60 },
+   { 0x80800042, 0x25e04529, 0x00b105e0, 0x00b10f70 },
+   { 0x80800042, 0x26004529, 0x00b10600, 0x00b10f80 },
+   { 0x80800042, 0x26204529, 0x00b10620, 0x00b10f90 },
+   { 0x80800042, 0x26404529, 0x00b10640, 0x00b10fa0 },
+   { 0x80800042, 0x26604529, 0x00b10660, 0x00b10fb0 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1257 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e6e, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000256 },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000001bc },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000124 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000c2 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000001ca },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x00802001, 0x26800021, 0x00b10380, 0x00000000 },
+   { 0x00802001, 0x26c00021, 0x00b103c0, 0x00000000 },
+   { 0x00802001, 0x27000021, 0x00b10400, 0x00000000 },
+   { 0x00802001, 0x27400021, 0x00b10440, 0x00000000 },
+   { 0x00802001, 0x27800021, 0x00b10480, 0x00000000 },
+   { 0x00802001, 0x27c00021, 0x00b104c0, 0x00000000 },
+   { 0x00802001, 0x28000021, 0x00b10500, 0x00000000 },
+   { 0x00802001, 0x28400021, 0x00b10540, 0x00000000 },
+   { 0x0020000c, 0x202e3dad, 0x00450e72, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e72, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000256 },
+   { 0x01000005, 0x20000d3c, 0x00210e74, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000001bc },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000124 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000c2 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000001ca },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x01000005, 0x20000d3c, 0x00210e74, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a007 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a007 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x80800042, 0x23802529, 0x00b10380, 0x00b10680 },
+   { 0x80800042, 0x23a02529, 0x00b103a0, 0x00b106a0 },
+   { 0x80800042, 0x23c02529, 0x00b103c0, 0x00b106c0 },
+   { 0x80800042, 0x23e02529, 0x00b103e0, 0x00b106e0 },
+   { 0x80800042, 0x24002529, 0x00b10400, 0x00b10700 },
+   { 0x80800042, 0x24202529, 0x00b10420, 0x00b10720 },
+   { 0x80800042, 0x24402529, 0x00b10440, 0x00b10740 },
+   { 0x80800042, 0x24602529, 0x00b10460, 0x00b10760 },
+   { 0x80800042, 0x24802529, 0x00b10480, 0x00b10780 },
+   { 0x80800042, 0x24a02529, 0x00b104a0, 0x00b107a0 },
+   { 0x80800042, 0x24c02529, 0x00b104c0, 0x00b107c0 },
+   { 0x80800042, 0x24e02529, 0x00b104e0, 0x00b107e0 },
+   { 0x80800042, 0x25002529, 0x00b10500, 0x00b10800 },
+   { 0x80800042, 0x25202529, 0x00b10520, 0x00b10820 },
+   { 0x80800042, 0x25402529, 0x00b10540, 0x00b10840 },
+   { 0x80800042, 0x25602529, 0x00b10560, 0x00b10860 },
+   { 0x00200008, 0x20200c21, 0x00450e60, 0x00000001 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450e6e, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x408d0040, 0x0248a005 },
+   { 0x00800031, 0x2b401d29, 0x408d0040, 0x0248a006 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x00800001, 0x2f400231, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x2f500231, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x2f600231, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x2f700231, 0x00b205e0, 0x00000000 },
+   { 0x00800001, 0x2f800231, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x2f900231, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x2fa00231, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x2fb00231, 0x00b20660, 0x00000000 },
+   { 0x0020000c, 0x2e723dad, 0x00450e72, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e72, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x408d0040, 0x0248a008 },
+   { 0x00800031, 0x2b401d29, 0x408d0040, 0x0248a009 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x80800042, 0x25804529, 0x00b10580, 0x00b10f40 },
+   { 0x80800042, 0x25a04529, 0x00b105a0, 0x00b10f50 },
+   { 0x80800042, 0x25c04529, 0x00b105c0, 0x00b10f60 },
+   { 0x80800042, 0x25e04529, 0x00b105e0, 0x00b10f70 },
+   { 0x80800042, 0x26004529, 0x00b10600, 0x00b10f80 },
+   { 0x80800042, 0x26204529, 0x00b10620, 0x00b10f90 },
+   { 0x80800042, 0x26404529, 0x00b10640, 0x00b10fa0 },
+   { 0x80800042, 0x26604529, 0x00b10660, 0x00b10fb0 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,96 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+/*
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+define(`UV_red',`0xffffffffUD')
+define(`UV_white',`0x7f7f7f7fUD')
+define(`UV_green',`0x00000000UD')
+mov(1) g31.8<1>UD 0x000f000fUD  { align1 };
+mov(16) m1<1>UD 0xFFFFFFFFUD {align1 compr};
+mov(16) m3<1>UD 0xFFFFFFFFUD {align1 compr};
+mov(16) m5<1>UD 0xFFFFFFFFUD {align1 compr};
+mov(16) m7<1>UD 0xFFFFFFFFUD {align1 compr};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(0, 0, 2, 0) mlen 9 rlen 0 { align1 };
+shr (2) g31.0<1>UD g82.0<2,2,1>UD  1UW {align1};
+mov(1) g31.8<1>UD 0x00070007UD  { align1 };
+mov (16) m1<1>UD UV_green {align1 compr};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
+*/
+
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x50UD {align1};         //jump to the lib to do IDCT
+
+//Y, Forward
+asr (2) g31.14<1>W g82.14<2,2,1>W 1W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g32.16<1>UW 0UW {align1};            //0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A4EUD {align1};         //g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x0UD {align1};   //jump to the lib to read reference data 
+
+//Save Forward
+mov (16) g108.0<1>UD g58.0<16,16,1>UD {align1 compr};
+mov (16) g110.0<1>UD g60.0<16,16,1>UD {align1 compr};
+mov (16) g112.0<1>UD g62.0<16,16,1>UD {align1 compr};
+mov (16) g114.0<1>UD g64.0<16,16,1>UD {align1 compr};
+mov (16) g116.0<1>UD g66.0<16,16,1>UD {align1 compr};
+mov (16) g118.0<1>UD g68.0<16,16,1>UD {align1 compr};
+mov (16) g120.0<1>UD g70.0<16,16,1>UD {align1 compr};
+mov (16) g122.0<1>UD g72.0<16,16,1>UD {align1 compr};
+
+//Y, Backward
+asr (2) g31.14<1>W g82.18<2,2,1>W 1W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g32.16<1>UW 1UW {align1};            //0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A52UD {align1};         //g82.18,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x0UD {align1};   //jump to the lib to read reference data 
+//Average Forward and Backward
+avg (32) g58.0<1>UW g58.0<16,16,1>UW g108.0<16,16,1>UW {align1 compr};
+avg (32) g60.0<1>UW g60.0<16,16,1>UW g110.0<16,16,1>UW {align1 compr};
+avg (32) g62.0<1>UW g62.0<16,16,1>UW g112.0<16,16,1>UW {align1 compr};
+avg (32) g64.0<1>UW g64.0<16,16,1>UW g114.0<16,16,1>UW {align1 compr};
+avg (32) g66.0<1>UW g66.0<16,16,1>UW g116.0<16,16,1>UW {align1 compr};
+avg (32) g68.0<1>UW g68.0<16,16,1>UW g118.0<16,16,1>UW {align1 compr};
+avg (32) g70.0<1>UW g70.0<16,16,1>UW g120.0<16,16,1>UW {align1 compr};
+avg (32) g72.0<1>UW g72.0<16,16,1>UW g122.0<16,16,1>UW {align1 compr};
+
+//UV, Forward
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g31.14<1>W g82.14<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g32.16<1>UW 0UW {align1};                   //0:forward 1:backward
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x10UD {align1};          //jump to the lib to read reference data  
+
+//Save UV Forward
+mov (32) g108.0<1>UW g74.0<16,16,1>UW {align1 compr};
+mov (32) g110.0<1>UW g76.0<16,16,1>UW {align1 compr};
+mov (32) g112.0<1>UW g78.0<16,16,1>UW {align1 compr};
+mov (32) g114.0<1>UW g80.0<16,16,1>UW {align1 compr};
+//UV, Backward
+asr (2) g31.14<1>W g82.18<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g32.16<1>UW 1UW {align1};                   //0:forward 1:backward
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x10UD {align1};          //jump to the lib to read reference data 
+
+//Average Forward and Backward
+avg (32) g74.0<1>UW g74.0<16,16,1>UW g108.0<16,16,1>UW {align1 compr};
+avg (32) g76.0<1>UW g76.0<16,16,1>UW g110.0<16,16,1>UW {align1 compr};
+avg (32) g78.0<1>UW g78.0<16,16,1>UW g112.0<16,16,1>UW {align1 compr};
+avg (32) g80.0<1>UW g80.0<16,16,1>UW g114.0<16,16,1>UW {align1 compr};
+
+add (1) ip g21.0<1,1,1>UD 0x40UD {align1};         //jump to the lib to add the reference and idct data
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,51 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00802001, 0x2d800021, 0x00b10740, 0x00000000 },
+   { 0x00802001, 0x2dc00021, 0x00b10780, 0x00000000 },
+   { 0x00802001, 0x2e000021, 0x00b107c0, 0x00000000 },
+   { 0x00802001, 0x2e400021, 0x00b10800, 0x00000000 },
+   { 0x00802001, 0x2e800021, 0x00b10840, 0x00000000 },
+   { 0x00802001, 0x2ec00021, 0x00b10880, 0x00000000 },
+   { 0x00802001, 0x2f000021, 0x00b108c0, 0x00000000 },
+   { 0x00802001, 0x2f400021, 0x00b10900, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00a02042, 0x27402529, 0x00b10740, 0x00b10d80 },
+   { 0x00a02042, 0x27802529, 0x00b10780, 0x00b10dc0 },
+   { 0x00a02042, 0x27c02529, 0x00b107c0, 0x00b10e00 },
+   { 0x00a02042, 0x28002529, 0x00b10800, 0x00b10e40 },
+   { 0x00a02042, 0x28402529, 0x00b10840, 0x00b10e80 },
+   { 0x00a02042, 0x28802529, 0x00b10880, 0x00b10ec0 },
+   { 0x00a02042, 0x28c02529, 0x00b108c0, 0x00b10f00 },
+   { 0x00a02042, 0x29002529, 0x00b10900, 0x00b10f40 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00a02001, 0x2d800129, 0x00b10940, 0x00000000 },
+   { 0x00a02001, 0x2dc00129, 0x00b10980, 0x00000000 },
+   { 0x00a02001, 0x2e000129, 0x00b109c0, 0x00000000 },
+   { 0x00a02001, 0x2e400129, 0x00b10a00, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00a02042, 0x29402529, 0x00b10940, 0x00b10d80 },
+   { 0x00a02042, 0x29802529, 0x00b10980, 0x00b10dc0 },
+   { 0x00a02042, 0x29c02529, 0x00b109c0, 0x00b10e00 },
+   { 0x00a02042, 0x2a002529, 0x00b10a00, 0x00b10e40 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_f_b_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,51 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00802001, 0x2d800021, 0x00b10740, 0x00000000 },
+   { 0x00802001, 0x2dc00021, 0x00b10780, 0x00000000 },
+   { 0x00802001, 0x2e000021, 0x00b107c0, 0x00000000 },
+   { 0x00802001, 0x2e400021, 0x00b10800, 0x00000000 },
+   { 0x00802001, 0x2e800021, 0x00b10840, 0x00000000 },
+   { 0x00802001, 0x2ec00021, 0x00b10880, 0x00000000 },
+   { 0x00802001, 0x2f000021, 0x00b108c0, 0x00000000 },
+   { 0x00802001, 0x2f400021, 0x00b10900, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a52 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00a02042, 0x27402529, 0x00b10740, 0x00b10d80 },
+   { 0x00a02042, 0x27802529, 0x00b10780, 0x00b10dc0 },
+   { 0x00a02042, 0x27c02529, 0x00b107c0, 0x00b10e00 },
+   { 0x00a02042, 0x28002529, 0x00b10800, 0x00b10e40 },
+   { 0x00a02042, 0x28402529, 0x00b10840, 0x00b10e80 },
+   { 0x00a02042, 0x28802529, 0x00b10880, 0x00b10ec0 },
+   { 0x00a02042, 0x28c02529, 0x00b108c0, 0x00b10f00 },
+   { 0x00a02042, 0x29002529, 0x00b10900, 0x00b10f40 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00a02001, 0x2d800129, 0x00b10940, 0x00000000 },
+   { 0x00a02001, 0x2dc00129, 0x00b10980, 0x00000000 },
+   { 0x00a02001, 0x2e000129, 0x00b109c0, 0x00000000 },
+   { 0x00a02001, 0x2e400129, 0x00b10a00, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a52, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00010001 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00a02042, 0x29402529, 0x00b10940, 0x00b10d80 },
+   { 0x00a02042, 0x29802529, 0x00b10980, 0x00b10dc0 },
+   { 0x00a02042, 0x29c02529, 0x00b109c0, 0x00b10e00 },
+   { 0x00a02042, 0x2a002529, 0x00b10a00, 0x00b10e40 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+
+/* shader for backward predict mc
+*/
+
+/* save payload */
+mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
+
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1}; 
+mov (1) g1.8<1>UD 0x0070007UD {align1};  
+define(`input_surface',	`4')
+define(`mv1',	`g115.14')
+define(`mv2',	`g115.16')
+/* Y */
+/* (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) */
+asr (2) g1.14<1>W g115.14<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g115.0<2,2,1>UD g1.14<2,2,1>W {align1};
+include(`motion_frame_y.g4i')
+/* motion_vector = motion_vector >> 1 */
+/* (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) */
+/* U */
+shr (2) g1.0<1>UD g115.0<2,2,1>UD 1UD {align1};
+asr (2) g115.14<1>W g115.14<2,2,1>W 1W {align1};
+asr (2) g1.14<1>W g115.14<2,2,1>W 1W {align1};
+add (2) g2.0<1>UD g1.0<2,2,1>UD g1.14<2,2,1>W {align1};
+define(`input_surface1',	`5')
+define(`input_surface2',	`6')
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+include(`motion_frame_uv.g4i')
+/* V */
+/* (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) */
+include(`addidct.g4i')
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,715 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e6e, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000012b },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000de },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000092 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000061 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000e5 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x008d0040, 0x0411a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x008d0040, 0x0418a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x00200008, 0x20200c21, 0x00450e60, 0x00000001 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450e6e, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x008d0040, 0x0414a005 },
+   { 0x00800031, 0x2b401d29, 0x008d0040, 0x0414a006 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,715 @@
+   { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450e60, 0x0045002e },
+   { 0x01000005, 0x20000d3c, 0x00210e6e, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000256 },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000001bc },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000031 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800040, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x00800040, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x00800040, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x00800040, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x00800040, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x00800040, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x00800040, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x00800040, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x00800040, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x00800040, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x00800040, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x00800040, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x00800040, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x00800040, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x00800040, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x00800040, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c60 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c80 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca0 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc0 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce0 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d00 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d20 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d40 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d60 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d80 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da0 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc0 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de0 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e00 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e20 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f00 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000124 },
+   { 0x00800040, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x00800040, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x00800040, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x00800040, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x00800040, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x00800040, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x00800040, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x00800040, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x00800040, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x00800040, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x00800040, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x00800040, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x00800040, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x00800040, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x00800040, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x00800040, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c61 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c81 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca1 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce1 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d01 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d21 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d41 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d61 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d81 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc1 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de1 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e01 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e21 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f01 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000c2 },
+   { 0x00800040, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x00800040, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x00800040, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x00800040, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x00800040, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x00800040, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x00800040, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x00800040, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x00800040, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x00800040, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x00800040, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x00800040, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x00800040, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x00800040, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x00800040, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x00800040, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c62 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c82 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca2 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc2 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce2 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d02 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d22 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d42 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d62 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d82 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da2 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc2 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de2 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e02 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e22 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f02 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00800040, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x00800040, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x00800040, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x00800040, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x00800040, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x00800040, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x00800040, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x00800040, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x00800040, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x00800040, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x00800040, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x00800040, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x00800040, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x00800040, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x00800040, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x00800040, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c63 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c83 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca3 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc3 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce3 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d03 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d23 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d43 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d63 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d83 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da3 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc3 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de3 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e03 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e23 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f03 },
+   { 0x00800040, 0x23804529, 0x00b10380, 0x00b10c64 },
+   { 0x00800040, 0x23a04529, 0x00b103a0, 0x00b10c84 },
+   { 0x00800040, 0x23c04529, 0x00b103c0, 0x00b10ca4 },
+   { 0x00800040, 0x23e04529, 0x00b103e0, 0x00b10cc4 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10ce4 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10d04 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10d24 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10d44 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10d64 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10d84 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10da4 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10dc4 },
+   { 0x00800040, 0x25004529, 0x00b10500, 0x00b10de4 },
+   { 0x00800040, 0x25204529, 0x00b10520, 0x00b10e04 },
+   { 0x00800040, 0x25404529, 0x00b10540, 0x00b10e24 },
+   { 0x00800040, 0x25604529, 0x00b10560, 0x00b10f04 },
+   { 0x80800008, 0x23802d29, 0x00b10380, 0x00020002 },
+   { 0x80800008, 0x23a02d29, 0x00b103a0, 0x00020002 },
+   { 0x80800008, 0x23c02d29, 0x00b103c0, 0x00020002 },
+   { 0x80800008, 0x23e02d29, 0x00b103e0, 0x00020002 },
+   { 0x80800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x80800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x80800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x80800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x80800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x80800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x80800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x80800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x80800008, 0x25002d29, 0x00b10500, 0x00020002 },
+   { 0x80800008, 0x25202d29, 0x00b10520, 0x00020002 },
+   { 0x80800008, 0x25402d29, 0x00b10540, 0x00020002 },
+   { 0x80800008, 0x25602d29, 0x00b10560, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000001ca },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20581c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c41 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c61 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10c81 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10ca1 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10cc1 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10ce1 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d01 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d21 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d41 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d61 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10d81 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10da1 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10dc1 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10de1 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e01 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10e21 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c42 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c62 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10c82 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10ca2 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10cc2 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10ce2 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d02 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d22 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d42 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d62 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10d82 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10da2 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10dc2 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10de2 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e02 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10e22 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c43 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c63 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10c83 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10ca3 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10cc3 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10ce3 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d03 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d23 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d43 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d63 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10d83 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10da3 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10dc3 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10de3 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e03 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10e23 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c44 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c64 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10c84 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10ca4 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10cc4 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10ce4 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d04 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d24 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d44 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d64 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10d84 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10da4 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10dc4 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10de4 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e04 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10e24 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000134 },
+   { 0x01000005, 0x20000d3c, 0x00210e70, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x2f001d29, 0x408d0040, 0x0218a004 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x80800042, 0x23804629, 0x00b10c40, 0x00b10c60 },
+   { 0x80800042, 0x23a04629, 0x00b10c60, 0x00b10c80 },
+   { 0x80800042, 0x23c04629, 0x00b10c80, 0x00b10ca0 },
+   { 0x80800042, 0x23e04629, 0x00b10ca0, 0x00b10cc0 },
+   { 0x80800042, 0x24004629, 0x00b10cc0, 0x00b10ce0 },
+   { 0x80800042, 0x24204629, 0x00b10ce0, 0x00b10d00 },
+   { 0x80800042, 0x24404629, 0x00b10d00, 0x00b10d20 },
+   { 0x80800042, 0x24604629, 0x00b10d20, 0x00b10d40 },
+   { 0x80800042, 0x24804629, 0x00b10d40, 0x00b10d60 },
+   { 0x80800042, 0x24a04629, 0x00b10d60, 0x00b10d80 },
+   { 0x80800042, 0x24c04629, 0x00b10d80, 0x00b10da0 },
+   { 0x80800042, 0x24e04629, 0x00b10da0, 0x00b10dc0 },
+   { 0x80800042, 0x25004629, 0x00b10dc0, 0x00b10de0 },
+   { 0x80800042, 0x25204629, 0x00b10de0, 0x00b10e00 },
+   { 0x80800042, 0x25404629, 0x00b10e00, 0x00b10e20 },
+   { 0x80800042, 0x25604629, 0x00b10e20, 0x00b10f00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x80800042, 0x23804629, 0x00b10c41, 0x00b10c61 },
+   { 0x80800042, 0x23a04629, 0x00b10c61, 0x00b10c81 },
+   { 0x80800042, 0x23c04629, 0x00b10c81, 0x00b10ca1 },
+   { 0x80800042, 0x23e04629, 0x00b10ca1, 0x00b10cc1 },
+   { 0x80800042, 0x24004629, 0x00b10cc1, 0x00b10ce1 },
+   { 0x80800042, 0x24204629, 0x00b10ce1, 0x00b10d01 },
+   { 0x80800042, 0x24404629, 0x00b10d01, 0x00b10d21 },
+   { 0x80800042, 0x24604629, 0x00b10d21, 0x00b10d41 },
+   { 0x80800042, 0x24804629, 0x00b10d41, 0x00b10d61 },
+   { 0x80800042, 0x24a04629, 0x00b10d61, 0x00b10d81 },
+   { 0x80800042, 0x24c04629, 0x00b10d81, 0x00b10da1 },
+   { 0x80800042, 0x24e04629, 0x00b10da1, 0x00b10dc1 },
+   { 0x80800042, 0x25004629, 0x00b10dc1, 0x00b10de1 },
+   { 0x80800042, 0x25204629, 0x00b10de1, 0x00b10e01 },
+   { 0x80800042, 0x25404629, 0x00b10e01, 0x00b10e21 },
+   { 0x80800042, 0x25604629, 0x00b10e21, 0x00b10f01 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x80800042, 0x23804629, 0x00b10c42, 0x00b10c62 },
+   { 0x80800042, 0x23a04629, 0x00b10c62, 0x00b10c82 },
+   { 0x80800042, 0x23c04629, 0x00b10c82, 0x00b10ca2 },
+   { 0x80800042, 0x23e04629, 0x00b10ca2, 0x00b10cc2 },
+   { 0x80800042, 0x24004629, 0x00b10cc2, 0x00b10ce2 },
+   { 0x80800042, 0x24204629, 0x00b10ce2, 0x00b10d02 },
+   { 0x80800042, 0x24404629, 0x00b10d02, 0x00b10d22 },
+   { 0x80800042, 0x24604629, 0x00b10d22, 0x00b10d42 },
+   { 0x80800042, 0x24804629, 0x00b10d42, 0x00b10d62 },
+   { 0x80800042, 0x24a04629, 0x00b10d62, 0x00b10d82 },
+   { 0x80800042, 0x24c04629, 0x00b10d82, 0x00b10da2 },
+   { 0x80800042, 0x24e04629, 0x00b10da2, 0x00b10dc2 },
+   { 0x80800042, 0x25004629, 0x00b10dc2, 0x00b10de2 },
+   { 0x80800042, 0x25204629, 0x00b10de2, 0x00b10e02 },
+   { 0x80800042, 0x25404629, 0x00b10e02, 0x00b10e22 },
+   { 0x80800042, 0x25604629, 0x00b10e22, 0x00b10f02 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800042, 0x23804629, 0x00b10c43, 0x00b10c63 },
+   { 0x80800042, 0x23a04629, 0x00b10c63, 0x00b10c83 },
+   { 0x80800042, 0x23c04629, 0x00b10c83, 0x00b10ca3 },
+   { 0x80800042, 0x23e04629, 0x00b10ca3, 0x00b10cc3 },
+   { 0x80800042, 0x24004629, 0x00b10cc3, 0x00b10ce3 },
+   { 0x80800042, 0x24204629, 0x00b10ce3, 0x00b10d03 },
+   { 0x80800042, 0x24404629, 0x00b10d03, 0x00b10d23 },
+   { 0x80800042, 0x24604629, 0x00b10d23, 0x00b10d43 },
+   { 0x80800042, 0x24804629, 0x00b10d43, 0x00b10d63 },
+   { 0x80800042, 0x24a04629, 0x00b10d63, 0x00b10d83 },
+   { 0x80800042, 0x24c04629, 0x00b10d83, 0x00b10da3 },
+   { 0x80800042, 0x24e04629, 0x00b10da3, 0x00b10dc3 },
+   { 0x80800042, 0x25004629, 0x00b10dc3, 0x00b10de3 },
+   { 0x80800042, 0x25204629, 0x00b10de3, 0x00b10e03 },
+   { 0x80800042, 0x25404629, 0x00b10e03, 0x00b10e23 },
+   { 0x80800042, 0x25604629, 0x00b10e23, 0x00b10f03 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000094 },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x2c401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000040, 0x20440c21, 0x00210044, 0x00000008 },
+   { 0x00800031, 0x2d401d29, 0x408d0040, 0x0288a004 },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x23800229, 0x00b10c40, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c60, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c80, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca0, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce0, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d00, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d20, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d60, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d80, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da0, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc0, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de0, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e00, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e20, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x00800001, 0x23800229, 0x00b10c41, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c61, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c81, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca1, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc1, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce1, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d01, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d21, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d41, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d61, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d81, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da1, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc1, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de1, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e01, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e21, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x00800001, 0x23800229, 0x00b10c42, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c62, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c82, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca2, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc2, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce2, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d02, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d22, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d42, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d62, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d82, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da2, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc2, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de2, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e02, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e22, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800001, 0x23800229, 0x00b10c43, 0x00000000 },
+   { 0x00800001, 0x23a00229, 0x00b10c63, 0x00000000 },
+   { 0x00800001, 0x23c00229, 0x00b10c83, 0x00000000 },
+   { 0x00800001, 0x23e00229, 0x00b10ca3, 0x00000000 },
+   { 0x00800001, 0x24000229, 0x00b10cc3, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10ce3, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10d03, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b10d23, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10d43, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10d63, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10d83, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b10da3, 0x00000000 },
+   { 0x00800001, 0x25000229, 0x00b10dc3, 0x00000000 },
+   { 0x00800001, 0x25200229, 0x00b10de3, 0x00000000 },
+   { 0x00800001, 0x25400229, 0x00b10e03, 0x00000000 },
+   { 0x00800001, 0x25600229, 0x00b10e23, 0x00000000 },
+   { 0x00200008, 0x20200c21, 0x00450e60, 0x00000001 },
+   { 0x0020000c, 0x2e6e3dad, 0x00450e6e, 0x00010001 },
+   { 0x0020000c, 0x202e3dad, 0x00450e6e, 0x00010001 },
+   { 0x00200040, 0x20403421, 0x00450020, 0x0045002e },
+   { 0x00000001, 0x20480061, 0x00000000, 0x0007000f },
+   { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 },
+   { 0x00800031, 0x2ac01d29, 0x408d0040, 0x0248a005 },
+   { 0x00800031, 0x2b401d29, 0x408d0040, 0x0248a006 },
+   { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
+   { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
+   { 0x00800001, 0x25800229, 0x00ad0ac0, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae0, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b00, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b20, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b40, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b60, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b80, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba0, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00800001, 0x25800229, 0x00ad0ac1, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae1, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b01, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b21, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b41, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b61, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b81, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba1, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x25800229, 0x00ad0ac2, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae2, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b02, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b22, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b42, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b62, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b82, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba2, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x25800229, 0x00ad0ac3, 0x00000000 },
+   { 0x00800001, 0x25a00229, 0x00ad0ae3, 0x00000000 },
+   { 0x00800001, 0x25c00229, 0x00ad0b03, 0x00000000 },
+   { 0x00800001, 0x25e00229, 0x00ad0b23, 0x00000000 },
+   { 0x00800001, 0x26000229, 0x00ad0b43, 0x00000000 },
+   { 0x00800001, 0x26200229, 0x00ad0b63, 0x00000000 },
+   { 0x00800001, 0x26400229, 0x00ad0b83, 0x00000000 },
+   { 0x00800001, 0x26600229, 0x00ad0ba3, 0x00000000 },
+   { 0x00600001, 0x20200021, 0x008d0980, 0x00000000 },
+   { 0x00800001, 0x458101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45a101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45c101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x45e101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x460101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x462101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x464101f1, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x466101f1, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10080, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b100a0, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b100c0, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100e0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b10100, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b10120, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b10140, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b10160, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b10180, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b101a0, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b101c0, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b101e0, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10200, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10220, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x238045ad, 0x00b10060, 0x00b20380 },
+   { 0x00800040, 0x23a045ad, 0x00b10160, 0x00b203a0 },
+   { 0x00800040, 0x23c045ad, 0x00b10080, 0x00b203c0 },
+   { 0x00800040, 0x23e045ad, 0x00b10180, 0x00b203e0 },
+   { 0x00800040, 0x240045ad, 0x00b100a0, 0x00b20400 },
+   { 0x00800040, 0x242045ad, 0x00b101a0, 0x00b20420 },
+   { 0x00800040, 0x244045ad, 0x00b100c0, 0x00b20440 },
+   { 0x00800040, 0x246045ad, 0x00b101c0, 0x00b20460 },
+   { 0x00800040, 0x248045ad, 0x00b100e0, 0x00b20480 },
+   { 0x00800040, 0x24a045ad, 0x00b101e0, 0x00b204a0 },
+   { 0x00800040, 0x24c045ad, 0x00b10100, 0x00b204c0 },
+   { 0x00800040, 0x24e045ad, 0x00b10200, 0x00b204e0 },
+   { 0x00800040, 0x250045ad, 0x00b10120, 0x00b20500 },
+   { 0x00800040, 0x252045ad, 0x00b10220, 0x00b20520 },
+   { 0x00800040, 0x254045ad, 0x00b10140, 0x00b20540 },
+   { 0x00800040, 0x256045ad, 0x00b10240, 0x00b20560 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x438001b1, 0x00b10380, 0x00000000 },
+   { 0x80800001, 0x43a001b1, 0x00b103a0, 0x00000000 },
+   { 0x80800001, 0x43c001b1, 0x00b103c0, 0x00000000 },
+   { 0x80800001, 0x43e001b1, 0x00b103e0, 0x00000000 },
+   { 0x80800001, 0x440001b1, 0x00b10400, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20380, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b203a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b203c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b203e0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20400, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20560, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450020, 0x00000001 },
+   { 0x00800040, 0x258025a9, 0x00b10260, 0x00b10580 },
+   { 0x00800040, 0x25a025a9, 0x00b10280, 0x00b105a0 },
+   { 0x00800040, 0x25c025a9, 0x00b102a0, 0x00b105c0 },
+   { 0x00800040, 0x25e025a9, 0x00b102c0, 0x00b105e0 },
+   { 0x80800001, 0x45800131, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a00131, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c00131, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e00131, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b205e0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800040, 0x260025a9, 0x00b102e0, 0x00b10600 },
+   { 0x00800040, 0x262025a9, 0x00b10300, 0x00b10620 },
+   { 0x00800040, 0x264025a9, 0x00b10320, 0x00b10640 },
+   { 0x00800040, 0x266025a9, 0x00b10340, 0x00b10660 },
+   { 0x80800001, 0x46000131, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x46200131, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x46400131, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x46600131, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20600, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20660, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,30 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x50UD {align1};   //jump to the lib to do IDCT  
+
+//Y, (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) 
+asr (2) g31.14<1>W g82.14<2,2,1>W 1W {align1};  
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g32.16<1>UW 0UW {align1};           //0:forward 1:backward
+mov (1) a0.0<1>UD 0x0A4EUD {align1};        //g82.14,motion vector
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x00UD {align1};   //jump to the lib to read reference data  
+
+//UV, (x', y') = (x >> 1, y >> 1) + (motion_vector.x >> 2, motion_vector.y >> 2)
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g31.14<1>W g82.14<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+mov (1) g126.8<1>UD ip {align1};
+add (1) ip g21.0<1,1,1>UD 0x10UD {align1};          //jump to the lib to read reference data  
+
+add (1) ip g21.0<1,1,1>UD 0x40UD {align1};          //jump to the lib to add the reference and idct data
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/frame_forward_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,15 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000050 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24100169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x00000a4e },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a4e, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000010 },
+   { 0x00000040, 0x34000c20, 0x002102a0, 0x00000040 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,166 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
+
+and.nz (1) null g2.0<1,1,1>UD 0x1UD{align1};
+(f0) jmpi direct_idct;
+add (1) g2.8<1>UD g115.8<1,1,1>UD 0UD{align1};
+send (16) 0 g3.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g4.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g5.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g6.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g7.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g8.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g9.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g10.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g11.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g12.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g13.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g14.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g15.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g16.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g17.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g18.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g19.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g20.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g21.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g22.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g23<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g24.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g25.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+add (1) g2.8<1>UD g2.8<1,1,1>UD 32UD {align1};
+send (16) 0 g26.0<1>UD g2<16,16,1>UD read(3, 0, 2, 0) mlen 1 rlen 1 { align1 };
+direct_idct:
+mov (1) g1.8<1>UD 0x00F000FUD {align1};
+mov.sat (16) g3.0<2>UB g3.0<16,16,1>W {align1};
+mov.sat (16) g4.0<2>UB g4.0<16,16,1>W {align1};
+mov.sat (16) g5.0<2>UB g5.0<16,16,1>W {align1};
+mov.sat (16) g6.0<2>UB g6.0<16,16,1>W {align1};
+mov.sat (16) g7.0<2>UB g7.0<16,16,1>W {align1};
+mov.sat (16) g8.0<2>UB g8.0<16,16,1>W {align1};
+mov.sat (16) g9.0<2>UB g9.0<16,16,1>W {align1};
+mov.sat (16) g10.0<2>UB g10.0<16,16,1>W {align1};
+mov.sat (16) g11.0<2>UB g11.0<16,16,1>W {align1};
+mov.sat (16) g12.0<2>UB g12.0<16,16,1>W {align1};
+mov.sat (16) g13.0<2>UB g13.0<16,16,1>W {align1};
+mov.sat (16) g14.0<2>UB g14.0<16,16,1>W {align1};
+mov.sat (16) g15.0<2>UB g15.0<16,16,1>W {align1};
+mov.sat (16) g16.0<2>UB g16.0<16,16,1>W {align1};
+mov.sat (16) g17.0<2>UB g17.0<16,16,1>W {align1};
+mov.sat (16) g18.0<2>UB g18.0<16,16,1>W {align1};
+
+and.nz (1) null g1.30<1,1,1>UB 0x1UW{align1};
+(f0) jmpi field_dct;
+//Frame IDCT
+mov (16) m1.0<1>UB g3.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g4.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g5.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g6.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB g7.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g8.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB g9.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g10.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB g11.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g12.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB g13.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g14.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB g15.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g16.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB g17.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g18.0<16,16,2>UB {align1};
+jmpi write_back;
+
+field_dct:
+//Field IDCT
+mov (16) m1.0<1>UB g3.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g11.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g4.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g12.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB g5.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g13.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB g6.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g14.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB g7.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g15.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB g8.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g16.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB g9.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g17.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB g10.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g18.0<16,16,2>UB {align1};
+
+write_back:
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(0,0,2,0) mlen 9 rlen 0 {align1};
+//U
+mov (1) g1.8<1>UD 0x0070007UD  { align1 };
+shr (2) g1.0<1>UD g115.0<2,2,1>UD 1D {align1};
+mov.sat (16) g19.0<2>UB g19.0<16,16,1>W {align1};
+mov.sat (16) g20.0<2>UB g20.0<16,16,1>W {align1};
+mov.sat (16) g21.0<2>UB g21.0<16,16,1>W {align1};
+mov.sat (16) g22.0<2>UB g22.0<16,16,1>W {align1};
+mov (16) m1.0<1>UB g19.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g20.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g21.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g22.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+//V
+mov.sat (16) g23.0<2>UB g23.0<16,16,1>W {align1};
+mov.sat (16) g24.0<2>UB g24.0<16,16,1>W {align1};
+mov.sat (16) g25.0<2>UB g25.0<16,16,1>W {align1};
+mov.sat (16) g26.0<2>UB g26.0<16,16,1>W {align1};
+mov (16) m1.0<1>UB g23.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g24.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g25.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g26.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW
+        thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,125 @@
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210e68, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x406001b1, 0x00b10060, 0x00000000 },
+   { 0x80800001, 0x408001b1, 0x00b10080, 0x00000000 },
+   { 0x80800001, 0x40a001b1, 0x00b100a0, 0x00000000 },
+   { 0x80800001, 0x40c001b1, 0x00b100c0, 0x00000000 },
+   { 0x80800001, 0x40e001b1, 0x00b100e0, 0x00000000 },
+   { 0x80800001, 0x410001b1, 0x00b10100, 0x00000000 },
+   { 0x80800001, 0x412001b1, 0x00b10120, 0x00000000 },
+   { 0x80800001, 0x414001b1, 0x00b10140, 0x00000000 },
+   { 0x80800001, 0x416001b1, 0x00b10160, 0x00000000 },
+   { 0x80800001, 0x418001b1, 0x00b10180, 0x00000000 },
+   { 0x80800001, 0x41a001b1, 0x00b101a0, 0x00000000 },
+   { 0x80800001, 0x41c001b1, 0x00b101c0, 0x00000000 },
+   { 0x80800001, 0x41e001b1, 0x00b101e0, 0x00000000 },
+   { 0x80800001, 0x420001b1, 0x00b10200, 0x00000000 },
+   { 0x80800001, 0x422001b1, 0x00b10220, 0x00000000 },
+   { 0x80800001, 0x424001b1, 0x00b10240, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x20200232, 0x00b20060, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20080, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b200a0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b200c0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b200e0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20100, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20120, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20140, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20160, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20180, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b201a0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b201c0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b201e0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20200, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20220, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20240, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x20200232, 0x00b20060, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20160, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20080, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20180, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b200a0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b201a0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b200c0, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b201c0, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b200e0, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b201e0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20100, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20200, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20120, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20220, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20140, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20240, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05902000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450e60, 0x00000001 },
+   { 0x80800001, 0x426001b1, 0x00b10260, 0x00000000 },
+   { 0x80800001, 0x428001b1, 0x00b10280, 0x00000000 },
+   { 0x80800001, 0x42a001b1, 0x00b102a0, 0x00000000 },
+   { 0x80800001, 0x42c001b1, 0x00b102c0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20260, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20280, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b202a0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b202c0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x80800001, 0x42e001b1, 0x00b102e0, 0x00000000 },
+   { 0x80800001, 0x430001b1, 0x00b10300, 0x00000000 },
+   { 0x80800001, 0x432001b1, 0x00b10320, 0x00000000 },
+   { 0x80800001, 0x434001b1, 0x00b10340, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b202e0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20300, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20320, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20340, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,125 @@
+   { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000060 },
+   { 0x00000040, 0x20480c21, 0x00210e68, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x40b10040, 0x02180203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x40b10040, 0x02180203 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x406001b1, 0x00b10060, 0x00000000 },
+   { 0x80800001, 0x408001b1, 0x00b10080, 0x00000000 },
+   { 0x80800001, 0x40a001b1, 0x00b100a0, 0x00000000 },
+   { 0x80800001, 0x40c001b1, 0x00b100c0, 0x00000000 },
+   { 0x80800001, 0x40e001b1, 0x00b100e0, 0x00000000 },
+   { 0x80800001, 0x410001b1, 0x00b10100, 0x00000000 },
+   { 0x80800001, 0x412001b1, 0x00b10120, 0x00000000 },
+   { 0x80800001, 0x414001b1, 0x00b10140, 0x00000000 },
+   { 0x80800001, 0x416001b1, 0x00b10160, 0x00000000 },
+   { 0x80800001, 0x418001b1, 0x00b10180, 0x00000000 },
+   { 0x80800001, 0x41a001b1, 0x00b101a0, 0x00000000 },
+   { 0x80800001, 0x41c001b1, 0x00b101c0, 0x00000000 },
+   { 0x80800001, 0x41e001b1, 0x00b101e0, 0x00000000 },
+   { 0x80800001, 0x420001b1, 0x00b10200, 0x00000000 },
+   { 0x80800001, 0x422001b1, 0x00b10220, 0x00000000 },
+   { 0x80800001, 0x424001b1, 0x00b10240, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x0021003e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x20200232, 0x00b20060, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20080, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b200a0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b200c0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b200e0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20100, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20120, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20140, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20160, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20180, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b201a0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b201c0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b201e0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20200, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20220, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20240, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800001, 0x20200232, 0x00b20060, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20160, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20080, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20180, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b200a0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b201a0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b200c0, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b201c0, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b200e0, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b201e0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20100, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20200, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20120, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20220, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20140, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20240, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x12082000 },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x20201c21, 0x00450e60, 0x00000001 },
+   { 0x80800001, 0x426001b1, 0x00b10260, 0x00000000 },
+   { 0x80800001, 0x428001b1, 0x00b10280, 0x00000000 },
+   { 0x80800001, 0x42a001b1, 0x00b102a0, 0x00000000 },
+   { 0x80800001, 0x42c001b1, 0x00b102c0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20260, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20280, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b202a0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b202c0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x80800001, 0x42e001b1, 0x00b102e0, 0x00000000 },
+   { 0x80800001, 0x430001b1, 0x00b10300, 0x00000000 },
+   { 0x80800001, 0x432001b1, 0x00b10320, 0x00000000 },
+   { 0x80800001, 0x434001b1, 0x00b10340, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b202e0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20300, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20320, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20340, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,105 @@
+/*
+   GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT tab
+   g31:    read and write message descriptor
+   g32~g55:DCT data
+   g58~g81:reference data
+   g82:    thread payload 
+   g83~g106:IDCT data 
+*/
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+
+mov.sat (16) g33.0<2>UB g33.0<16,16,1>W {align1};
+mov.sat (16) g34.0<2>UB g34.0<16,16,1>W {align1};
+mov.sat (16) g35.0<2>UB g35.0<16,16,1>W {align1};
+mov.sat (16) g36.0<2>UB g36.0<16,16,1>W {align1};
+mov.sat (16) g37.0<2>UB g37.0<16,16,1>W {align1};
+mov.sat (16) g38.0<2>UB g38.0<16,16,1>W {align1};
+mov.sat (16) g39.0<2>UB g39.0<16,16,1>W {align1};
+mov.sat (16) g40.0<2>UB g40.0<16,16,1>W {align1};
+mov.sat (16) g41.0<2>UB g41.0<16,16,1>W {align1};
+mov.sat (16) g42.0<2>UB g42.0<16,16,1>W {align1};
+mov.sat (16) g43.0<2>UB g43.0<16,16,1>W {align1};
+mov.sat (16) g44.0<2>UB g44.0<16,16,1>W {align1};
+mov.sat (16) g45.0<2>UB g45.0<16,16,1>W {align1};
+mov.sat (16) g46.0<2>UB g46.0<16,16,1>W {align1};
+mov.sat (16) g47.0<2>UB g47.0<16,16,1>W {align1};
+mov.sat (16) g48.0<2>UB g48.0<16,16,1>W {align1};
+
+mov.sat (16) g49.0<2>UB g49.0<16,16,1>W {align1};
+mov.sat (16) g50.0<2>UB g50.0<16,16,1>W {align1};
+mov.sat (16) g51.0<2>UB g51.0<16,16,1>W {align1};
+mov.sat (16) g52.0<2>UB g52.0<16,16,1>W {align1};
+mov.sat (16) g53.0<2>UB g53.0<16,16,1>W {align1};
+mov.sat (16) g54.0<2>UB g54.0<16,16,1>W {align1};
+mov.sat (16) g55.0<2>UB g55.0<16,16,1>W {align1};
+mov.sat (16) g56.0<2>UB g56.0<16,16,1>W {align1};
+
+mov (1) g31.8<1>UD 0x00F000FUD {align1};
+
+and.nz (1) null g82.30<1,1,1>UB 0x1UW{align1};
+(f0) jmpi field_dct_y;
+
+mov (16) m1.0<1>UB  g33.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g34.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g35.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g36.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB  g37.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g38.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB  g39.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g40.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB  g41.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g42.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB  g43.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g44.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB  g45.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g46.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB  g47.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g48.0<16,16,2>UB {align1};
+jmpi write_back_y;
+
+field_dct_y:
+mov (16) m1.0<1>UB  g33.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g41.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g34.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g42.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB  g35.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g43.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB  g36.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g44.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB  g37.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g45.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB  g38.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g46.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB  g39.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g47.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB  g40.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g48.0<16,16,2>UB {align1};
+
+write_back_y:
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(0,0,2,0) mlen 9 rlen 0 {align1};
+
+//U
+mov (1) g31.8<1>UD 0x0070007UD  { align1 };
+shr (2) g31.0<1>UD g82.0<2,2,1>UD 1D {align1};
+
+mov (16) m1.0<1>UB  g49.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g50.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g51.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g52.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+//V
+mov (16) m1.0<1>UB  g53.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g54.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g55.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g56.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+OUT:
+send (16) 0 acc0<1>UW g0<8,8,1>UW
+        thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,75 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x80800001, 0x458001b1, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a001b1, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c001b1, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e001b1, 0x00b105e0, 0x00000000 },
+   { 0x80800001, 0x460001b1, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x462001b1, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x464001b1, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x466001b1, 0x00b10660, 0x00000000 },
+   { 0x80800001, 0x468001b1, 0x00b10680, 0x00000000 },
+   { 0x80800001, 0x46a001b1, 0x00b106a0, 0x00000000 },
+   { 0x80800001, 0x46c001b1, 0x00b106c0, 0x00000000 },
+   { 0x80800001, 0x46e001b1, 0x00b106e0, 0x00000000 },
+   { 0x80800001, 0x470001b1, 0x00b10700, 0x00000000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x02000005, 0x20002e3c, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x20200232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20560, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b205e0, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20600, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x20200232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20560, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b205e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20600, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x00450a40, 0x00000001 },
+   { 0x00800001, 0x20200232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20660, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20680, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800001, 0x20200232, 0x00b206a0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b206c0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b206e0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20700, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/ipicture_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,75 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x80800001, 0x442001b1, 0x00b10420, 0x00000000 },
+   { 0x80800001, 0x444001b1, 0x00b10440, 0x00000000 },
+   { 0x80800001, 0x446001b1, 0x00b10460, 0x00000000 },
+   { 0x80800001, 0x448001b1, 0x00b10480, 0x00000000 },
+   { 0x80800001, 0x44a001b1, 0x00b104a0, 0x00000000 },
+   { 0x80800001, 0x44c001b1, 0x00b104c0, 0x00000000 },
+   { 0x80800001, 0x44e001b1, 0x00b104e0, 0x00000000 },
+   { 0x80800001, 0x450001b1, 0x00b10500, 0x00000000 },
+   { 0x80800001, 0x452001b1, 0x00b10520, 0x00000000 },
+   { 0x80800001, 0x454001b1, 0x00b10540, 0x00000000 },
+   { 0x80800001, 0x456001b1, 0x00b10560, 0x00000000 },
+   { 0x80800001, 0x458001b1, 0x00b10580, 0x00000000 },
+   { 0x80800001, 0x45a001b1, 0x00b105a0, 0x00000000 },
+   { 0x80800001, 0x45c001b1, 0x00b105c0, 0x00000000 },
+   { 0x80800001, 0x45e001b1, 0x00b105e0, 0x00000000 },
+   { 0x80800001, 0x460001b1, 0x00b10600, 0x00000000 },
+   { 0x80800001, 0x462001b1, 0x00b10620, 0x00000000 },
+   { 0x80800001, 0x464001b1, 0x00b10640, 0x00000000 },
+   { 0x80800001, 0x466001b1, 0x00b10660, 0x00000000 },
+   { 0x80800001, 0x468001b1, 0x00b10680, 0x00000000 },
+   { 0x80800001, 0x46a001b1, 0x00b106a0, 0x00000000 },
+   { 0x80800001, 0x46c001b1, 0x00b106c0, 0x00000000 },
+   { 0x80800001, 0x46e001b1, 0x00b106e0, 0x00000000 },
+   { 0x80800001, 0x470001b1, 0x00b10700, 0x00000000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x02000005, 0x20002e3c, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x20200232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20560, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b205e0, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20600, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800001, 0x20200232, 0x00b20420, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20520, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20440, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20540, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20460, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20560, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20480, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20580, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b204a0, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b205a0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b204c0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b205c0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b204e0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b205e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20500, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20600, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x00450a40, 0x00000001 },
+   { 0x00800001, 0x20200232, 0x00b20620, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20640, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20660, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20680, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800001, 0x20200232, 0x00b206a0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b206c0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b206e0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20700, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,133 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix in UB format
+           g3~g4:non intra IQ matrix in UB format
+           g5~g20:IDCT table
+   g32~g55:DCT data before IQ
+   g56~g79:DCT data after IQ
+   g84~g107: IDCT data after idct
+   g82:    thread payload backup
+   g126.8:   ip before jump to the lib
+*/
+jmpi MOTION_FRAME_Y;
+jmpi MOTION_FRAME_UV;
+jmpi MOTION_FIELD_Y;
+jmpi MOTION_FIELD_UV;
+jmpi ADD_IDCT;
+
+mov (16) g84.0<1>W g33.0<16,16,1>W {align1};
+mov (16) g85.0<1>W g34.0<16,16,1>W {align1};
+mov (16) g86.0<1>W g35.0<16,16,1>W {align1};
+mov (16) g87.0<1>W g36.0<16,16,1>W {align1};
+mov (16) g88.0<1>W g37.0<16,16,1>W {align1};
+mov (16) g89.0<1>W g38.0<16,16,1>W {align1};
+mov (16) g90.0<1>W g39.0<16,16,1>W {align1};
+mov (16) g91.0<1>W g40.0<16,16,1>W {align1};
+mov (16) g92.0<1>W g41.0<16,16,1>W {align1};
+mov (16) g93.0<1>W g42.0<16,16,1>W {align1};
+mov (16) g94.0<1>W g43.0<16,16,1>W {align1};
+mov (16) g95.0<1>W g44.0<16,16,1>W {align1};
+mov (16) g96.0<1>W g45.0<16,16,1>W {align1};
+mov (16) g97.0<1>W g46.0<16,16,1>W {align1};
+mov (16) g98.0<1>W g47.0<16,16,1>W {align1};
+mov (16) g99.0<1>W g48.0<16,16,1>W {align1};
+
+mov (16) g100.0<1>W g49.0<16,16,1>W {align1};
+mov (16) g101.0<1>W g50.0<16,16,1>W {align1};
+mov (16) g102.0<1>W g51.0<16,16,1>W {align1};
+mov (16) g103.0<1>W g52.0<16,16,1>W {align1};
+mov (16) g104.0<1>W g53.0<16,16,1>W {align1};
+mov (16) g105.0<1>W g54.0<16,16,1>W {align1};
+mov (16) g106.0<1>W g55.0<16,16,1>W {align1};
+mov (16) g107.0<1>W g56.0<16,16,1>W {align1};
+
+//Y0
+and.nz (1) null g82.12<1,1,1>UW 0x20UW {align1};
+(f0) jmpi block_y1;
+mov (8) g84.0<1>W 0W {align1};
+mov (8) g85.0<1>W 0W {align1};
+mov (8) g86.0<1>W 0W {align1};
+mov (8) g87.0<1>W 0W {align1};
+mov (8) g88.0<1>W 0W {align1};
+mov (8) g89.0<1>W 0W {align1};
+mov (8) g90.0<1>W 0W {align1};
+mov (8) g91.0<1>W 0W {align1};
+
+//Y1
+block_y1:
+and.nz (1) null g82.12<1,1,1>UW 0x10UW {align1};
+(f0) jmpi block_y2;
+mov (8) g84.16<1>W 0W {align1};
+mov (8) g85.16<1>W 0W {align1};
+mov (8) g86.16<1>W 0W {align1};
+mov (8) g87.16<1>W 0W {align1};
+mov (8) g88.16<1>W 0W {align1};
+mov (8) g89.16<1>W 0W {align1};
+mov (8) g90.16<1>W 0W {align1};
+mov (8) g91.16<1>W 0W {align1};
+
+//Y2
+block_y2:
+and.nz (1) null g82.12<1,1,1>UW 0x08UW {align1};
+(f0) jmpi block_y3;
+mov (8) g92.0<1>W 0W {align1};
+mov (8) g93.0<1>W 0W {align1};
+mov (8) g94.0<1>W 0W {align1};
+mov (8) g95.0<1>W 0W {align1};
+mov (8) g96.0<1>W 0W {align1};
+mov (8) g97.0<1>W 0W {align1};
+mov (8) g98.0<1>W 0W {align1};
+mov (8) g99.0<1>W 0W {align1};
+
+//Y3
+block_y3:
+and.nz (1) null g82.12<1,1,1>UW 0x04UW {align1};
+(f0) jmpi block_u;
+mov (8) g92.16<1>W 0W {align1};
+mov (8) g93.16<1>W 0W {align1};
+mov (8) g94.16<1>W 0W {align1};
+mov (8) g95.16<1>W 0W {align1};
+mov (8) g96.16<1>W 0W {align1};
+mov (8) g97.16<1>W 0W {align1};
+mov (8) g98.16<1>W 0W {align1};
+mov (8) g99.16<1>W 0W {align1};
+
+//U
+block_u:
+and.nz (1) null g82.12<1,1,1>UW 0x02UW {align1};
+(f0) jmpi block_v;
+mov (16) g100.0<1>W 0W {align1};
+mov (16) g101.0<1>W 0W {align1};
+mov (16) g102.0<1>W 0W {align1};
+mov (16) g103.0<1>W 0W {align1};
+
+//V
+block_v:
+and.nz (1) null g82.12<1,1,1>UW 0x01UW {align1};
+(f0) jmpi out;
+mov (16) g104.0<1>W 0W {align1};
+mov (16) g105.0<1>W 0W {align1};
+mov (16) g106.0<1>W 0W {align1};
+mov (16) g107.0<1>W 0W {align1};
+
+out:
+add (1) ip g126.8<1,1,1>UD 0x20UD {align1};            //jump back
+
+MOTION_FRAME_Y:
+include(`motion_frame_y_igd.g4i')
+add (1) ip g126.8<1,1,1>UD 0x20UD {align1};            //jump back
+
+MOTION_FRAME_UV:
+include(`motion_frame_uv_igd.g4i')
+add (1) ip g126.8<1,1,1>UD 0x20UD {align1};            //jump back
+
+MOTION_FIELD_Y:
+include(`motion_field_y_igd.g4i')
+add (1) ip g126.8<1,1,1>UD 0x20UD {align1};            //jump back
+
+MOTION_FIELD_UV:
+include(`motion_field_uv_igd.g4i')
+add (1) ip g126.8<1,1,1>UD 0x20UD {align1};            //jump back
+
+ADD_IDCT:
+include(`addidct_igd.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,558 @@
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000051 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000f0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000fc },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000016f },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000001da },
+   { 0x00800001, 0x2a8001ad, 0x00b10420, 0x00000000 },
+   { 0x00800001, 0x2aa001ad, 0x00b10440, 0x00000000 },
+   { 0x00800001, 0x2ac001ad, 0x00b10460, 0x00000000 },
+   { 0x00800001, 0x2ae001ad, 0x00b10480, 0x00000000 },
+   { 0x00800001, 0x2b0001ad, 0x00b104a0, 0x00000000 },
+   { 0x00800001, 0x2b2001ad, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x2b4001ad, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x2b6001ad, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x2b8001ad, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x2ba001ad, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x2bc001ad, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x2be001ad, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x2c0001ad, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x2c2001ad, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x2c4001ad, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x2c6001ad, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x2c8001ad, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x2ca001ad, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x2cc001ad, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x2ce001ad, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x2d0001ad, 0x00b106a0, 0x00000000 },
+   { 0x00800001, 0x2d2001ad, 0x00b106c0, 0x00000000 },
+   { 0x00800001, 0x2d4001ad, 0x00b106e0, 0x00000000 },
+   { 0x00800001, 0x2d6001ad, 0x00b10700, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x2a8001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2aa001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ac001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ae001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b0001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b2001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b4001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b6001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x2a9001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ab001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ad001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2af001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b1001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b3001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b5001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b7001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x2b8001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ba001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bc001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2be001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c0001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c2001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c4001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c6001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x2b9001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bb001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bd001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bf001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c1001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c3001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c5001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c7001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x2c8001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2ca001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2cc001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2ce001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x2d0001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d2001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d4001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d6001ed, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x01000005, 0x20000d3c, 0x00218000, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000067 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20000d3c, 0x00218000, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000049 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a007 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x00a02008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x00a02008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x00a02008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x00a02008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x00a02008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x00a02008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x00a02008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x00a02008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000051 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000036 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20000d3c, 0x00218000, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000021 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a007 },
+   { 0x00800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x00800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x00800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x00800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x00800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x00800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x00800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x00800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x00800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x00800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x00800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x00800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x00800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x00800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x00800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x00800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00a02001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00a02001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00a02001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00a02001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00a02001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00a02001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00a02001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00a02001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0414a009 },
+   { 0x00a02001, 0x29400229, 0x00ad0440, 0x00000000 },
+   { 0x00a02001, 0x29800229, 0x00ad0480, 0x00000000 },
+   { 0x00a02001, 0x29c00229, 0x00ad0580, 0x00000000 },
+   { 0x00a02001, 0x2a000229, 0x00ad05c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000041 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000039 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000019 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000007 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000003 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0414a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x00200001, 0x23e00021, 0x00450a40, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000d },
+   { 0x80a02040, 0x474045b1, 0x00b10a80, 0x00b20740 },
+   { 0x80a02040, 0x478045b1, 0x00b10ac0, 0x00b20780 },
+   { 0x80a02040, 0x47c045b1, 0x00b10b00, 0x00b207c0 },
+   { 0x80a02040, 0x480045b1, 0x00b10b40, 0x00b20800 },
+   { 0x80a02040, 0x484045b1, 0x00b10b80, 0x00b20840 },
+   { 0x80a02040, 0x488045b1, 0x00b10bc0, 0x00b20880 },
+   { 0x80a02040, 0x48c045b1, 0x00b10c00, 0x00b208c0 },
+   { 0x80a02040, 0x490045b1, 0x00b10c40, 0x00b20900 },
+   { 0x80a02040, 0x494045b1, 0x00b10c80, 0x00b20940 },
+   { 0x80a02040, 0x498045b1, 0x00b10cc0, 0x00b20980 },
+   { 0x80a02040, 0x49c045b1, 0x00b10d00, 0x00b209c0 },
+   { 0x80a02040, 0x4a0045b1, 0x00b10d40, 0x00b20a00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x80800040, 0x474045b1, 0x00b10a80, 0x00b20740 },
+   { 0x80800040, 0x476045b1, 0x00b10b80, 0x00b20760 },
+   { 0x80800040, 0x478045b1, 0x00b10aa0, 0x00b20780 },
+   { 0x80800040, 0x47a045b1, 0x00b10ba0, 0x00b207a0 },
+   { 0x80800040, 0x47c045b1, 0x00b10ac0, 0x00b207c0 },
+   { 0x80800040, 0x47e045b1, 0x00b10bc0, 0x00b207e0 },
+   { 0x80800040, 0x480045b1, 0x00b10ae0, 0x00b20800 },
+   { 0x80800040, 0x482045b1, 0x00b10be0, 0x00b20820 },
+   { 0x80800040, 0x484045b1, 0x00b10b00, 0x00b20840 },
+   { 0x80800040, 0x486045b1, 0x00b10c00, 0x00b20860 },
+   { 0x80800040, 0x488045b1, 0x00b10b20, 0x00b20880 },
+   { 0x80800040, 0x48a045b1, 0x00b10c20, 0x00b208a0 },
+   { 0x80800040, 0x48c045b1, 0x00b10b40, 0x00b208c0 },
+   { 0x80800040, 0x48e045b1, 0x00b10c40, 0x00b208e0 },
+   { 0x80800040, 0x490045b1, 0x00b10b60, 0x00b20900 },
+   { 0x80800040, 0x492045b1, 0x00b10c60, 0x00b20920 },
+   { 0x00800040, 0x2c8045ad, 0x00b10c80, 0x00b20940 },
+   { 0x00800040, 0x2ca045ad, 0x00b10ca0, 0x00b20960 },
+   { 0x00800040, 0x2cc045ad, 0x00b10cc0, 0x00b20980 },
+   { 0x00800040, 0x2ce045ad, 0x00b10ce0, 0x00b209a0 },
+   { 0x00800040, 0x2d0045ad, 0x00b10d00, 0x00b209c0 },
+   { 0x00800040, 0x2d2045ad, 0x00b10d20, 0x00b209e0 },
+   { 0x00800040, 0x2d4045ad, 0x00b10d40, 0x00b20a00 },
+   { 0x00800040, 0x2d6045ad, 0x00b10d60, 0x00b20a20 },
+   { 0x80800001, 0x494001b1, 0x00b10c80, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10ca0, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10cc0, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b10ce0, 0x00000000 },
+   { 0x80800001, 0x49c001b1, 0x00b10d00, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b10d20, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10d40, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10d60, 0x00000000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/lib_igd.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,558 @@
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000001e0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000001f8 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000002de },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000003b4 },
+   { 0x00800001, 0x2a8001ad, 0x00b10420, 0x00000000 },
+   { 0x00800001, 0x2aa001ad, 0x00b10440, 0x00000000 },
+   { 0x00800001, 0x2ac001ad, 0x00b10460, 0x00000000 },
+   { 0x00800001, 0x2ae001ad, 0x00b10480, 0x00000000 },
+   { 0x00800001, 0x2b0001ad, 0x00b104a0, 0x00000000 },
+   { 0x00800001, 0x2b2001ad, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x2b4001ad, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x2b6001ad, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x2b8001ad, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x2ba001ad, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x2bc001ad, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x2be001ad, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x2c0001ad, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x2c2001ad, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x2c4001ad, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x2c6001ad, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x2c8001ad, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x2ca001ad, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x2cc001ad, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x2ce001ad, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x2d0001ad, 0x00b106a0, 0x00000000 },
+   { 0x00800001, 0x2d2001ad, 0x00b106c0, 0x00000000 },
+   { 0x00800001, 0x2d4001ad, 0x00b106e0, 0x00000000 },
+   { 0x00800001, 0x2d6001ad, 0x00b10700, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x2a8001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2aa001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ac001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ae001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b0001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b2001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b4001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b6001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x2a9001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ab001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ad001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2af001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b1001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b3001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b5001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b7001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x2b8001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ba001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bc001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2be001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c0001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c2001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c4001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c6001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00600001, 0x2b9001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bb001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bd001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bf001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c1001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c3001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c5001ed, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c7001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2c8001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2ca001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2cc001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2ce001ed, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a4c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800001, 0x2d0001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d2001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d4001ed, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d6001ed, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x01000005, 0x20000d3c, 0x00218000, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000ce },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20000d3c, 0x00218000, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000092 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a007 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x00a02008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x00a02008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x00a02008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x00a02008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x00a02008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x00a02008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x00a02008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x00a02008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000a2 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000006c },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20000d3c, 0x00218000, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000042 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a007 },
+   { 0x00800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x00800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x00800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x00800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x00800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x00800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x00800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x00800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x00800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x00800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x00800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x00800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x00800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x00800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x00800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x00800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00a02001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00a02001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00a02001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00a02001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00a02001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00a02001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00a02001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00a02001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210410, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0248a009 },
+   { 0x00a02001, 0x29400229, 0x00ad0440, 0x00000000 },
+   { 0x00a02001, 0x29800229, 0x00ad0480, 0x00000000 },
+   { 0x00a02001, 0x29c00229, 0x00ad0580, 0x00000000 },
+   { 0x00a02001, 0x2a000229, 0x00ad05c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000082 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005a },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600040, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600040, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600040, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600040, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0501 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0521 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0541 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0561 },
+   { 0x00600040, 0x24004529, 0x008d0400, 0x008d0521 },
+   { 0x00600040, 0x24204529, 0x008d0420, 0x008d0541 },
+   { 0x00600040, 0x24404529, 0x008d0440, 0x008d0561 },
+   { 0x00600040, 0x24604529, 0x008d0460, 0x008d0581 },
+   { 0x00600040, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600040, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600040, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600040, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05a1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05c1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d05e1 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0601 },
+   { 0x00600040, 0x24804529, 0x008d0480, 0x008d05c1 },
+   { 0x00600040, 0x24a04529, 0x008d04a0, 0x008d05e1 },
+   { 0x00600040, 0x24c04529, 0x008d04c0, 0x008d0601 },
+   { 0x00600040, 0x24e04529, 0x008d04e0, 0x008d0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000072 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0501 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0521 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0541 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0561 },
+   { 0x00600042, 0x24804629, 0x008d0580, 0x008d0581 },
+   { 0x00600042, 0x24a04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600042, 0x24c04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600042, 0x24e04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000050 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00000002 },
+   { 0x01000005, 0x20002d3c, 0x00218000, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000e },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00600042, 0x24004629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x24204629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x24404629, 0x008d0540, 0x008d0560 },
+   { 0x00600042, 0x24604629, 0x008d0560, 0x008d0580 },
+   { 0x00600042, 0x24804629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x24a04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x24c04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x24e04629, 0x008d0600, 0x008d0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x02000005, 0x20002d3c, 0x00210e70, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0248a009 },
+   { 0x00802001, 0x24000229, 0x008d0500, 0x00000000 },
+   { 0x00802001, 0x24400229, 0x008d0540, 0x00000000 },
+   { 0x00802001, 0x24800229, 0x008d0600, 0x00000000 },
+   { 0x00802001, 0x24c00229, 0x008d0640, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x00200001, 0x23e00021, 0x00450a40, 0x00000000 },
+   { 0x02000005, 0x20002e3c, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x80a02040, 0x474045b1, 0x00b10a80, 0x00b20740 },
+   { 0x80a02040, 0x478045b1, 0x00b10ac0, 0x00b20780 },
+   { 0x80a02040, 0x47c045b1, 0x00b10b00, 0x00b207c0 },
+   { 0x80a02040, 0x480045b1, 0x00b10b40, 0x00b20800 },
+   { 0x80a02040, 0x484045b1, 0x00b10b80, 0x00b20840 },
+   { 0x80a02040, 0x488045b1, 0x00b10bc0, 0x00b20880 },
+   { 0x80a02040, 0x48c045b1, 0x00b10c00, 0x00b208c0 },
+   { 0x80a02040, 0x490045b1, 0x00b10c40, 0x00b20900 },
+   { 0x80a02040, 0x494045b1, 0x00b10c80, 0x00b20940 },
+   { 0x80a02040, 0x498045b1, 0x00b10cc0, 0x00b20980 },
+   { 0x80a02040, 0x49c045b1, 0x00b10d00, 0x00b209c0 },
+   { 0x80a02040, 0x4a0045b1, 0x00b10d40, 0x00b20a00 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x80800040, 0x474045b1, 0x00b10a80, 0x00b20740 },
+   { 0x80800040, 0x476045b1, 0x00b10b80, 0x00b20760 },
+   { 0x80800040, 0x478045b1, 0x00b10aa0, 0x00b20780 },
+   { 0x80800040, 0x47a045b1, 0x00b10ba0, 0x00b207a0 },
+   { 0x80800040, 0x47c045b1, 0x00b10ac0, 0x00b207c0 },
+   { 0x80800040, 0x47e045b1, 0x00b10bc0, 0x00b207e0 },
+   { 0x80800040, 0x480045b1, 0x00b10ae0, 0x00b20800 },
+   { 0x80800040, 0x482045b1, 0x00b10be0, 0x00b20820 },
+   { 0x80800040, 0x484045b1, 0x00b10b00, 0x00b20840 },
+   { 0x80800040, 0x486045b1, 0x00b10c00, 0x00b20860 },
+   { 0x80800040, 0x488045b1, 0x00b10b20, 0x00b20880 },
+   { 0x80800040, 0x48a045b1, 0x00b10c20, 0x00b208a0 },
+   { 0x80800040, 0x48c045b1, 0x00b10b40, 0x00b208c0 },
+   { 0x80800040, 0x48e045b1, 0x00b10c40, 0x00b208e0 },
+   { 0x80800040, 0x490045b1, 0x00b10b60, 0x00b20900 },
+   { 0x80800040, 0x492045b1, 0x00b10c60, 0x00b20920 },
+   { 0x00800040, 0x2c8045ad, 0x00b10c80, 0x00b20940 },
+   { 0x00800040, 0x2ca045ad, 0x00b10ca0, 0x00b20960 },
+   { 0x00800040, 0x2cc045ad, 0x00b10cc0, 0x00b20980 },
+   { 0x00800040, 0x2ce045ad, 0x00b10ce0, 0x00b209a0 },
+   { 0x00800040, 0x2d0045ad, 0x00b10d00, 0x00b209c0 },
+   { 0x00800040, 0x2d2045ad, 0x00b10d20, 0x00b209e0 },
+   { 0x00800040, 0x2d4045ad, 0x00b10d40, 0x00b20a00 },
+   { 0x00800040, 0x2d6045ad, 0x00b10d60, 0x00b20a20 },
+   { 0x80800001, 0x494001b1, 0x00b10c80, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10ca0, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10cc0, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b10ce0, 0x00000000 },
+   { 0x80800001, 0x49c001b1, 0x00b10d00, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b10d20, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10d40, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10d60, 0x00000000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,121 @@
+
+INTEL_G4A = dual_prime_igd.g4a          \
+        field_backward_igd.g4a          \
+        field_f_b_igd.g4a               \
+        field_forward_igd.g4a           \
+        frame_backward_igd.g4a          \
+        frame_f_b_igd.g4a               \
+        frame_forward_igd.g4a           \
+        dual_prime.g4a                  \
+        field_backward.g4a              \
+        field_f_b.g4a                   \
+        field_forward.g4a               \
+        frame_backward.g4a              \
+        frame_f_b.g4a                   \
+        frame_forward.g4a               \
+		lib_igd.g4a						\
+        ipicture.g4a                    \
+        ipicture_igd.g4a                \
+        null.g4a
+
+INTEL_G4I = addidct.g4i                          \
+        addidct_igd.g4i                          \
+        block_clear.g4i                          \
+        read_frame_x0y0_y.g4i                    \
+        read_frame_x0y1_y.g4i                    \
+        read_frame_x1y0_y.g4i                    \
+        read_frame_x1y1_y.g4i                    \
+        read_frame_x0y0_uv.g4i                   \
+        read_frame_x0y1_uv.g4i                   \
+        read_frame_x1y0_uv.g4i                   \
+        read_frame_x1y1_uv.g4i                   \
+        read_frame_x0y0_y_igd.g4i                \
+        read_frame_x0y1_y_igd.g4i                \
+        read_frame_x1y0_y_igd.g4i                \
+        read_frame_x1y1_y_igd.g4i                \
+        read_frame_x0y0_uv_igd.g4i               \
+        read_frame_x0y1_uv_igd.g4i               \
+        read_frame_x1y0_uv_igd.g4i               \
+        read_frame_x1y1_uv_igd.g4i               \
+        motion_frame_y.g4i                       \
+        motion_frame_uv.g4i                      \
+        read_field_x0y0_y.g4i                    \
+        read_field_x0y1_y.g4i                    \
+        read_field_x1y0_y.g4i                    \
+        read_field_x1y1_y.g4i                    \
+        read_field_x0y0_uv.g4i                   \
+        read_field_x0y1_uv.g4i                   \
+        read_field_x1y0_uv.g4i                   \
+        read_field_x1y1_uv.g4i                   \
+        read_field_x0y0_y_igd.g4i                \
+        read_field_x0y1_y_igd.g4i                \
+        read_field_x1y0_y_igd.g4i                \
+        read_field_x1y1_y_igd.g4i                \
+        read_field_x0y0_uv_igd.g4i               \
+        read_field_x0y1_uv_igd.g4i               \
+        read_field_x1y0_uv_igd.g4i               \
+        read_field_x1y1_uv_igd.g4i               \
+        motion_field_y.g4i                       \
+        motion_field_uv.g4i                      \
+        motion_field_uv_igd.g4i                  \
+        motion_field_y_igd.g4i                   \
+        motion_frame_uv_igd.g4i                  \
+        motion_frame_y_igd.g4i
+
+INTEL_G4B = dual_prime.g4b          \
+        field_backward.g4b          \
+        field_f_b.g4b               \
+        field_forward.g4b           \
+        frame_backward.g4b          \
+        frame_f_b.g4b               \
+        frame_forward.g4b           \
+        dual_prime_igd.g4b          \
+        field_backward_igd.g4b      \
+        field_f_b_igd.g4b           \
+        field_forward_igd.g4b       \
+        frame_backward_igd.g4b      \
+        frame_f_b_igd.g4b           \
+        frame_forward_igd.g4b       \
+        ipicture.g4b                \
+        ipicture_igd.g4b            \
+		lib_igd.g4b					\
+        null.g4b
+
+INTEL_G4B_GEN5 = dual_prime.g4b.gen5     \
+        field_backward.g4b.gen5          \
+        field_f_b.g4b.gen5               \
+        field_forward.g4b.gen5           \
+        frame_backward.g4b.gen5          \
+        frame_f_b.g4b.gen5               \
+        frame_forward.g4b.gen5           \
+        dual_prime_igd.g4b.gen5          \
+        field_backward_igd.g4b.gen5      \
+        field_f_b_igd.g4b.gen5           \
+        field_forward_igd.g4b.gen5       \
+        frame_backward_igd.g4b.gen5      \
+        frame_f_b_igd.g4b.gen5           \
+        frame_forward_igd.g4b.gen5       \
+        ipicture.g4b.gen5                \
+        ipicture_igd.g4b.gen5            \
+        lib_igd.g4b.gen5					\
+        null.g4b.gen5
+
+EXTRA_DIST = $(INTEL_G4A)    \
+        $(INTEL_G4I)         \
+        $(INTEL_G4B)         \
+        $(INTEL_G4B_GEN5)
+
+if HAVE_GEN4ASM
+
+SUFFIXES = .g4a .g4b
+.g4a.g4b:
+	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
+
+$(INTEL_G4B): $(INTEL_G4I)
+
+BUILT_SOURCES= $(INTEL_G4B)
+
+clean-local:
+	-rm -f $(INTEL_G4B)
+	-rm -f $(INTEL_G4B_GEN5)
+endif
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,496 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/xvmc/shader/mc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRIVER_NAME = @DRIVER_NAME@
+DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
+DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
+DRM_CFLAGS = @DRM_CFLAGS@
+DRM_LIBS = @DRM_LIBS@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
+GREP = @GREP@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+INTEL_G4A = dual_prime_igd.g4a          \
+        field_backward_igd.g4a          \
+        field_f_b_igd.g4a               \
+        field_forward_igd.g4a           \
+        frame_backward_igd.g4a          \
+        frame_f_b_igd.g4a               \
+        frame_forward_igd.g4a           \
+        dual_prime.g4a                  \
+        field_backward.g4a              \
+        field_f_b.g4a                   \
+        field_forward.g4a               \
+        frame_backward.g4a              \
+        frame_f_b.g4a                   \
+        frame_forward.g4a               \
+		lib_igd.g4a						\
+        ipicture.g4a                    \
+        ipicture_igd.g4a                \
+        null.g4a
+
+INTEL_G4I = addidct.g4i                          \
+        addidct_igd.g4i                          \
+        block_clear.g4i                          \
+        read_frame_x0y0_y.g4i                    \
+        read_frame_x0y1_y.g4i                    \
+        read_frame_x1y0_y.g4i                    \
+        read_frame_x1y1_y.g4i                    \
+        read_frame_x0y0_uv.g4i                   \
+        read_frame_x0y1_uv.g4i                   \
+        read_frame_x1y0_uv.g4i                   \
+        read_frame_x1y1_uv.g4i                   \
+        read_frame_x0y0_y_igd.g4i                \
+        read_frame_x0y1_y_igd.g4i                \
+        read_frame_x1y0_y_igd.g4i                \
+        read_frame_x1y1_y_igd.g4i                \
+        read_frame_x0y0_uv_igd.g4i               \
+        read_frame_x0y1_uv_igd.g4i               \
+        read_frame_x1y0_uv_igd.g4i               \
+        read_frame_x1y1_uv_igd.g4i               \
+        motion_frame_y.g4i                       \
+        motion_frame_uv.g4i                      \
+        read_field_x0y0_y.g4i                    \
+        read_field_x0y1_y.g4i                    \
+        read_field_x1y0_y.g4i                    \
+        read_field_x1y1_y.g4i                    \
+        read_field_x0y0_uv.g4i                   \
+        read_field_x0y1_uv.g4i                   \
+        read_field_x1y0_uv.g4i                   \
+        read_field_x1y1_uv.g4i                   \
+        read_field_x0y0_y_igd.g4i                \
+        read_field_x0y1_y_igd.g4i                \
+        read_field_x1y0_y_igd.g4i                \
+        read_field_x1y1_y_igd.g4i                \
+        read_field_x0y0_uv_igd.g4i               \
+        read_field_x0y1_uv_igd.g4i               \
+        read_field_x1y0_uv_igd.g4i               \
+        read_field_x1y1_uv_igd.g4i               \
+        motion_field_y.g4i                       \
+        motion_field_uv.g4i                      \
+        motion_field_uv_igd.g4i                  \
+        motion_field_y_igd.g4i                   \
+        motion_frame_uv_igd.g4i                  \
+        motion_frame_y_igd.g4i
+
+INTEL_G4B = dual_prime.g4b          \
+        field_backward.g4b          \
+        field_f_b.g4b               \
+        field_forward.g4b           \
+        frame_backward.g4b          \
+        frame_f_b.g4b               \
+        frame_forward.g4b           \
+        dual_prime_igd.g4b          \
+        field_backward_igd.g4b      \
+        field_f_b_igd.g4b           \
+        field_forward_igd.g4b       \
+        frame_backward_igd.g4b      \
+        frame_f_b_igd.g4b           \
+        frame_forward_igd.g4b       \
+        ipicture.g4b                \
+        ipicture_igd.g4b            \
+		lib_igd.g4b					\
+        null.g4b
+
+INTEL_G4B_GEN5 = dual_prime.g4b.gen5     \
+        field_backward.g4b.gen5          \
+        field_f_b.g4b.gen5               \
+        field_forward.g4b.gen5           \
+        frame_backward.g4b.gen5          \
+        frame_f_b.g4b.gen5               \
+        frame_forward.g4b.gen5           \
+        dual_prime_igd.g4b.gen5          \
+        field_backward_igd.g4b.gen5      \
+        field_f_b_igd.g4b.gen5           \
+        field_forward_igd.g4b.gen5       \
+        frame_backward_igd.g4b.gen5      \
+        frame_f_b_igd.g4b.gen5           \
+        frame_forward_igd.g4b.gen5       \
+        ipicture.g4b.gen5                \
+        ipicture_igd.g4b.gen5            \
+        lib_igd.g4b.gen5					\
+        null.g4b.gen5
+
+EXTRA_DIST = $(INTEL_G4A)    \
+        $(INTEL_G4I)         \
+        $(INTEL_G4B)         \
+        $(INTEL_G4B_GEN5)
+
+@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
+@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .g4a .g4b
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/xvmc/shader/mc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  src/xvmc/shader/mc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+@HAVE_GEN4ASM_FALSE@clean-local:
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-info-am
+
+@HAVE_GEN4ASM_TRUE@.g4a.g4b:
+@HAVE_GEN4ASM_TRUE@	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
+
+@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
+
+@HAVE_GEN4ASM_TRUE@clean-local:
+@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B)
+@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B_GEN5)
+# 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 -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+       and.z (1) null mv1<1,1,1>UW 2UW {align1};       
+       (f0) jmpi L1;
+       and.z (1) null mv2<1,1,1>UW 2UW {align1};       
+       (f0) jmpi L2;
+       include(`read_field_x1y1_uv.g4i')
+       jmpi L5;
+L2:
+       include(`read_field_x1y0_uv.g4i')
+       jmpi L5;
+L1:
+       and.z (1) null mv2<1,1,1>UW 2UW {align1};       
+       (f0) jmpi L4;
+       include(`read_field_x0y1_uv.g4i')
+       jmpi L5;
+L4:
+       include(`read_field_x0y0_uv.g4i')
+L5:
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ */
+       and.z (1) null g[a0.0]<1,1,1>UW 2UW {align1};       
+       (f0) jmpi L1;
+       add (1) a0.0<1>UD a0.0<1,1,1>UD 0x2UD {align1};
+       and.z (1) null g[a0.0]<1,1,1>UW 2UW {align1};       
+       (f0) jmpi L2;
+       include(`read_field_x1y1_uv_igd.g4i')
+       jmpi L5;
+L2:
+       include(`read_field_x1y0_uv_igd.g4i')
+       jmpi L5;
+L1:
+       add (1) a0.0<1>UD a0.0<1,1,1>UD 0x2UD {align1};
+       and.z (1) null g[a0.0]<1,1,1>UW 2UW {align1};       
+       (f0) jmpi L4;
+       include(`read_field_x0y1_uv_igd.g4i')
+       jmpi L5;
+L4:
+       include(`read_field_x0y0_uv_igd.g4i')
+L5:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+	and.z (1) null mv1<1,1,1>UW 1UW {align1};	
+	(f0) jmpi L1;
+	and.z (1) null mv2<1,1,1>UW 1UW {align1};	
+	(f0) jmpi L2;
+	include(`read_field_x1y1_y.g4i')
+	jmpi L5;
+L2:
+	include(`read_field_x1y0_y.g4i')
+	jmpi L5;
+L1:
+	and.z (1) null mv2<1,1,1>UW 1UW {align1};	
+	(f0) jmpi L4;
+	include(`read_field_x0y1_y.g4i')
+	jmpi L5;
+L4:
+	include(`read_field_x0y0_y.g4i')
+L5:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_field_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ */
+	and.z (1) null g[a0.0]<1,1,1>UW 1UW {align1};	
+	(f0) jmpi L1;
+	add (1) a0.0<1>UD a0.0<1,1,1>UD 0x2UD {align1};
+	and.z (1) null g[a0.0]<1,1,1>UW 1UW {align1};	
+	(f0) jmpi L2;
+	include(`read_field_x1y1_y_igd.g4i')
+	jmpi L5;
+L2:
+	include(`read_field_x1y0_y_igd.g4i')
+	jmpi L5;
+L1:
+	add (1) a0.0<1>UD a0.0<1,1,1>UD 0x2UD {align1};
+	and.z (1) null g[a0.0]<1,1,1>UW 1UW {align1};	
+	(f0) jmpi L4;
+	include(`read_field_x0y1_y_igd.g4i')
+	jmpi L5;
+L4:
+	include(`read_field_x0y0_y_igd.g4i')
+L5:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ */  
+
+	include(`read_frame_x0y0_uv.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ */  
+	
+	include(`read_frame_x0y0_uv_igd.g4i')
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ */  
+ 
+/* if (motion_vect.x & 1) {
+ *   if (motion_vect.y & 1)
+ *	 half_pixel in x and y;
+ *   else
+ *	 half_pixel in x;
+ * } else {
+ *	if (motion_vect.y & 1) 
+ *	  half_pixel y;
+ *	else
+ *	  full_pixel_read;	
+ * }	 
+ */
+
+	and.z (1) null mv1<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL1;
+	and.z (1) null mv2<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL2;
+	include(`read_frame_x1y1_y.g4i') 
+	jmpi LL5;
+LL2: 
+	include(`read_frame_x1y0_y.g4i') 
+	jmpi LL5;
+LL1: 
+	and.z (1) null mv2<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL4;
+	include(`read_frame_x0y1_y.g4i')
+	jmpi LL5;
+LL4:
+	include(`read_frame_x0y0_y.g4i')
+LL5:
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/motion_frame_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ */  
+ 
+/* if (motion_vect.x & 1) {
+ *   if (motion_vect.y & 1)
+ *	 half_pixel in x and y;
+ *   else
+ *	 half_pixel in x;
+ * } else {
+ *	if (motion_vect.y & 1) 
+ *	  half_pixel y;
+ *	else
+ *	  full_pixel_read;	
+ * }	 
+ */
+	and.z (1) null g[a0.0]<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL1;
+	add (1) a0.0<1>UD a0.0<1,1,1>UD 0x2UD {align1};
+	and.z (1) null g[a0.0]<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL2;
+	include(`read_frame_x1y1_y_igd.g4i') 
+	jmpi LL5;
+LL2: 
+	include(`read_frame_x1y0_y_igd.g4i') 
+	jmpi LL5;
+LL1: 
+	add (1) a0.0<1>UD a0.0<1,1,1>UD 0x2UD {align1};
+	and.z (1) null g[a0.0]<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL4;
+	include(`read_frame_x0y1_y_igd.g4i')
+	jmpi LL5;
+LL4:
+	include(`read_frame_x0y0_y_igd.g4i')
+LL5:
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *
+ */
+mov (8) g3.0<1>UD g1.0<8,8,1>UD {align1};
+
+mov (16) g8.0<1>UD 0xFFFFFFFFUD {align1 compr};
+
+mov(1) g1.8<1>UD 0x0070007UD  { align1 };
+mov (16) m1<1>UD g8.0<8,8,1>UD {align1 compr};
+
+/*Write 8x8 block to (x,y)*/
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(0, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+add (1) g1.0<1>UD g3.0<1,1,1>UD 0x8UD {align1};
+/*Write 8x8 block to (x+8,y)*/
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(0, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+add (1) g1.4<1>UD g3.4<1,1,1>UD 0x8UD {align1};
+/*Write 8x8 block to (x+8,y+8)*/
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(0, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+mov (1) g1.0<1>UD g3.0<1,1,1>UD {align1};
+/*Write 8x8 block to (x,y+8)*/
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(0, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+/*Fill U buffer & V buffer with 0x7F*/
+mov (16) m1<1>UD 0x7f7f7f7fUD {align1 compr};
+shr (1) g1.0<1>UD g3.0<1,1,1>UD 1D {align1};
+shr (1) g1.4<1>UD g3.4<1,1,1>UD 1D {align1};
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+send (16) 0 acc0<1>UW g1<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,17 @@
+   { 0x00600001, 0x20600021, 0x008d0020, 0x00000000 },
+   { 0x00802001, 0x21000061, 0x00000000, 0xffffffff },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00802001, 0x20200022, 0x008d0100, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302000 },
+   { 0x00000040, 0x20200c21, 0x00210060, 0x00000008 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302000 },
+   { 0x00000040, 0x20240c21, 0x00210064, 0x00000008 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302000 },
+   { 0x00000001, 0x20200021, 0x00210060, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302000 },
+   { 0x00802001, 0x20200062, 0x00000000, 0x7f7f7f7f },
+   { 0x00000008, 0x20201c21, 0x00210060, 0x00000001 },
+   { 0x00000008, 0x20241c21, 0x00210064, 0x00000001 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/null.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,17 @@
+   { 0x00600001, 0x20600021, 0x008d0020, 0x00000000 },
+   { 0x00802001, 0x21000061, 0x00000000, 0xffffffff },
+   { 0x00000001, 0x20280061, 0x00000000, 0x00070007 },
+   { 0x00802001, 0x20200022, 0x008d0100, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082000 },
+   { 0x00000040, 0x20200c21, 0x00210060, 0x00000008 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082000 },
+   { 0x00000040, 0x20240c21, 0x00210064, 0x00000008 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082000 },
+   { 0x00000001, 0x20200021, 0x00210060, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082000 },
+   { 0x00802001, 0x20200062, 0x00000000, 0x7f7f7f7f },
+   { 0x00000008, 0x20201c21, 0x00210060, 0x00000001 },
+   { 0x00000008, 0x20241c21, 0x00210064, 0x00000001 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x508d0020, 0x06082001 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x7000FUD {align1}; // 8*16/32=4
+send (16) 0 g86.0<1>UW g115<16,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g91.0<1>UW g115<16,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+mov (16) g78.0<1>UW g86.0<16,8,1>UB {align1};
+mov (16) g79.0<1>UW g87.0<16,8,1>UB {align1};
+mov (16) g80.0<1>UW g88.0<16,8,1>UB {align1};
+mov (16) g81.0<1>UW g89.0<16,8,1>UB {align1};
+mov (16) g82.0<1>UW g91.0<16,8,1>UB {align1};
+mov (16) g83.0<1>UW g92.0<16,8,1>UB {align1};
+mov (16) g84.0<1>UW g93.0<16,8,1>UB {align1};
+mov (16) g85.0<1>UW g94.0<16,8,1>UB {align1};
+jmpi out;
+
+mov (16) g78.0<1>UW g86.1<16,8,1>UB {align1};
+mov (16) g79.0<1>UW g87.1<16,8,1>UB {align1};
+mov (16) g80.0<1>UW g88.1<16,8,1>UB {align1};
+mov (16) g81.0<1>UW g89.1<16,8,1>UB {align1};
+mov (16) g82.0<1>UW g91.1<16,8,1>UB {align1};
+mov (16) g83.0<1>UW g92.1<16,8,1>UB {align1};
+mov (16) g84.0<1>UW g93.1<16,8,1>UB {align1};
+mov (16) g85.0<1>UW g94.1<16,8,1>UB {align1};
+jmpi out;
+
+mov (16) g78.0<1>UW g86.2<16,8,1>UB {align1};
+mov (16) g79.0<1>UW g87.2<16,8,1>UB {align1};
+mov (16) g80.0<1>UW g88.2<16,8,1>UB {align1};
+mov (16) g81.0<1>UW g89.2<16,8,1>UB {align1};
+mov (16) g82.0<1>UW g91.2<16,8,1>UB {align1};
+mov (16) g83.0<1>UW g92.2<16,8,1>UB {align1};
+mov (16) g84.0<1>UW g93.2<16,8,1>UB {align1};
+mov (16) g85.0<1>UW g94.2<16,8,1>UB {align1};
+jmpi out;
+
+mov (16) g78.0<1>UW g86.3<16,8,1>UB {align1};
+mov (16) g79.0<1>UW g87.3<16,8,1>UB {align1};
+mov (16) g80.0<1>UW g88.3<16,8,1>UB {align1};
+mov (16) g81.0<1>UW g89.3<16,8,1>UB {align1};
+mov (16) g82.0<1>UW g91.3<16,8,1>UB {align1};
+mov (16) g83.0<1>UW g92.3<16,8,1>UB {align1};
+mov (16) g84.0<1>UW g93.3<16,8,1>UB {align1};
+mov (16) g85.0<1>UW g94.3<16,8,1>UB {align1};
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,30 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   
+*/
+
+mov (1) g115.8<1>UD 0x07000FUD {align1};
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(5,2,0,2) mlen 1 rlen 4 {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(6,2,0,2) mlen 1 rlen 4 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(8,2,0,2) mlen 1 rlen 4 {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(9,2,0,2) mlen 1 rlen 4 {align1};
+
+put_data:
+mov (16) g32.0<1>UW g40.0<8,8,1>UB {align1 compr};
+mov (16) g34.0<1>UW g42.0<8,8,1>UB {align1 compr};
+
+mov (16) g36.0<1>UW g48.0<8,8,1>UB {align1 compr};
+mov (16) g38.0<1>UW g50.0<8,8,1>UB {align1 compr};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g78.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g80.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g82.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g84.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g86.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+mov (16) g96.0<1>UW g78.0<16,16,1>UB {align1};
+mov (16) g97.0<1>UW g80.0<16,16,1>UB {align1};
+mov (16) g98.0<1>UW g82.0<16,16,1>UB {align1};
+mov (16) g99.0<1>UW g84.0<16,16,1>UB {align1};
+mov (16) g100.0<1>UW g86.0<16,16,1>UB {align1};
+mov (16) g101.0<1>UW g88.0<16,16,1>UB {align1};
+mov (16) g102.0<1>UW g90.0<16,16,1>UB {align1};
+mov (16) g103.0<1>UW g92.0<16,16,1>UB {align1};
+jmpi out;
+
+mov (16) g96.0<1>UW g78.1<16,16,1>UB {align1};
+mov (16) g97.0<1>UW g80.1<16,16,1>UB {align1};
+mov (16) g98.0<1>UW g82.1<16,16,1>UB {align1};
+mov (16) g99.0<1>UW g84.1<16,16,1>UB {align1};
+mov (16) g100.0<1>UW g86.1<16,16,1>UB {align1};
+mov (16) g101.0<1>UW g88.1<16,16,1>UB {align1};
+mov (16) g102.0<1>UW g90.1<16,16,1>UB {align1};
+mov (16) g103.0<1>UW g92.1<16,16,1>UB {align1};
+jmpi out;
+
+mov (16) g96.0<1>UW g78.2<16,16,1>UB {align1};
+mov (16) g97.0<1>UW g80.2<16,16,1>UB {align1};
+mov (16) g98.0<1>UW g82.2<16,16,1>UB {align1};
+mov (16) g99.0<1>UW g84.2<16,16,1>UB {align1};
+mov (16) g100.0<1>UW g86.2<16,16,1>UB {align1};
+mov (16) g101.0<1>UW g88.2<16,16,1>UB {align1};
+mov (16) g102.0<1>UW g90.2<16,16,1>UB {align1};
+mov (16) g103.0<1>UW g92.2<16,16,1>UB {align1};
+jmpi out;
+
+mov (16) g96.0<1>UW g78.3<16,16,1>UB {align1};
+mov (16) g97.0<1>UW g80.3<16,16,1>UB {align1};
+mov (16) g98.0<1>UW g82.3<16,16,1>UB {align1};
+mov (16) g99.0<1>UW g84.3<16,16,1>UB {align1};
+mov (16) g100.0<1>UW g86.3<16,16,1>UB {align1};
+mov (16) g101.0<1>UW g88.3<16,16,1>UB {align1};
+mov (16) g102.0<1>UW g90.3<16,16,1>UB {align1};
+mov (16) g103.0<1>UW g92.3<16,16,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y0_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,35 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g84~g107:IDCT data
+   g115:   message descriptor for reading reference data   
+*/
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+
+put_data:
+mov (16) g32.0<1>UW g40.0<16,16,1>UB {align1};
+mov (16) g33.0<1>UW g42.0<16,16,1>UB {align1};
+mov (16) g34.0<1>UW g44.0<16,16,1>UB {align1};
+mov (16) g35.0<1>UW g46.0<16,16,1>UB {align1};
+mov (16) g36.0<1>UW g48.0<16,16,1>UB {align1};
+mov (16) g37.0<1>UW g50.0<16,16,1>UB {align1};
+mov (16) g38.0<1>UW g52.0<16,16,1>UB {align1};
+mov (16) g39.0<1>UW g54.0<16,16,1>UB {align1};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x07000FUD {align1}; // 8*16/32=4
+send (16) 0 g86.0<1>UW g115<16,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g91.0<1>UW g115<16,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+mov (1) g115.8<1>UD 0xFUD {align1};
+send (16) 0 g90.0<1>UW g115<16,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 1 {align1};
+send (16) 0 g95.0<1>UW g115<16,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 1 {align1};
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g78.0<1>UW g86.0<16,8,1>UB g87.0<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.0<16,8,1>UB g88.0<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.0<16,8,1>UB g89.0<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.0<16,8,1>UB g90.0<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.0<16,8,1>UB g92.0<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.0<16,8,1>UB g93.0<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.0<16,8,1>UB g94.0<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.0<16,8,1>UB g95.0<16,8,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g78.0<1>UW g86.1<16,8,1>UB g87.1<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.1<16,8,1>UB g88.1<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.1<16,8,1>UB g89.1<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.1<16,8,1>UB g90.1<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.1<16,8,1>UB g92.1<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.1<16,8,1>UB g93.1<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.1<16,8,1>UB g94.1<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.1<16,8,1>UB g95.1<16,8,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g78.0<1>UW g86.2<16,8,1>UB g87.2<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.2<16,8,1>UB g88.2<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.2<16,8,1>UB g89.2<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.2<16,8,1>UB g90.2<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.2<16,8,1>UB g92.2<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.2<16,8,1>UB g93.2<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.2<16,8,1>UB g94.2<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.2<16,8,1>UB g95.2<16,8,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g78.0<1>UW g86.3<16,8,1>UB g86.3<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.3<16,8,1>UB g87.3<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.3<16,8,1>UB g88.3<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.3<16,8,1>UB g89.3<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.3<16,8,1>UB g91.3<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.3<16,8,1>UB g92.3<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.3<16,8,1>UB g93.3<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.3<16,8,1>UB g94.3<16,8,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,42 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   
+*/
+
+mov (1) g115.8<1>UD 0x07000FUD {align1}; 
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(5, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g45.0<1>UW g115<8,8,1>UW read(6, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+mov (1) g115.8<1>UD 0xFUD {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(5, 2, 0, 2) mlen 1 rlen 1 {align1};//U
+send (16) 0 g49.0<1>UW g115<8,8,1>UW read(6, 2, 0, 2) mlen 1 rlen 1 {align1};//V
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(8, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g45.0<1>UW g115<8,8,1>UW read(9, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+mov (1) g115.8<1>UD 0xFUD {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(8, 2, 0, 2) mlen 1 rlen 1 {align1};//U
+send (16) 0 g49.0<1>UW g115<8,8,1>UW read(9, 2, 0, 2) mlen 1 rlen 1 {align1};//V
+
+put_data:
+avg (8) g32.0<1>UW g40.0<8,8,1>UB g41.0<8,8,1>UB {align1};
+avg (8) g33.0<1>UW g41.0<8,8,1>UB g42.0<8,8,1>UB {align1};
+avg (8) g34.0<1>UW g42.0<8,8,1>UB g43.0<8,8,1>UB {align1};
+avg (8) g35.0<1>UW g43.0<8,8,1>UB g44.0<8,8,1>UB {align1};
+
+avg (8) g36.0<1>UW g45.0<8,8,1>UB g46.0<8,8,1>UB {align1};
+avg (8) g37.0<1>UW g46.0<8,8,1>UB g47.0<8,8,1>UB {align1};
+avg (8) g38.0<1>UW g47.0<8,8,1>UB g48.0<8,8,1>UB {align1};
+avg (8) g39.0<1>UW g48.0<8,8,1>UB g49.0<8,8,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g78.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g80.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g82.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g84.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g86.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g94.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g96.0<1>UW g78.0<16,16,1>UB g80.0<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.0<16,16,1>UB g82.0<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.0<16,16,1>UB g84.0<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.0<16,16,1>UB g86.0<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.0<16,16,1>UB g88.0<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.0<16,16,1>UB g90.0<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.0<16,16,1>UB g92.0<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.0<16,16,1>UB g94.0<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g96.0<1>UW g78.1<16,16,1>UB g80.1<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.1<16,16,1>UB g82.1<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.1<16,16,1>UB g84.1<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.1<16,16,1>UB g86.1<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.1<16,16,1>UB g88.1<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.1<16,16,1>UB g90.1<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.1<16,16,1>UB g92.1<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.1<16,16,1>UB g94.1<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g96.0<1>UW g78.2<16,16,1>UB g80.2<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.2<16,16,1>UB g82.2<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.2<16,16,1>UB g84.2<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.2<16,16,1>UB g86.2<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.2<16,16,1>UB g88.2<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.2<16,16,1>UB g90.2<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.2<16,16,1>UB g92.2<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.2<16,16,1>UB g94.2<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g96.0<1>UW g78.3<16,16,1>UB g80.3<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.3<16,16,1>UB g82.3<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.3<16,16,1>UB g84.3<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.3<16,16,1>UB g86.3<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.3<16,16,1>UB g88.3<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.3<16,16,1>UB g90.3<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.3<16,16,1>UB g92.3<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.3<16,16,1>UB g94.3<16,16,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x0y1_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,42 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   
+*/
+
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g56.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 1 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g56.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 1 {align1};
+
+put_data:
+avg (16) g32.0<1>UW g40.0<16,16,1>UB g42.0<16,16,1>UB {align1};
+avg (16) g33.0<1>UW g42.0<16,16,1>UB g44.0<16,16,1>UB {align1};
+avg (16) g34.0<1>UW g44.0<16,16,1>UB g46.0<16,16,1>UB {align1};
+avg (16) g35.0<1>UW g46.0<16,16,1>UB g48.0<16,16,1>UB {align1};
+avg (16) g36.0<1>UW g48.0<16,16,1>UB g50.0<16,16,1>UB {align1};
+avg (16) g37.0<1>UW g50.0<16,16,1>UB g52.0<16,16,1>UB {align1};
+avg (16) g38.0<1>UW g52.0<16,16,1>UB g54.0<16,16,1>UB {align1};
+avg (16) g39.0<1>UW g54.0<16,16,1>UB g56.0<16,16,1>UB {align1};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x07000FUD {align1}; // 8*16/32=4
+send (16) 0 g86.0<1>UW g115<16,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g91.0<1>UW g115<16,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g78.0<1>UW g86.0<16,8,1>UB g86.1<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.0<16,8,1>UB g87.1<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.0<16,8,1>UB g88.1<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.0<16,8,1>UB g89.1<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.0<16,8,1>UB g91.1<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.0<16,8,1>UB g92.1<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.0<16,8,1>UB g93.1<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.0<16,8,1>UB g94.1<16,8,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g78.0<1>UW g86.1<16,8,1>UB g86.2<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.1<16,8,1>UB g87.2<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.1<16,8,1>UB g88.2<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.1<16,8,1>UB g89.2<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.1<16,8,1>UB g91.2<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.1<16,8,1>UB g92.2<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.1<16,8,1>UB g93.2<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.1<16,8,1>UB g94.2<16,8,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g78.0<1>UW g86.2<16,8,1>UB g86.3<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.2<16,8,1>UB g87.3<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.2<16,8,1>UB g88.3<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.2<16,8,1>UB g89.3<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.2<16,8,1>UB g91.3<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.2<16,8,1>UB g92.3<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.2<16,8,1>UB g93.3<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.2<16,8,1>UB g94.3<16,8,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g78.0<1>UW g86.3<16,8,1>UB g86.4<16,8,1>UB {align1};
+avg.sat (16) g79.0<1>UW g87.3<16,8,1>UB g87.4<16,8,1>UB {align1};
+avg.sat (16) g80.0<1>UW g88.3<16,8,1>UB g88.4<16,8,1>UB {align1};
+avg.sat (16) g81.0<1>UW g89.3<16,8,1>UB g89.4<16,8,1>UB {align1};
+avg.sat (16) g82.0<1>UW g91.3<16,8,1>UB g91.4<16,8,1>UB {align1};
+avg.sat (16) g83.0<1>UW g92.3<16,8,1>UB g92.4<16,8,1>UB {align1};
+avg.sat (16) g84.0<1>UW g93.3<16,8,1>UB g93.4<16,8,1>UB {align1};
+avg.sat (16) g85.0<1>UW g94.3<16,8,1>UB g94.4<16,8,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,33 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+
+mov (1) g115.8<1>UD 0x07000FUD {align1}; // 8*16/32=4
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(5, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(6, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(8, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(9, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+
+put_data:
+avg (8) g32.0<1>UW g40.0<8,8,1>UB g40.1<8,8,1>UB {align1};
+avg (8) g33.0<1>UW g41.0<8,8,1>UB g41.1<8,8,1>UB {align1};
+avg (8) g34.0<1>UW g42.0<8,8,1>UB g42.1<8,8,1>UB {align1};
+avg (8) g35.0<1>UW g43.0<8,8,1>UB g43.1<8,8,1>UB {align1};
+
+avg (8) g36.0<1>UW g44.0<8,8,1>UB g44.1<8,8,1>UB {align1};
+avg (8) g37.0<1>UW g45.0<8,8,1>UB g45.1<8,8,1>UB {align1};
+avg (8) g38.0<1>UW g46.0<8,8,1>UB g46.1<8,8,1>UB {align1};
+avg (8) g39.0<1>UW g47.0<8,8,1>UB g47.1<8,8,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g78.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g80.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g82.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g84.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g86.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g96.0<1>UW g78.0<16,16,1>UB g78.1<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.0<16,16,1>UB g80.1<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.0<16,16,1>UB g82.1<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.0<16,16,1>UB g84.1<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.0<16,16,1>UB g86.1<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.0<16,16,1>UB g88.1<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.0<16,16,1>UB g90.1<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.0<16,16,1>UB g92.1<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g96.0<1>UW g78.1<16,16,1>UB g78.2<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.1<16,16,1>UB g80.2<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.1<16,16,1>UB g82.2<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.1<16,16,1>UB g84.2<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.1<16,16,1>UB g86.2<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.1<16,16,1>UB g88.2<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.1<16,16,1>UB g90.2<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.1<16,16,1>UB g92.2<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g96.0<1>UW g78.2<16,16,1>UB g78.3<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.2<16,16,1>UB g80.3<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.2<16,16,1>UB g82.3<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.2<16,16,1>UB g84.3<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.2<16,16,1>UB g86.3<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.2<16,16,1>UB g88.3<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.2<16,16,1>UB g90.3<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.2<16,16,1>UB g92.3<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g96.0<1>UW g78.3<16,16,1>UB g78.4<16,16,1>UB {align1};
+avg.sat (16) g97.0<1>UW g80.3<16,16,1>UB g80.4<16,16,1>UB {align1};
+avg.sat (16) g98.0<1>UW g82.3<16,16,1>UB g82.4<16,16,1>UB {align1};
+avg.sat (16) g99.0<1>UW g84.3<16,16,1>UB g84.4<16,16,1>UB {align1};
+avg.sat (16) g100.0<1>UW g86.3<16,16,1>UB g86.4<16,16,1>UB {align1};
+avg.sat (16) g101.0<1>UW g88.3<16,16,1>UB g88.4<16,16,1>UB {align1};
+avg.sat (16) g102.0<1>UW g90.3<16,16,1>UB g90.4<16,16,1>UB {align1};
+avg.sat (16) g103.0<1>UW g92.3<16,16,1>UB g92.4<16,16,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y0_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,35 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   
+*/
+
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+
+put_data:
+avg (16) g32.0<1>UW g40.0<16,16,1>UB g40.1<16,16,1>UB {align1};
+avg (16) g33.0<1>UW g42.0<16,16,1>UB g42.1<16,16,1>UB {align1};
+avg (16) g34.0<1>UW g44.0<16,16,1>UB g44.1<16,16,1>UB {align1};
+avg (16) g35.0<1>UW g46.0<16,16,1>UB g46.1<16,16,1>UB {align1};
+avg (16) g36.0<1>UW g48.0<16,16,1>UB g48.1<16,16,1>UB {align1};
+avg (16) g37.0<1>UW g50.0<16,16,1>UB g50.1<16,16,1>UB {align1};
+avg (16) g38.0<1>UW g52.0<16,16,1>UB g52.1<16,16,1>UB {align1};
+avg (16) g39.0<1>UW g54.0<16,16,1>UB g54.1<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,172 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x07000FUD {align1};
+send (16) 0 g86.0<1>UW g115<16,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g91.0<1>UW g115<16,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 25UD {align1};
+mov (1) g115.8<1>UD 0x01000FUD {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g90.0<1>UW g115<16,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 1 {align1};
+send (16) 0 g95.0<1>UW g115<16,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 1 {align1};
+jmpi g2.24<1,1,1>D;
+//U
+add (16) g78.0<1>UW g86.0<16,8,1>UB g87.0<16,8,1>UB {align1};
+add (16) g79.0<1>UW g87.0<16,8,1>UB g88.0<16,8,1>UB {align1};
+add (16) g80.0<1>UW g88.0<16,8,1>UB g89.0<16,8,1>UB {align1};
+add (16) g81.0<1>UW g89.0<16,8,1>UB g90.0<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g86.1<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g87.1<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g88.1<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g89.1<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g87.1<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g88.1<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g89.1<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g90.1<16,8,1>UB {align1};
+//V
+add (16) g82.0<1>UW g91.0<16,8,1>UB g92.0<16,8,1>UB {align1};
+add (16) g83.0<1>UW g92.0<16,8,1>UB g93.0<16,8,1>UB {align1};
+add (16) g84.0<1>UW g93.0<16,8,1>UB g94.0<16,8,1>UB {align1};
+add (16) g85.0<1>UW g94.0<16,8,1>UB g95.0<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g91.1<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g92.1<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g93.1<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g94.1<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g92.1<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g93.1<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g94.1<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g95.1<16,8,1>UB {align1};
+jmpi out;
+//U
+add (16) g78.0<1>UW g86.1<16,8,1>UB g87.1<16,8,1>UB {align1};
+add (16) g79.0<1>UW g87.1<16,8,1>UB g88.1<16,8,1>UB {align1};
+add (16) g80.0<1>UW g88.1<16,8,1>UB g89.1<16,8,1>UB {align1};
+add (16) g81.0<1>UW g89.1<16,8,1>UB g90.1<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g86.2<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g87.2<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g88.2<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g89.2<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g87.2<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g88.2<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g89.2<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g90.2<16,8,1>UB {align1};
+//V
+add (16) g82.0<1>UW g91.1<16,8,1>UB g92.1<16,8,1>UB {align1};
+add (16) g83.0<1>UW g92.1<16,8,1>UB g93.1<16,8,1>UB {align1};
+add (16) g84.0<1>UW g93.1<16,8,1>UB g94.1<16,8,1>UB {align1};
+add (16) g85.0<1>UW g94.1<16,8,1>UB g95.1<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g91.2<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g92.2<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g93.2<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g94.2<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g92.2<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g93.2<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g94.2<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g95.2<16,8,1>UB {align1};
+jmpi out;
+//U
+add (16) g78.0<1>UW g86.2<16,8,1>UB g87.2<16,8,1>UB {align1};
+add (16) g79.0<1>UW g87.2<16,8,1>UB g88.2<16,8,1>UB {align1};
+add (16) g80.0<1>UW g88.2<16,8,1>UB g89.2<16,8,1>UB {align1};
+add (16) g81.0<1>UW g89.2<16,8,1>UB g90.2<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g86.3<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g87.3<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g88.3<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g89.3<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g87.3<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g88.3<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g89.3<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g90.3<16,8,1>UB {align1};
+//V
+add (16) g82.0<1>UW g91.2<16,8,1>UB g92.2<16,8,1>UB {align1};
+add (16) g83.0<1>UW g92.2<16,8,1>UB g93.2<16,8,1>UB {align1};
+add (16) g84.0<1>UW g93.2<16,8,1>UB g94.2<16,8,1>UB {align1};
+add (16) g85.0<1>UW g94.2<16,8,1>UB g95.2<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g91.3<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g92.3<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g93.3<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g94.3<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g92.3<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g93.3<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g94.3<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g95.3<16,8,1>UB {align1};
+jmpi out;
+//U
+add (16) g78.0<1>UW g86.3<16,8,1>UB g87.3<16,8,1>UB {align1};
+add (16) g79.0<1>UW g87.3<16,8,1>UB g88.3<16,8,1>UB {align1};
+add (16) g80.0<1>UW g88.3<16,8,1>UB g89.3<16,8,1>UB {align1};
+add (16) g81.0<1>UW g89.3<16,8,1>UB g90.3<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g86.4<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g87.4<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g88.4<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g89.4<16,8,1>UB {align1};
+
+add (16) g78.0<1>UW g78.0<16,8,1>UW g87.4<16,8,1>UB {align1};
+add (16) g79.0<1>UW g79.0<16,8,1>UW g88.4<16,8,1>UB {align1};
+add (16) g80.0<1>UW g80.0<16,8,1>UW g89.4<16,8,1>UB {align1};
+add (16) g81.0<1>UW g81.0<16,8,1>UW g90.4<16,8,1>UB {align1};
+//V
+add (16) g82.0<1>UW g91.3<16,8,1>UB g92.3<16,8,1>UB {align1};
+add (16) g83.0<1>UW g92.3<16,8,1>UB g93.3<16,8,1>UB {align1};
+add (16) g84.0<1>UW g93.3<16,8,1>UB g94.3<16,8,1>UB {align1};
+add (16) g85.0<1>UW g94.3<16,8,1>UB g95.3<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g91.4<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g92.4<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g93.4<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g94.4<16,8,1>UB {align1};
+
+add (16) g82.0<1>UW g82.0<16,8,1>UW g92.4<16,8,1>UB {align1};
+add (16) g83.0<1>UW g83.0<16,8,1>UW g93.4<16,8,1>UB {align1};
+add (16) g84.0<1>UW g84.0<16,8,1>UW g94.4<16,8,1>UB {align1};
+add (16) g85.0<1>UW g85.0<16,8,1>UW g95.4<16,8,1>UB {align1};
+
+out:
+shr.sat (16) g78.0<1>UW g78.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g79.0<1>UW g79.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g80.0<1>UW g80.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g81.0<1>UW g81.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g82.0<1>UW g82.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g83.0<1>UW g83.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g84.0<1>UW g84.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g85.0<1>UW g85.0<16,16,1>UW 2UW {align1};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,66 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (1) g115.8<1>UD 0x07000FUD {align1};
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(5, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g45.0<1>UW g115<8,8,1>UW read(6, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+mov (1) g115.8<1>UD 0xFUD {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(5, 2, 0, 2) mlen 1 rlen 1 {align1};//U
+send (16) 0 g49.0<1>UW g115<8,8,1>UW read(6, 2, 0, 2) mlen 1 rlen 1 {align1};//V
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(8, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g45.0<1>UW g115<8,8,1>UW read(9, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+mov (1) g115.8<1>UD 0xFUD {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(8, 2, 0, 2) mlen 1 rlen 1 {align1};//U
+send (16) 0 g49.0<1>UW g115<8,8,1>UW read(9, 2, 0, 2) mlen 1 rlen 1 {align1};//V
+
+put_data:
+//U
+add (8) g32.0<1>UW g40.0<8,8,1>UB g41.0<8,8,1>UB {align1};
+add (8) g33.0<1>UW g41.0<8,8,1>UB g42.0<8,8,1>UB {align1};
+add (8) g34.0<1>UW g42.0<8,8,1>UB g43.0<8,8,1>UB {align1};
+add (8) g35.0<1>UW g43.0<8,8,1>UB g44.0<8,8,1>UB {align1};
+
+add (8) g32.0<1>UW g32.0<8,8,1>UW g40.1<8,8,1>UB {align1};
+add (8) g33.0<1>UW g33.0<8,8,1>UW g41.1<8,8,1>UB {align1};
+add (8) g34.0<1>UW g34.0<8,8,1>UW g42.1<8,8,1>UB {align1};
+add (8) g35.0<1>UW g35.0<8,8,1>UW g43.1<8,8,1>UB {align1};
+
+add (8) g32.0<1>UW g32.0<8,8,1>UW g41.1<8,8,1>UB {align1};
+add (8) g33.0<1>UW g33.0<8,8,1>UW g42.1<8,8,1>UB {align1};
+add (8) g34.0<1>UW g34.0<8,8,1>UW g43.1<8,8,1>UB {align1};
+add (8) g35.0<1>UW g35.0<8,8,1>UW g44.1<8,8,1>UB {align1};
+//V
+add (8) g36.0<1>UW g45.0<8,8,1>UB g46.0<8,8,1>UB {align1};
+add (8) g37.0<1>UW g46.0<8,8,1>UB g47.0<8,8,1>UB {align1};
+add (8) g38.0<1>UW g47.0<8,8,1>UB g48.0<8,8,1>UB {align1};
+add (8) g39.0<1>UW g48.0<8,8,1>UB g49.0<8,8,1>UB {align1};
+
+add (8) g36.0<1>UW g36.0<8,8,1>UW g45.1<8,8,1>UB {align1};
+add (8) g37.0<1>UW g37.0<8,8,1>UW g46.1<8,8,1>UB {align1};
+add (8) g38.0<1>UW g38.0<8,8,1>UW g47.1<8,8,1>UB {align1};
+add (8) g39.0<1>UW g39.0<8,8,1>UW g48.1<8,8,1>UB {align1};
+
+add (8) g36.0<1>UW g36.0<8,8,1>UW g46.1<8,8,1>UB {align1};
+add (8) g37.0<1>UW g37.0<8,8,1>UW g47.1<8,8,1>UB {align1};
+add (8) g38.0<1>UW g38.0<8,8,1>UW g48.1<8,8,1>UB {align1};
+add (8) g39.0<1>UW g39.0<8,8,1>UW g49.1<8,8,1>UB {align1};
+
+shr (32) g32.0<1>UW g32.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g34.0<1>UW g34.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g36.0<1>UW g36.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g38.0<1>UW g38.0<16,16,1>UW 2UW {align1 compr};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,166 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g78.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g80.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g82.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g84.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g86.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g94.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+and (1) g2.24<1>UD g115.0<1,1,1>UD 3UD {align1};
+mul (1) g2.24<1>UD g2.24<1,1,1>UD 25UD {align1};
+jmpi g2.24<1,1,1>D;
+
+add (16) g96.0<1>UW g78.0<16,16,1>UB g80.0<16,16,1>UB {align1};
+add (16) g97.0<1>UW g80.0<16,16,1>UB g82.0<16,16,1>UB {align1};
+add (16) g98.0<1>UW g82.0<16,16,1>UB g84.0<16,16,1>UB {align1};
+add (16) g99.0<1>UW g84.0<16,16,1>UB g86.0<16,16,1>UB {align1};
+add (16) g100.0<1>UW g86.0<16,16,1>UB g88.0<16,16,1>UB {align1};
+add (16) g101.0<1>UW g88.0<16,16,1>UB g90.0<16,16,1>UB {align1};
+add (16) g102.0<1>UW g90.0<16,16,1>UB g92.0<16,16,1>UB {align1};
+add (16) g103.0<1>UW g92.0<16,16,1>UB g94.0<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g78.1<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g80.1<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g82.1<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g84.1<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g86.1<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g88.1<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g90.1<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g92.1<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g80.1<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g82.1<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g84.1<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g86.1<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g88.1<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g90.1<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g92.1<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g94.1<16,16,1>UB {align1};
+jmpi out;
+
+add (16) g96.0<1>UW g78.1<16,16,1>UB g80.1<16,16,1>UB {align1};
+add (16) g97.0<1>UW g80.1<16,16,1>UB g82.1<16,16,1>UB {align1};
+add (16) g98.0<1>UW g82.1<16,16,1>UB g84.1<16,16,1>UB {align1};
+add (16) g99.0<1>UW g84.1<16,16,1>UB g86.1<16,16,1>UB {align1};
+add (16) g100.0<1>UW g86.1<16,16,1>UB g88.1<16,16,1>UB {align1};
+add (16) g101.0<1>UW g88.1<16,16,1>UB g90.1<16,16,1>UB {align1};
+add (16) g102.0<1>UW g90.1<16,16,1>UB g92.1<16,16,1>UB {align1};
+add (16) g103.0<1>UW g92.1<16,16,1>UB g94.1<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g78.2<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g80.2<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g82.2<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g84.2<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g86.2<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g88.2<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g90.2<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g92.2<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g80.2<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g82.2<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g84.2<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g86.2<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g88.2<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g90.2<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g92.2<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g94.2<16,16,1>UB {align1};
+jmpi out;
+
+add (16) g96.0<1>UW g78.2<16,16,1>UB g80.2<16,16,1>UB {align1};
+add (16) g97.0<1>UW g80.2<16,16,1>UB g82.2<16,16,1>UB {align1};
+add (16) g98.0<1>UW g82.2<16,16,1>UB g84.2<16,16,1>UB {align1};
+add (16) g99.0<1>UW g84.2<16,16,1>UB g86.2<16,16,1>UB {align1};
+add (16) g100.0<1>UW g86.2<16,16,1>UB g88.2<16,16,1>UB {align1};
+add (16) g101.0<1>UW g88.2<16,16,1>UB g90.2<16,16,1>UB {align1};
+add (16) g102.0<1>UW g90.2<16,16,1>UB g92.2<16,16,1>UB {align1};
+add (16) g103.0<1>UW g92.2<16,16,1>UB g94.2<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g78.3<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g80.3<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g82.3<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g84.3<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g86.3<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g88.3<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g90.3<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g92.3<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g80.3<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g82.3<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g84.3<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g86.3<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g88.3<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g90.3<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g92.3<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g94.3<16,16,1>UB {align1};
+jmpi out;
+
+add (16) g96.0<1>UW g78.3<16,16,1>UB g80.3<16,16,1>UB {align1};
+add (16) g97.0<1>UW g80.3<16,16,1>UB g82.3<16,16,1>UB {align1};
+add (16) g98.0<1>UW g82.3<16,16,1>UB g84.3<16,16,1>UB {align1};
+add (16) g99.0<1>UW g84.3<16,16,1>UB g86.3<16,16,1>UB {align1};
+add (16) g100.0<1>UW g86.3<16,16,1>UB g88.3<16,16,1>UB {align1};
+add (16) g101.0<1>UW g88.3<16,16,1>UB g90.3<16,16,1>UB {align1};
+add (16) g102.0<1>UW g90.3<16,16,1>UB g92.3<16,16,1>UB {align1};
+add (16) g103.0<1>UW g92.3<16,16,1>UB g94.3<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g78.4<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g80.4<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g82.4<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g84.4<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g86.4<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g88.4<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g90.4<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g92.4<16,16,1>UB {align1};
+
+add (16) g96.0<1>UW g96.0<16,16,1>UW g80.4<16,16,1>UB {align1};
+add (16) g97.0<1>UW g97.0<16,16,1>UW g82.4<16,16,1>UB {align1};
+add (16) g98.0<1>UW g98.0<16,16,1>UW g84.4<16,16,1>UB {align1};
+add (16) g99.0<1>UW g99.0<16,16,1>UW g86.4<16,16,1>UB {align1};
+add (16) g100.0<1>UW g100.0<16,16,1>UW g88.4<16,16,1>UB {align1};
+add (16) g101.0<1>UW g101.0<16,16,1>UW g90.4<16,16,1>UB {align1};
+add (16) g102.0<1>UW g102.0<16,16,1>UW g92.4<16,16,1>UB {align1};
+add (16) g103.0<1>UW g103.0<16,16,1>UW g94.4<16,16,1>UB {align1};
+
+out:
+shr (16) g96.0<1>UW g96.0<16,16,1>UW 2UW {align1};
+shr (16) g97.0<1>UW g97.0<16,16,1>UW 2UW {align1};
+shr (16) g98.0<1>UW g98.0<16,16,1>UW 2UW {align1};
+shr (16) g99.0<1>UW g99.0<16,16,1>UW 2UW {align1};
+shr (16) g100.0<1>UW g100.0<16,16,1>UW 2UW {align1};
+shr (16) g101.0<1>UW g101.0<16,16,1>UW 2UW {align1};
+shr (16) g102.0<1>UW g102.0<16,16,1>UW 2UW {align1};
+shr (16) g103.0<1>UW g103.0<16,16,1>UW 2UW {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_field_x1y1_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,64 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   
+*/
+
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+and.nz (1) null g115.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g56.0<1>UW g115<8,8,1>UW read(4,2,0,2) mlen 1 rlen 1 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g56.0<1>UW g115<8,8,1>UW read(7,2,0,2) mlen 1 rlen 1 {align1};
+
+put_data:
+add (16) g32.0<1>UW g40.0<16,16,1>UB g42.0<16,16,1>UB {align1};
+add (16) g33.0<1>UW g42.0<16,16,1>UB g44.0<16,16,1>UB {align1};
+add (16) g34.0<1>UW g44.0<16,16,1>UB g46.0<16,16,1>UB {align1};
+add (16) g35.0<1>UW g46.0<16,16,1>UB g48.0<16,16,1>UB {align1};
+add (16) g36.0<1>UW g48.0<16,16,1>UB g50.0<16,16,1>UB {align1};
+add (16) g37.0<1>UW g50.0<16,16,1>UB g52.0<16,16,1>UB {align1};
+add (16) g38.0<1>UW g52.0<16,16,1>UB g54.0<16,16,1>UB {align1};
+add (16) g39.0<1>UW g54.0<16,16,1>UB g56.0<16,16,1>UB {align1};
+
+add (16) g32.0<1>UW g32.0<16,16,1>UW g40.1<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g42.1<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g44.1<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g46.1<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g48.1<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g50.1<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g52.1<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g54.1<16,16,1>UB {align1};
+
+add (16) g32.0<1>UW g32.0<16,16,1>UW g42.1<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g44.1<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g46.1<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g48.1<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g50.1<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g52.1<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g54.1<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g56.1<16,16,1>UB {align1};
+
+shr (32) g32.0<1>UW g32.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g34.0<1>UW g34.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g36.0<1>UW g36.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g38.0<1>UW g38.0<16,16,1>UW 2UW {align1 compr};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+and (1) g2.24<1>UD g2.0<1,1,1>UD 0x3UD {align1};
+send (16) 0 g86.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g90.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 0x9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+mov (16) g44.0<1>UW g86.0<16,8,1>UB {align1};
+mov (16) g45.0<1>UW g87.0<16,8,1>UB {align1};
+mov (16) g46.0<1>UW g88.0<16,8,1>UB {align1};
+mov (16) g47.0<1>UW g89.0<16,8,1>UB {align1};
+mov (16) g48.0<1>UW g90.0<16,8,1>UB {align1};
+mov (16) g49.0<1>UW g91.0<16,8,1>UB {align1};
+mov (16) g50.0<1>UW g92.0<16,8,1>UB {align1};
+mov (16) g51.0<1>UW g93.0<16,8,1>UB {align1};
+jmpi out;
+
+mov (16) g44.0<1>UW g86.1<16,8,1>UB {align1};
+mov (16) g45.0<1>UW g87.1<16,8,1>UB {align1};
+mov (16) g46.0<1>UW g88.1<16,8,1>UB {align1};
+mov (16) g47.0<1>UW g89.1<16,8,1>UB {align1};
+mov (16) g48.0<1>UW g90.1<16,8,1>UB {align1};
+mov (16) g49.0<1>UW g91.1<16,8,1>UB {align1};
+mov (16) g50.0<1>UW g92.1<16,8,1>UB {align1};
+mov (16) g51.0<1>UW g93.1<16,8,1>UB {align1};
+jmpi out;
+
+mov (16) g44.0<1>UW g86.2<16,8,1>UB {align1};
+mov (16) g45.0<1>UW g87.2<16,8,1>UB {align1};
+mov (16) g46.0<1>UW g88.2<16,8,1>UB {align1};
+mov (16) g47.0<1>UW g89.2<16,8,1>UB {align1};
+mov (16) g48.0<1>UW g90.2<16,8,1>UB {align1};
+mov (16) g49.0<1>UW g91.2<16,8,1>UB {align1};
+mov (16) g50.0<1>UW g92.2<16,8,1>UB {align1};
+mov (16) g51.0<1>UW g93.2<16,8,1>UB {align1};
+jmpi out;
+
+mov (16) g44.0<1>UW g86.3<16,8,1>UB {align1};
+mov (16) g45.0<1>UW g87.3<16,8,1>UB {align1};
+mov (16) g46.0<1>UW g88.3<16,8,1>UB {align1};
+mov (16) g47.0<1>UW g89.3<16,8,1>UB {align1};
+mov (16) g48.0<1>UW g90.3<16,8,1>UB {align1};
+mov (16) g49.0<1>UW g91.3<16,8,1>UB {align1};
+mov (16) g50.0<1>UW g92.3<16,8,1>UB {align1};
+mov (16) g51.0<1>UW g93.3<16,8,1>UB {align1};
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,28 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                          
+*/
+mov (1) g32.8<1>UD 0x007000fUD  {align1};
+and.nz (1) null g32.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g34.0<1>UW g32<8,8,1>UW read(5, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g44.0<1>UW g32<8,8,1>UW read(6, 2, 0, 2) mlen 1 rlen 4 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g34.0<1>UW g32<8,8,1>UW read(8, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g44.0<1>UW g32<8,8,1>UW read(9, 2, 0, 2) mlen 1 rlen 4 {align1};
+
+put_data:
+mov (32) g74.0<1>UW g34.0<16,8,1>UB {align1 compr};
+mov (32) g76.0<1>UW g36.0<16,8,1>UB {align1 compr};
+mov (32) g78.0<1>UW g44.0<16,8,1>UB {align1 compr};
+mov (32) g80.0<1>UW g46.0<16,8,1>UB {align1 compr};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g2.8<1>UD 0x007001FUD {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+send (16) 0 g106.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+and (1) g2.24<1>UD g2.0<1,1,1>UD 3UD {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 17UD {align1};
+jmpi g2.24<1,1,1>D;
+
+mov (16) g28.0<1>UW g98.0<16,16,1>UB {align1};
+mov (16) g29.0<1>UW g99.0<16,16,1>UB {align1};
+mov (16) g30.0<1>UW g100.0<16,16,1>UB {align1};
+mov (16) g31.0<1>UW g101.0<16,16,1>UB {align1};
+mov (16) g32.0<1>UW g102.0<16,16,1>UB {align1};
+mov (16) g33.0<1>UW g103.0<16,16,1>UB {align1};
+mov (16) g34.0<1>UW g104.0<16,16,1>UB {align1};
+mov (16) g35.0<1>UW g105.0<16,16,1>UB {align1};
+mov (16) g36.0<1>UW g106.0<16,16,1>UB {align1};
+mov (16) g37.0<1>UW g107.0<16,16,1>UB {align1};
+mov (16) g38.0<1>UW g108.0<16,16,1>UB {align1};
+mov (16) g39.0<1>UW g109.0<16,16,1>UB {align1};
+mov (16) g40.0<1>UW g110.0<16,16,1>UB {align1};
+mov (16) g41.0<1>UW g111.0<16,16,1>UB {align1};
+mov (16) g42.0<1>UW g112.0<16,16,1>UB {align1};
+mov (16) g43.0<1>UW g113.0<16,16,1>UB {align1};
+jmpi out;
+
+mov (16) g28.0<1>UW g98.1<16,16,1>UB {align1};
+mov (16) g29.0<1>UW g99.1<16,16,1>UB {align1};
+mov (16) g30.0<1>UW g100.1<16,16,1>UB {align1};
+mov (16) g31.0<1>UW g101.1<16,16,1>UB {align1};
+mov (16) g32.0<1>UW g102.1<16,16,1>UB {align1};
+mov (16) g33.0<1>UW g103.1<16,16,1>UB {align1};
+mov (16) g34.0<1>UW g104.1<16,16,1>UB {align1};
+mov (16) g35.0<1>UW g105.1<16,16,1>UB {align1};
+mov (16) g36.0<1>UW g106.1<16,16,1>UB {align1};
+mov (16) g37.0<1>UW g107.1<16,16,1>UB {align1};
+mov (16) g38.0<1>UW g108.1<16,16,1>UB {align1};
+mov (16) g39.0<1>UW g109.1<16,16,1>UB {align1};
+mov (16) g40.0<1>UW g110.1<16,16,1>UB {align1};
+mov (16) g41.0<1>UW g111.1<16,16,1>UB {align1};
+mov (16) g42.0<1>UW g112.1<16,16,1>UB {align1};
+mov (16) g43.0<1>UW g113.1<16,16,1>UB {align1};
+jmpi out;
+
+mov (16) g28.0<1>UW g98.2<16,16,1>UB {align1};
+mov (16) g29.0<1>UW g99.2<16,16,1>UB {align1};
+mov (16) g30.0<1>UW g100.2<16,16,1>UB {align1};
+mov (16) g31.0<1>UW g101.2<16,16,1>UB {align1};
+mov (16) g32.0<1>UW g102.2<16,16,1>UB {align1};
+mov (16) g33.0<1>UW g103.2<16,16,1>UB {align1};
+mov (16) g34.0<1>UW g104.2<16,16,1>UB {align1};
+mov (16) g35.0<1>UW g105.2<16,16,1>UB {align1};
+mov (16) g36.0<1>UW g106.2<16,16,1>UB {align1};
+mov (16) g37.0<1>UW g107.2<16,16,1>UB {align1};
+mov (16) g38.0<1>UW g108.2<16,16,1>UB {align1};
+mov (16) g39.0<1>UW g109.2<16,16,1>UB {align1};
+mov (16) g40.0<1>UW g110.2<16,16,1>UB {align1};
+mov (16) g41.0<1>UW g111.2<16,16,1>UB {align1};
+mov (16) g42.0<1>UW g112.2<16,16,1>UB {align1};
+mov (16) g43.0<1>UW g113.2<16,16,1>UB {align1};
+jmpi out;
+
+mov (16) g28.0<1>UW g98.3<16,16,1>UB {align1};
+mov (16) g29.0<1>UW g99.3<16,16,1>UB {align1};
+mov (16) g30.0<1>UW g100.3<16,16,1>UB {align1};
+mov (16) g31.0<1>UW g101.3<16,16,1>UB {align1};
+mov (16) g32.0<1>UW g102.3<16,16,1>UB {align1};
+mov (16) g33.0<1>UW g103.3<16,16,1>UB {align1};
+mov (16) g34.0<1>UW g104.3<16,16,1>UB {align1};
+mov (16) g35.0<1>UW g105.3<16,16,1>UB {align1};
+mov (16) g36.0<1>UW g106.3<16,16,1>UB {align1};
+mov (16) g37.0<1>UW g107.3<16,16,1>UB {align1};
+mov (16) g38.0<1>UW g108.3<16,16,1>UB {align1};
+mov (16) g39.0<1>UW g109.3<16,16,1>UB {align1};
+mov (16) g40.0<1>UW g110.3<16,16,1>UB {align1};
+mov (16) g41.0<1>UW g111.3<16,16,1>UB {align1};
+mov (16) g42.0<1>UW g112.3<16,16,1>UB {align1};
+mov (16) g43.0<1>UW g113.3<16,16,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y0_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,35 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           
+*/
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+and.nz (1) null g32.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+put_data:
+mov (32) g58.0<1>UW g38.0<16,16,1>UB {align1 compr};
+mov (32) g60.0<1>UW g40.0<16,16,1>UB {align1 compr};
+mov (32) g62.0<1>UW g42.0<16,16,1>UB {align1 compr};
+mov (32) g64.0<1>UW g44.0<16,16,1>UB {align1 compr};
+mov (32) g66.0<1>UW g46.0<16,16,1>UB {align1 compr};
+mov (32) g68.0<1>UW g48.0<16,16,1>UB {align1 compr};
+mov (32) g70.0<1>UW g50.0<16,16,1>UB {align1 compr};
+mov (32) g72.0<1>UW g52.0<16,16,1>UB {align1 compr};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDINg BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINgEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIgHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAgES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINg FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINgS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+and (1) g2.24<1>UD g2.0<1,1,1>UD 0x3UD {align1};
+send (16) 0 g86.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g94.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+mov (1) g2.8<1>UD 0x01001FUD {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+send (16) 0 g90.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1};
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 0x9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g44.0<1>UW g86.0<16,8,1>UB g87.0<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.0<16,8,1>UB g88.0<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.0<16,8,1>UB g89.0<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.0<16,8,1>UB g90.0<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g94.0<16,8,1>UB g95.0<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g95.0<16,8,1>UB g96.0<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g96.0<16,8,1>UB g97.0<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g97.0<16,8,1>UB g98.0<16,8,1>UB{align1};
+jmpi out;
+
+avg.sat (16) g44.0<1>UW g86.1<16,8,1>UB g87.1<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.1<16,8,1>UB g88.1<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.1<16,8,1>UB g89.1<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.1<16,8,1>UB g90.1<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g94.1<16,8,1>UB g95.1<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g95.1<16,8,1>UB g96.1<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g96.1<16,8,1>UB g97.1<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g97.1<16,8,1>UB g98.1<16,8,1>UB{align1};
+jmpi out;
+
+avg.sat (16) g44.0<1>UW g86.2<16,8,1>UB g87.2<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.2<16,8,1>UB g88.2<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.2<16,8,1>UB g89.2<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.2<16,8,1>UB g90.2<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g94.2<16,8,1>UB g95.2<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g95.2<16,8,1>UB g96.2<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g96.2<16,8,1>UB g97.2<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g97.2<16,8,1>UB g98.2<16,8,1>UB{align1};
+jmpi out;
+
+avg.sat (16) g44.0<1>UW g86.3<16,8,1>UB g87.3<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.3<16,8,1>UB g88.3<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.3<16,8,1>UB g89.3<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.3<16,8,1>UB g90.3<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g94.3<16,8,1>UB g95.3<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g95.3<16,8,1>UB g96.3<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g96.3<16,8,1>UB g97.3<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g97.3<16,8,1>UB g98.3<16,8,1>UB{align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDINg BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINgEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIgHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAgES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINg FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINgS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+send (16) 0 g86.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g94.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+mov (1) g2.8<1>UD 0x01001FUD {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+send (16) 0 g90.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1};
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+
+avg.sat (16) g44.0<1>UW g86.0<16,8,1>UB g87.0<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.0<16,8,1>UB g88.0<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.0<16,8,1>UB g89.0<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.0<16,8,1>UB g90.0<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g94.0<16,8,1>UB g95.0<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g95.0<16,8,1>UB g96.0<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g96.0<16,8,1>UB g97.0<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g97.0<16,8,1>UB g98.0<16,8,1>UB{align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,113 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g2.8<1>UD 0x007001FUD {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+and (1) g2.24<1>UD g2.0<1,1,1>UD 3UD {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 17UD {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+send (16) 0 g106.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+mov (1) g2.8<1>UD 0x1FUD {align1};
+send (16) 0 g120.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 1 {align1};
+
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g28.0<1>UW g98.0<16,16,1>UB g99.0<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.0<16,16,1>UB g100.0<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.0<16,16,1>UB g101.0<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.0<16,16,1>UB g102.0<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.0<16,16,1>UB g103.0<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.0<16,16,1>UB g104.0<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.0<16,16,1>UB g105.0<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.0<16,16,1>UB g106.0<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.0<16,16,1>UB g107.0<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.0<16,16,1>UB g108.0<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.0<16,16,1>UB g109.0<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.0<16,16,1>UB g110.0<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.0<16,16,1>UB g111.0<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.0<16,16,1>UB g112.0<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.0<16,16,1>UB g113.0<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.0<16,16,1>UB g120.0<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g28.0<1>UW g98.1<16,16,1>UB g99.1<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.1<16,16,1>UB g100.1<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.1<16,16,1>UB g101.1<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.1<16,16,1>UB g102.1<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.1<16,16,1>UB g103.1<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.1<16,16,1>UB g104.1<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.1<16,16,1>UB g105.1<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.1<16,16,1>UB g106.1<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.1<16,16,1>UB g107.1<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.1<16,16,1>UB g108.1<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.1<16,16,1>UB g109.1<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.1<16,16,1>UB g110.1<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.1<16,16,1>UB g111.1<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.1<16,16,1>UB g112.1<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.1<16,16,1>UB g113.1<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.1<16,16,1>UB g120.1<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g28.0<1>UW g98.2<16,16,1>UB g99.2<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.2<16,16,1>UB g100.2<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.2<16,16,1>UB g101.2<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.2<16,16,1>UB g102.2<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.2<16,16,1>UB g103.2<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.2<16,16,1>UB g104.2<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.2<16,16,1>UB g105.2<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.2<16,16,1>UB g106.2<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.2<16,16,1>UB g107.2<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.2<16,16,1>UB g108.2<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.2<16,16,1>UB g109.2<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.2<16,16,1>UB g110.2<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.2<16,16,1>UB g111.2<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.2<16,16,1>UB g112.2<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.2<16,16,1>UB g113.2<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.2<16,16,1>UB g120.2<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g28.0<1>UW g98.3<16,16,1>UB g99.3<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.3<16,16,1>UB g100.3<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.3<16,16,1>UB g101.3<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.3<16,16,1>UB g102.3<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.3<16,16,1>UB g103.3<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.3<16,16,1>UB g104.3<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.3<16,16,1>UB g105.3<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.3<16,16,1>UB g106.3<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.3<16,16,1>UB g107.3<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.3<16,16,1>UB g108.3<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.3<16,16,1>UB g109.3<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.3<16,16,1>UB g110.3<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.3<16,16,1>UB g111.3<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.3<16,16,1>UB g112.3<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.3<16,16,1>UB g113.3<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.3<16,16,1>UB g120.3<16,16,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x0y1_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,49 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+and.nz (1) null g32.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g54.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 1 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g54.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 1 {align1};
+
+put_data:
+avg (16) g58.0<1>UW g38.0<16,16,1>UB g39.0<16,16,1>UB {align1};
+avg (16) g59.0<1>UW g39.0<16,16,1>UB g40.0<16,16,1>UB {align1};
+avg (16) g60.0<1>UW g40.0<16,16,1>UB g41.0<16,16,1>UB {align1};
+avg (16) g61.0<1>UW g41.0<16,16,1>UB g42.0<16,16,1>UB {align1};
+avg (16) g62.0<1>UW g42.0<16,16,1>UB g43.0<16,16,1>UB {align1};
+avg (16) g63.0<1>UW g43.0<16,16,1>UB g44.0<16,16,1>UB {align1};
+avg (16) g64.0<1>UW g44.0<16,16,1>UB g45.0<16,16,1>UB {align1};
+avg (16) g65.0<1>UW g45.0<16,16,1>UB g46.0<16,16,1>UB {align1};
+avg (16) g66.0<1>UW g46.0<16,16,1>UB g47.0<16,16,1>UB {align1};
+avg (16) g67.0<1>UW g47.0<16,16,1>UB g48.0<16,16,1>UB {align1};
+avg (16) g68.0<1>UW g48.0<16,16,1>UB g49.0<16,16,1>UB {align1};
+avg (16) g69.0<1>UW g49.0<16,16,1>UB g50.0<16,16,1>UB {align1};
+avg (16) g70.0<1>UW g50.0<16,16,1>UB g51.0<16,16,1>UB {align1};
+avg (16) g71.0<1>UW g51.0<16,16,1>UB g52.0<16,16,1>UB {align1};
+avg (16) g72.0<1>UW g52.0<16,16,1>UB g53.0<16,16,1>UB {align1};
+avg (16) g73.0<1>UW g53.0<16,16,1>UB g54.0<16,16,1>UB {align1};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+
+mov (1) g2.8<1>UD 0x007000FUD {align1};
+and (1) g2.24<1>UD g2.0<1,1,1>UD 0x3UD {align1};
+send (16) 0 g86.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g90.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 0x9UD {align1};
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g44.0<1>UW g86.0<16,8,1>UB g86.1<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.0<16,8,1>UB g87.1<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.0<16,8,1>UB g88.1<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.0<16,8,1>UB g89.1<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g90.0<16,8,1>UB g90.1<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g91.0<16,8,1>UB g91.1<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g92.0<16,8,1>UB g92.1<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g93.0<16,8,1>UB g93.1<16,8,1>UB{align1};
+jmpi out;
+
+avg.sat (16) g44.0<1>UW g86.1<16,8,1>UB g86.2<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.1<16,8,1>UB g87.2<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.1<16,8,1>UB g88.2<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.1<16,8,1>UB g89.2<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g90.1<16,8,1>UB g90.2<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g91.1<16,8,1>UB g91.2<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g92.1<16,8,1>UB g92.2<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g93.1<16,8,1>UB g93.2<16,8,1>UB{align1};
+jmpi out;
+
+avg.sat (16) g44.0<1>UW g86.2<16,8,1>UB g86.3<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.2<16,8,1>UB g87.3<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.2<16,8,1>UB g88.3<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.2<16,8,1>UB g89.3<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g90.2<16,8,1>UB g90.3<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g91.2<16,8,1>UB g91.3<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g92.2<16,8,1>UB g92.3<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g93.2<16,8,1>UB g93.3<16,8,1>UB{align1};
+jmpi out;
+
+avg.sat (16) g44.0<1>UW g86.3<16,8,1>UB g86.4<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.3<16,8,1>UB g87.4<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.3<16,8,1>UB g88.4<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.3<16,8,1>UB g89.4<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g90.3<16,8,1>UB g90.4<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g91.3<16,8,1>UB g91.4<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g92.3<16,8,1>UB g92.4<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g93.3<16,8,1>UB g93.4<16,8,1>UB{align1};
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+
+mov (1) g2.8<1>UD 0x007000FUD {align1};
+send (16) 0 g86.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g90.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+
+avg.sat (16) g44.0<1>UW g86.0<16,8,1>UB g86.1<16,8,1>UB{align1};
+avg.sat (16) g45.0<1>UW g87.0<16,8,1>UB g87.1<16,8,1>UB{align1};
+avg.sat (16) g46.0<1>UW g88.0<16,8,1>UB g88.1<16,8,1>UB{align1};
+avg.sat (16) g47.0<1>UW g89.0<16,8,1>UB g89.1<16,8,1>UB{align1};
+avg.sat (16) g48.0<1>UW g90.0<16,8,1>UB g90.1<16,8,1>UB{align1};
+avg.sat (16) g49.0<1>UW g91.0<16,8,1>UB g91.1<16,8,1>UB{align1};
+avg.sat (16) g50.0<1>UW g92.0<16,8,1>UB g92.1<16,8,1>UB{align1};
+avg.sat (16) g51.0<1>UW g93.0<16,8,1>UB g93.1<16,8,1>UB{align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g2.8<1>UD 0x007001FUD {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+and (1) g2.24<1>UD g2.0<1,1,1>UD 3UD {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 17D {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+send (16) 0 g106.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+jmpi g2.24<1,1,1>D;
+
+avg.sat (16) g28.0<1>UW g98.0<16,16,1>UB g98.1<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.0<16,16,1>UB g99.1<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.0<16,16,1>UB g100.1<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.0<16,16,1>UB g101.1<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.0<16,16,1>UB g102.1<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.0<16,16,1>UB g103.1<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.0<16,16,1>UB g104.1<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.0<16,16,1>UB g105.1<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.0<16,16,1>UB g106.1<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.0<16,16,1>UB g107.1<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.0<16,16,1>UB g108.1<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.0<16,16,1>UB g109.1<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.0<16,16,1>UB g110.1<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.0<16,16,1>UB g111.1<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.0<16,16,1>UB g112.1<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.0<16,16,1>UB g113.1<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g28.0<1>UW g98.1<16,16,1>UB g98.2<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.1<16,16,1>UB g99.2<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.1<16,16,1>UB g100.2<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.1<16,16,1>UB g101.2<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.1<16,16,1>UB g102.2<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.1<16,16,1>UB g103.2<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.1<16,16,1>UB g104.2<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.1<16,16,1>UB g105.2<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.1<16,16,1>UB g106.2<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.1<16,16,1>UB g107.2<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.1<16,16,1>UB g108.2<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.1<16,16,1>UB g109.2<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.1<16,16,1>UB g110.2<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.1<16,16,1>UB g111.2<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.1<16,16,1>UB g112.2<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.1<16,16,1>UB g113.2<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g28.0<1>UW g98.2<16,16,1>UB g98.3<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.2<16,16,1>UB g99.3<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.2<16,16,1>UB g100.3<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.2<16,16,1>UB g101.3<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.2<16,16,1>UB g102.3<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.2<16,16,1>UB g103.3<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.2<16,16,1>UB g104.3<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.2<16,16,1>UB g105.3<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.2<16,16,1>UB g106.3<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.2<16,16,1>UB g107.3<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.2<16,16,1>UB g108.3<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.2<16,16,1>UB g109.3<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.2<16,16,1>UB g110.3<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.2<16,16,1>UB g111.3<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.2<16,16,1>UB g112.3<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.2<16,16,1>UB g113.3<16,16,1>UB {align1};
+jmpi out;
+
+avg.sat (16) g28.0<1>UW g98.3<16,16,1>UB g98.4<16,16,1>UB {align1};
+avg.sat (16) g29.0<1>UW g99.3<16,16,1>UB g99.4<16,16,1>UB {align1};
+avg.sat (16) g30.0<1>UW g100.3<16,16,1>UB g100.4<16,16,1>UB {align1};
+avg.sat (16) g31.0<1>UW g101.3<16,16,1>UB g101.4<16,16,1>UB {align1};
+avg.sat (16) g32.0<1>UW g102.3<16,16,1>UB g102.4<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g103.3<16,16,1>UB g103.4<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g104.3<16,16,1>UB g104.4<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g105.3<16,16,1>UB g105.4<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g106.3<16,16,1>UB g106.4<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g107.3<16,16,1>UB g107.4<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g108.3<16,16,1>UB g108.4<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g109.3<16,16,1>UB g109.4<16,16,1>UB {align1};
+avg.sat (16) g40.0<1>UW g110.3<16,16,1>UB g110.4<16,16,1>UB {align1};
+avg.sat (16) g41.0<1>UW g111.3<16,16,1>UB g111.4<16,16,1>UB {align1};
+avg.sat (16) g42.0<1>UW g112.3<16,16,1>UB g112.4<16,16,1>UB {align1};
+avg.sat (16) g43.0<1>UW g113.3<16,16,1>UB g113.4<16,16,1>UB {align1};
+
+out:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y0_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,43 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           
+*/
+
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+and.nz (1) null g32.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+put_data:
+avg (16) g58.0<1>UW g38.0<16,16,1>UB g38.1<16,16,1>UB {align1};
+avg (16) g59.0<1>UW g39.0<16,16,1>UB g39.1<16,16,1>UB {align1};
+avg (16) g60.0<1>UW g40.0<16,16,1>UB g40.1<16,16,1>UB {align1};
+avg (16) g61.0<1>UW g41.0<16,16,1>UB g41.1<16,16,1>UB {align1};
+avg (16) g62.0<1>UW g42.0<16,16,1>UB g42.1<16,16,1>UB {align1};
+avg (16) g63.0<1>UW g43.0<16,16,1>UB g43.1<16,16,1>UB {align1};
+avg (16) g64.0<1>UW g44.0<16,16,1>UB g44.1<16,16,1>UB {align1};
+avg (16) g65.0<1>UW g45.0<16,16,1>UB g45.1<16,16,1>UB {align1};
+avg (16) g66.0<1>UW g46.0<16,16,1>UB g46.1<16,16,1>UB {align1};
+avg (16) g67.0<1>UW g47.0<16,16,1>UB g47.1<16,16,1>UB {align1};
+avg (16) g68.0<1>UW g48.0<16,16,1>UB g48.1<16,16,1>UB {align1};
+avg (16) g69.0<1>UW g49.0<16,16,1>UB g49.1<16,16,1>UB {align1};
+avg (16) g70.0<1>UW g50.0<16,16,1>UB g50.1<16,16,1>UB {align1};
+avg (16) g71.0<1>UW g51.0<16,16,1>UB g51.1<16,16,1>UB {align1};
+avg (16) g72.0<1>UW g52.0<16,16,1>UB g52.1<16,16,1>UB {align1};
+avg (16) g73.0<1>UW g53.0<16,16,1>UB g53.1<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,159 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+and (1) g2.24<1>UD g2.0<1,1,1>UD 0x3UD {align1};
+send (16) 0 g86.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g94.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+mov (1) g2.8<1>UD 0x01001FUD {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8D {align1};
+send (16) 0 g90.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1};
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 25UD {align1};
+jmpi g2.24<1,1,1>D;
+
+add (16) g44.0<1>UW g86.0<16,8,1>UB g86.1<16,8,1>UB{align1};
+add (16) g45.0<1>UW g87.0<16,8,1>UB g87.1<16,8,1>UB{align1};
+add (16) g46.0<1>UW g88.0<16,8,1>UB g88.1<16,8,1>UB{align1};
+add (16) g47.0<1>UW g89.0<16,8,1>UB g89.1<16,8,1>UB{align1};
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.0<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.0<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.0<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.0<16,8,1>UB{align1};
+
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.1<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.1<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.1<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.1<16,8,1>UB{align1};
+add (16) g48.0<1>UW g94.0<16,8,1>UB g95.0<16,8,1>UB{align1};
+add (16) g49.0<1>UW g95.0<16,8,1>UB g96.0<16,8,1>UB{align1};
+add (16) g50.0<1>UW g96.0<16,8,1>UB g97.0<16,8,1>UB{align1};
+add (16) g51.0<1>UW g97.0<16,8,1>UB g98.0<16,8,1>UB{align1};
+
+add (16) g48.0<1>UW g48.0<16,16,1>UW g94.1<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g95.1<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g96.1<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g97.1<16,8,1>UB{align1};
+add (16) g48.0<1>UW g48.0<16,16,1>UW g95.1<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g96.1<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g97.1<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g98.1<16,8,1>UB{align1};
+jmpi out;
+
+add (16) g44.0<1>UW g86.1<16,8,1>UB g86.2<16,8,1>UB{align1};
+add (16) g45.0<1>UW g87.1<16,8,1>UB g87.2<16,8,1>UB{align1};
+add (16) g46.0<1>UW g88.1<16,8,1>UB g88.2<16,8,1>UB{align1};
+add (16) g47.0<1>UW g89.1<16,8,1>UB g89.2<16,8,1>UB{align1};
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.1<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.1<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.1<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.1<16,8,1>UB{align1};
+
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.2<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.2<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.2<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.2<16,8,1>UB{align1};
+add (16) g48.0<1>UW g94.1<16,8,1>UB g95.1<16,8,1>UB{align1};
+add (16) g49.0<1>UW g95.1<16,8,1>UB g96.1<16,8,1>UB{align1};
+add (16) g50.0<1>UW g96.1<16,8,1>UB g97.1<16,8,1>UB{align1};
+add (16) g51.0<1>UW g97.1<16,8,1>UB g98.1<16,8,1>UB{align1};
+
+add (16) g48.0<1>UW g48.0<16,16,1>UW g94.2<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g95.2<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g96.2<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g97.2<16,8,1>UB{align1};
+add (16) g48.0<1>UW g48.0<16,16,1>UW g95.2<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g96.2<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g97.2<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g98.2<16,8,1>UB{align1};
+jmpi out;
+
+add (16) g44.0<1>UW g86.2<16,8,1>UB g86.3<16,8,1>UB{align1};
+add (16) g45.0<1>UW g87.2<16,8,1>UB g87.3<16,8,1>UB{align1};
+add (16) g46.0<1>UW g88.2<16,8,1>UB g88.3<16,8,1>UB{align1};
+add (16) g47.0<1>UW g89.2<16,8,1>UB g89.3<16,8,1>UB{align1};
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.2<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.2<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.2<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.2<16,8,1>UB{align1};
+
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.3<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.3<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.3<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.3<16,8,1>UB{align1};
+add (16) g48.0<1>UW g94.2<16,8,1>UB g95.2<16,8,1>UB{align1};
+add (16) g49.0<1>UW g95.2<16,8,1>UB g96.2<16,8,1>UB{align1};
+add (16) g50.0<1>UW g96.2<16,8,1>UB g97.2<16,8,1>UB{align1};
+add (16) g51.0<1>UW g97.2<16,8,1>UB g98.2<16,8,1>UB{align1};
+
+add (16) g48.0<1>UW g48.0<16,16,1>UW g94.3<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g95.3<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g96.3<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g97.3<16,8,1>UB{align1};
+add (16) g48.0<1>UW g48.0<16,16,1>UW g95.3<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g96.3<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g97.3<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g98.3<16,8,1>UB{align1};
+jmpi out;
+
+add (16) g44.0<1>UW g86.3<16,8,1>UB g86.4<16,8,1>UB{align1};
+add (16) g45.0<1>UW g87.3<16,8,1>UB g87.4<16,8,1>UB{align1};
+add (16) g46.0<1>UW g88.3<16,8,1>UB g88.4<16,8,1>UB{align1};
+add (16) g47.0<1>UW g89.3<16,8,1>UB g89.4<16,8,1>UB{align1};
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.3<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.3<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.3<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.3<16,8,1>UB{align1};
+
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.4<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.4<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.4<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.4<16,8,1>UB{align1};
+add (16) g48.0<1>UW g94.3<16,8,1>UB g95.3<16,8,1>UB{align1};
+add (16) g49.0<1>UW g95.3<16,8,1>UB g96.3<16,8,1>UB{align1};
+add (16) g50.0<1>UW g96.3<16,8,1>UB g97.3<16,8,1>UB{align1};
+add (16) g51.0<1>UW g97.3<16,8,1>UB g98.3<16,8,1>UB{align1};
+
+add (16) g48.0<1>UW g48.0<16,16,1>UW g94.4<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g95.4<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g96.4<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g97.4<16,8,1>UB{align1};
+add (16) g48.0<1>UW g48.0<16,16,1>UW g95.4<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g96.4<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g97.4<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g98.4<16,8,1>UB{align1};
+out:
+
+shr.sat (16) g44.0<1>UW g44.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g45.0<1>UW g45.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g46.0<1>UW g46.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g47.0<1>UW g47.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g48.0<1>UW g48.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g49.0<1>UW g49.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g50.0<1>UW g50.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g51.0<1>UW g51.0<16,16,1>UW 2UW {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+send (16) 0 g86.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g94.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+mov (1) g2.8<1>UD 0x01001FUD {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8D {align1};
+send (16) 0 g90.0<1>UW g2<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1};
+mov (1) g2.8<1>UD 0x007000fUD  {align1};
+
+add (16) g44.0<1>UW g86.0<16,8,1>UB g86.1<16,8,1>UB{align1};
+add (16) g45.0<1>UW g87.0<16,8,1>UB g87.1<16,8,1>UB{align1};
+add (16) g46.0<1>UW g88.0<16,8,1>UB g88.1<16,8,1>UB{align1};
+add (16) g47.0<1>UW g89.0<16,8,1>UB g89.1<16,8,1>UB{align1};
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.0<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.0<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.0<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.0<16,8,1>UB{align1};
+
+add (16) g44.0<1>UW g44.0<16,16,1>UW g87.1<16,8,1>UB{align1};
+add (16) g45.0<1>UW g45.0<16,16,1>UW g88.1<16,8,1>UB{align1};
+add (16) g46.0<1>UW g46.0<16,16,1>UW g89.1<16,8,1>UB{align1};
+add (16) g47.0<1>UW g47.0<16,16,1>UW g90.1<16,8,1>UB{align1};
+add (16) g48.0<1>UW g94.0<16,8,1>UB g95.0<16,8,1>UB{align1};
+add (16) g49.0<1>UW g95.0<16,8,1>UB g96.0<16,8,1>UB{align1};
+add (16) g50.0<1>UW g96.0<16,8,1>UB g97.0<16,8,1>UB{align1};
+add (16) g51.0<1>UW g97.0<16,8,1>UB g98.0<16,8,1>UB{align1};
+
+add (16) g48.0<1>UW g48.0<16,16,1>UW g94.1<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g95.1<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g96.1<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g97.1<16,8,1>UB{align1};
+add (16) g48.0<1>UW g48.0<16,16,1>UW g95.1<16,8,1>UB{align1};
+add (16) g49.0<1>UW g49.0<16,16,1>UW g96.1<16,8,1>UB{align1};
+add (16) g50.0<1>UW g50.0<16,16,1>UW g97.1<16,8,1>UB{align1};
+add (16) g51.0<1>UW g51.0<16,16,1>UW g98.1<16,8,1>UB{align1};
+
+shr.sat (16) g44.0<1>UW g44.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g45.0<1>UW g45.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g46.0<1>UW g46.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g47.0<1>UW g47.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g48.0<1>UW g48.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g49.0<1>UW g49.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g50.0<1>UW g50.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g51.0<1>UW g51.0<16,16,1>UW 2UW {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,264 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g2.8<1>UD 0x007001FUD {align1};
+send (16) 0 g98.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+and (1) g2.24<1>UD g2.0<1,1,1>UD 3UD {align1};
+mul(1) g2.24<1>UD g2.24<1,1,1>UD 49UD {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+send (16) 0 g106.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g2.4<1>UD g2.4<1,1,1>UD 8UD {align1};
+mov (1) g2.8<1>UD 0x1FUD {align1};
+send (16) 0 g120.0<1>UW g2<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 1 {align1};
+
+jmpi g2.24<1,1,1>D;
+
+add (16) g28.0<1>UW g98.0<16,16,1>UB g98.1<16,16,1>UB {align1};
+add (16) g29.0<1>UW g99.0<16,16,1>UB g99.1<16,16,1>UB {align1};
+add (16) g30.0<1>UW g100.0<16,16,1>UB g100.1<16,16,1>UB {align1};
+add (16) g31.0<1>UW g101.0<16,16,1>UB g101.1<16,16,1>UB {align1};
+add (16) g32.0<1>UW g102.0<16,16,1>UB g102.1<16,16,1>UB {align1};
+add (16) g33.0<1>UW g103.0<16,16,1>UB g103.1<16,16,1>UB {align1};
+add (16) g34.0<1>UW g104.0<16,16,1>UB g104.1<16,16,1>UB {align1};
+add (16) g35.0<1>UW g105.0<16,16,1>UB g105.1<16,16,1>UB {align1};
+add (16) g36.0<1>UW g106.0<16,16,1>UB g106.1<16,16,1>UB {align1};
+add (16) g37.0<1>UW g107.0<16,16,1>UB g107.1<16,16,1>UB {align1};
+add (16) g38.0<1>UW g108.0<16,16,1>UB g108.1<16,16,1>UB {align1};
+add (16) g39.0<1>UW g109.0<16,16,1>UB g109.1<16,16,1>UB {align1};
+add (16) g40.0<1>UW g110.0<16,16,1>UB g110.1<16,16,1>UB {align1};
+add (16) g41.0<1>UW g111.0<16,16,1>UB g111.1<16,16,1>UB {align1};
+add (16) g42.0<1>UW g112.0<16,16,1>UB g112.1<16,16,1>UB {align1};
+add (16) g43.0<1>UW g113.0<16,16,1>UB g113.1<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.0<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.0<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.0<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.0<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.0<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.0<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.0<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.0<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.0<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.0<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.0<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.0<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.0<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.0<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.0<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.0<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.1<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.1<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.1<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.1<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.1<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.1<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.1<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.1<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.1<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.1<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.1<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.1<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.1<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.1<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.1<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.1<16,16,1>UB {align1};
+jmpi out;
+
+add (16) g28.0<1>UW g98.1<16,16,1>UB g98.2<16,16,1>UB {align1};
+add (16) g29.0<1>UW g99.1<16,16,1>UB g99.2<16,16,1>UB {align1};
+add (16) g30.0<1>UW g100.1<16,16,1>UB g100.2<16,16,1>UB {align1};
+add (16) g31.0<1>UW g101.1<16,16,1>UB g101.2<16,16,1>UB {align1};
+add (16) g32.0<1>UW g102.1<16,16,1>UB g102.2<16,16,1>UB {align1};
+add (16) g33.0<1>UW g103.1<16,16,1>UB g103.2<16,16,1>UB {align1};
+add (16) g34.0<1>UW g104.1<16,16,1>UB g104.2<16,16,1>UB {align1};
+add (16) g35.0<1>UW g105.1<16,16,1>UB g105.2<16,16,1>UB {align1};
+add (16) g36.0<1>UW g106.1<16,16,1>UB g106.2<16,16,1>UB {align1};
+add (16) g37.0<1>UW g107.1<16,16,1>UB g107.2<16,16,1>UB {align1};
+add (16) g38.0<1>UW g108.1<16,16,1>UB g108.2<16,16,1>UB {align1};
+add (16) g39.0<1>UW g109.1<16,16,1>UB g109.2<16,16,1>UB {align1};
+add (16) g40.0<1>UW g110.1<16,16,1>UB g110.2<16,16,1>UB {align1};
+add (16) g41.0<1>UW g111.1<16,16,1>UB g111.2<16,16,1>UB {align1};
+add (16) g42.0<1>UW g112.1<16,16,1>UB g112.2<16,16,1>UB {align1};
+add (16) g43.0<1>UW g113.1<16,16,1>UB g113.2<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.1<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.1<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.1<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.1<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.1<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.1<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.1<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.1<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.1<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.1<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.1<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.1<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.1<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.1<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.1<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.1<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.2<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.2<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.2<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.2<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.2<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.2<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.2<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.2<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.2<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.2<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.2<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.2<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.2<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.2<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.2<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.2<16,16,1>UB {align1};
+jmpi out;
+
+add (16) g28.0<1>UW g98.2<16,16,1>UB g98.3<16,16,1>UB {align1};
+add (16) g29.0<1>UW g99.2<16,16,1>UB g99.3<16,16,1>UB {align1};
+add (16) g30.0<1>UW g100.2<16,16,1>UB g100.3<16,16,1>UB {align1};
+add (16) g31.0<1>UW g101.2<16,16,1>UB g101.3<16,16,1>UB {align1};
+add (16) g32.0<1>UW g102.2<16,16,1>UB g102.3<16,16,1>UB {align1};
+add (16) g33.0<1>UW g103.2<16,16,1>UB g103.3<16,16,1>UB {align1};
+add (16) g34.0<1>UW g104.2<16,16,1>UB g104.3<16,16,1>UB {align1};
+add (16) g35.0<1>UW g105.2<16,16,1>UB g105.3<16,16,1>UB {align1};
+add (16) g36.0<1>UW g106.2<16,16,1>UB g106.3<16,16,1>UB {align1};
+add (16) g37.0<1>UW g107.2<16,16,1>UB g107.3<16,16,1>UB {align1};
+add (16) g38.0<1>UW g108.2<16,16,1>UB g108.3<16,16,1>UB {align1};
+add (16) g39.0<1>UW g109.2<16,16,1>UB g109.3<16,16,1>UB {align1};
+add (16) g40.0<1>UW g110.2<16,16,1>UB g110.3<16,16,1>UB {align1};
+add (16) g41.0<1>UW g111.2<16,16,1>UB g111.3<16,16,1>UB {align1};
+add (16) g42.0<1>UW g112.2<16,16,1>UB g112.3<16,16,1>UB {align1};
+add (16) g43.0<1>UW g113.2<16,16,1>UB g113.3<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.2<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.2<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.2<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.2<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.2<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.2<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.2<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.2<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.2<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.2<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.2<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.2<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.2<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.2<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.2<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.2<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.3<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.3<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.3<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.3<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.3<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.3<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.3<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.3<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.3<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.3<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.3<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.3<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.3<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.3<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.3<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.3<16,16,1>UB {align1};
+jmpi out;
+add (16) g28.0<1>UW g98.3<16,16,1>UB g98.4<16,16,1>UB {align1};
+add (16) g29.0<1>UW g99.3<16,16,1>UB g99.4<16,16,1>UB {align1};
+add (16) g30.0<1>UW g100.3<16,16,1>UB g100.4<16,16,1>UB {align1};
+add (16) g31.0<1>UW g101.3<16,16,1>UB g101.4<16,16,1>UB {align1};
+add (16) g32.0<1>UW g102.3<16,16,1>UB g102.4<16,16,1>UB {align1};
+add (16) g33.0<1>UW g103.3<16,16,1>UB g103.4<16,16,1>UB {align1};
+add (16) g34.0<1>UW g104.3<16,16,1>UB g104.4<16,16,1>UB {align1};
+add (16) g35.0<1>UW g105.3<16,16,1>UB g105.4<16,16,1>UB {align1};
+add (16) g36.0<1>UW g106.3<16,16,1>UB g106.4<16,16,1>UB {align1};
+add (16) g37.0<1>UW g107.3<16,16,1>UB g107.4<16,16,1>UB {align1};
+add (16) g38.0<1>UW g108.3<16,16,1>UB g108.4<16,16,1>UB {align1};
+add (16) g39.0<1>UW g109.3<16,16,1>UB g109.4<16,16,1>UB {align1};
+add (16) g40.0<1>UW g110.3<16,16,1>UB g110.4<16,16,1>UB {align1};
+add (16) g41.0<1>UW g111.3<16,16,1>UB g111.4<16,16,1>UB {align1};
+add (16) g42.0<1>UW g112.3<16,16,1>UB g112.4<16,16,1>UB {align1};
+add (16) g43.0<1>UW g113.3<16,16,1>UB g113.4<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.3<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.3<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.3<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.3<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.3<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.3<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.3<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.3<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.3<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.3<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.3<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.3<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.3<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.3<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.3<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.3<16,16,1>UB {align1};
+
+add (16) g28.0<1>UW g28.0<16,16,1>UW g99.4<16,16,1>UB {align1};
+add (16) g29.0<1>UW g29.0<16,16,1>UW g100.4<16,16,1>UB {align1};
+add (16) g30.0<1>UW g30.0<16,16,1>UW g101.4<16,16,1>UB {align1};
+add (16) g31.0<1>UW g31.0<16,16,1>UW g102.4<16,16,1>UB {align1};
+add (16) g32.0<1>UW g32.0<16,16,1>UW g103.4<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g104.4<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g105.4<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g106.4<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g107.4<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g108.4<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g109.4<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g110.4<16,16,1>UB {align1};
+add (16) g40.0<1>UW g40.0<16,16,1>UW g111.4<16,16,1>UB {align1};
+add (16) g41.0<1>UW g41.0<16,16,1>UW g112.4<16,16,1>UB {align1};
+add (16) g42.0<1>UW g42.0<16,16,1>UW g113.4<16,16,1>UB {align1};
+add (16) g43.0<1>UW g43.0<16,16,1>UW g120.4<16,16,1>UB {align1};
+
+out:
+shr.sat (16) g28.0<1>UW g28.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g29.0<1>UW g29.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g30.0<1>UW g30.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g31.0<1>UW g31.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g32.0<1>UW g32.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g33.0<1>UW g33.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g34.0<1>UW g34.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g35.0<1>UW g35.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g36.0<1>UW g36.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g37.0<1>UW g37.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g38.0<1>UW g38.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g39.0<1>UW g39.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g40.0<1>UW g40.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g41.0<1>UW g41.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g42.0<1>UW g42.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g43.0<1>UW g43.0<16,16,1>UW 2UW {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,92 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+and.nz (1) null g32.16<1,1,1>UW 1UW {align1};
+(f0) jmpi read_backward;
+
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g54.0<1>UW g32<8,8,1>UW read(4, 2, 0, 2) mlen 1 rlen 1 {align1};
+jmpi put_data;
+
+read_backward:
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g54.0<1>UW g32<8,8,1>UW read(7, 2, 0, 2) mlen 1 rlen 1 {align1};
+
+put_data:
+add (16) g58.0<1>UW g38.0<16,16,1>UB g38.1<16,16,1>UB {align1};
+add (16) g59.0<1>UW g39.0<16,16,1>UB g39.1<16,16,1>UB {align1};
+add (16) g60.0<1>UW g40.0<16,16,1>UB g40.1<16,16,1>UB {align1};
+add (16) g61.0<1>UW g41.0<16,16,1>UB g41.1<16,16,1>UB {align1};
+add (16) g62.0<1>UW g42.0<16,16,1>UB g42.1<16,16,1>UB {align1};
+add (16) g63.0<1>UW g43.0<16,16,1>UB g43.1<16,16,1>UB {align1};
+add (16) g64.0<1>UW g44.0<16,16,1>UB g44.1<16,16,1>UB {align1};
+add (16) g65.0<1>UW g45.0<16,16,1>UB g45.1<16,16,1>UB {align1};
+add (16) g66.0<1>UW g46.0<16,16,1>UB g46.1<16,16,1>UB {align1};
+add (16) g67.0<1>UW g47.0<16,16,1>UB g47.1<16,16,1>UB {align1};
+add (16) g68.0<1>UW g48.0<16,16,1>UB g48.1<16,16,1>UB {align1};
+add (16) g69.0<1>UW g49.0<16,16,1>UB g49.1<16,16,1>UB {align1};
+add (16) g70.0<1>UW g50.0<16,16,1>UB g50.1<16,16,1>UB {align1};
+add (16) g71.0<1>UW g51.0<16,16,1>UB g51.1<16,16,1>UB {align1};
+add (16) g72.0<1>UW g52.0<16,16,1>UB g52.1<16,16,1>UB {align1};
+add (16) g73.0<1>UW g53.0<16,16,1>UB g53.1<16,16,1>UB {align1};
+
+add (16) g58.0<1>UW g58.0<16,16,1>UW g39.0<16,16,1>UB {align1};
+add (16) g59.0<1>UW g59.0<16,16,1>UW g40.0<16,16,1>UB {align1};
+add (16) g60.0<1>UW g60.0<16,16,1>UW g41.0<16,16,1>UB {align1};
+add (16) g61.0<1>UW g61.0<16,16,1>UW g42.0<16,16,1>UB {align1};
+add (16) g62.0<1>UW g62.0<16,16,1>UW g43.0<16,16,1>UB {align1};
+add (16) g63.0<1>UW g63.0<16,16,1>UW g44.0<16,16,1>UB {align1};
+add (16) g64.0<1>UW g64.0<16,16,1>UW g45.0<16,16,1>UB {align1};
+add (16) g65.0<1>UW g65.0<16,16,1>UW g46.0<16,16,1>UB {align1};
+add (16) g66.0<1>UW g66.0<16,16,1>UW g47.0<16,16,1>UB {align1};
+add (16) g67.0<1>UW g67.0<16,16,1>UW g48.0<16,16,1>UB {align1};
+add (16) g68.0<1>UW g68.0<16,16,1>UW g49.0<16,16,1>UB {align1};
+add (16) g69.0<1>UW g69.0<16,16,1>UW g50.0<16,16,1>UB {align1};
+add (16) g70.0<1>UW g70.0<16,16,1>UW g51.0<16,16,1>UB {align1};
+add (16) g71.0<1>UW g71.0<16,16,1>UW g52.0<16,16,1>UB {align1};
+add (16) g72.0<1>UW g72.0<16,16,1>UW g53.0<16,16,1>UB {align1};
+add (16) g73.0<1>UW g73.0<16,16,1>UW g54.0<16,16,1>UB {align1};
+
+add (16) g58.0<1>UW g58.0<16,16,1>UW g39.1<16,16,1>UB {align1};
+add (16) g59.0<1>UW g59.0<16,16,1>UW g40.1<16,16,1>UB {align1};
+add (16) g60.0<1>UW g60.0<16,16,1>UW g41.1<16,16,1>UB {align1};
+add (16) g61.0<1>UW g61.0<16,16,1>UW g42.1<16,16,1>UB {align1};
+add (16) g62.0<1>UW g62.0<16,16,1>UW g43.1<16,16,1>UB {align1};
+add (16) g63.0<1>UW g63.0<16,16,1>UW g44.1<16,16,1>UB {align1};
+add (16) g64.0<1>UW g64.0<16,16,1>UW g45.1<16,16,1>UB {align1};
+add (16) g65.0<1>UW g65.0<16,16,1>UW g46.1<16,16,1>UB {align1};
+add (16) g66.0<1>UW g66.0<16,16,1>UW g47.1<16,16,1>UB {align1};
+add (16) g67.0<1>UW g67.0<16,16,1>UW g48.1<16,16,1>UB {align1};
+add (16) g68.0<1>UW g68.0<16,16,1>UW g49.1<16,16,1>UB {align1};
+add (16) g69.0<1>UW g69.0<16,16,1>UW g50.1<16,16,1>UB {align1};
+add (16) g70.0<1>UW g70.0<16,16,1>UW g51.1<16,16,1>UB {align1};
+add (16) g71.0<1>UW g71.0<16,16,1>UW g52.1<16,16,1>UB {align1};
+add (16) g72.0<1>UW g72.0<16,16,1>UW g53.1<16,16,1>UB {align1};
+add (16) g73.0<1>UW g73.0<16,16,1>UW g54.1<16,16,1>UB {align1};
+
+shr (32) g58.0<1>UW g58.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g60.0<1>UW g60.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g62.0<1>UW g62.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g64.0<1>UW g64.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g66.0<1>UW g66.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g68.0<1>UW g68.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g70.0<1>UW g70.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g72.0<1>UW g72.0<16,16,1>UW 2UW {align1 compr};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/addidct.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/addidct.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/addidct.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/addidct.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,152 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (2) g31.0<1>UD g82.12<2,2,1>UW {align1};          //restore x and y
+
+and.nz (1) null g82.2<1,1,1>UW 0x20UW {align1};       //dct_type
+(f0) jmpi field_dct;
+
+add (16) g58.0<1>W g83.0<16,16,1>W g58.0<16,16,2>UB {align1};
+add (16) g59.0<1>W g84.0<16,16,1>W g59.0<16,16,2>UB {align1};
+add (16) g60.0<1>W g85.0<16,16,1>W g60.0<16,16,2>UB {align1};
+add (16) g61.0<1>W g86.0<16,16,1>W g61.0<16,16,2>UB {align1};
+add (16) g62.0<1>W g87.0<16,16,1>W g62.0<16,16,2>UB {align1};
+add (16) g63.0<1>W g88.0<16,16,1>W g63.0<16,16,2>UB {align1};
+add (16) g64.0<1>W g89.0<16,16,1>W g64.0<16,16,2>UB {align1};
+add (16) g65.0<1>W g90.0<16,16,1>W g65.0<16,16,2>UB {align1};
+add (16) g66.0<1>W g91.0<16,16,1>W g66.0<16,16,2>UB {align1};
+add (16) g67.0<1>W g92.0<16,16,1>W g67.0<16,16,2>UB {align1};
+add (16) g68.0<1>W g93.0<16,16,1>W g68.0<16,16,2>UB {align1};
+add (16) g69.0<1>W g94.0<16,16,1>W g69.0<16,16,2>UB {align1};
+add (16) g70.0<1>W g95.0<16,16,1>W g70.0<16,16,2>UB {align1};
+add (16) g71.0<1>W g96.0<16,16,1>W g71.0<16,16,2>UB {align1};
+add (16) g72.0<1>W g97.0<16,16,1>W g72.0<16,16,2>UB {align1};
+add (16) g73.0<1>W g98.0<16,16,1>W g73.0<16,16,2>UB {align1};
+jmpi write_back;
+
+field_dct:
+add (16) g58.0<1>W g83.0<16,16,1>W g58.0<16,16,2>UB {align1};
+add (16) g59.0<1>W g91.0<16,16,1>W g59.0<16,16,2>UB {align1};
+add (16) g60.0<1>W g84.0<16,16,1>W g60.0<16,16,2>UB {align1};
+add (16) g61.0<1>W g92.0<16,16,1>W g61.0<16,16,2>UB {align1};
+add (16) g62.0<1>W g85.0<16,16,1>W g62.0<16,16,2>UB {align1};
+add (16) g63.0<1>W g93.0<16,16,1>W g63.0<16,16,2>UB {align1};
+add (16) g64.0<1>W g86.0<16,16,1>W g64.0<16,16,2>UB {align1};
+add (16) g65.0<1>W g94.0<16,16,1>W g65.0<16,16,2>UB {align1};
+add (16) g66.0<1>W g87.0<16,16,1>W g66.0<16,16,2>UB {align1};
+add (16) g67.0<1>W g95.0<16,16,1>W g67.0<16,16,2>UB {align1};
+add (16) g68.0<1>W g88.0<16,16,1>W g68.0<16,16,2>UB {align1};
+add (16) g69.0<1>W g96.0<16,16,1>W g69.0<16,16,2>UB {align1};
+add (16) g70.0<1>W g89.0<16,16,1>W g70.0<16,16,2>UB {align1};
+add (16) g71.0<1>W g97.0<16,16,1>W g71.0<16,16,2>UB {align1};
+add (16) g72.0<1>W g90.0<16,16,1>W g72.0<16,16,2>UB {align1};
+add (16) g73.0<1>W g98.0<16,16,1>W g73.0<16,16,2>UB {align1};
+
+write_back:
+mov (1) g31.8<1>UD 0x00F000FUD {align1};
+mov.sat (16) g58.0<2>UB g58.0<16,16,1>W {align1};
+mov.sat (16) g59.0<2>UB g59.0<16,16,1>W {align1};
+mov.sat (16) g60.0<2>UB g60.0<16,16,1>W {align1};
+mov.sat (16) g61.0<2>UB g61.0<16,16,1>W {align1};
+mov.sat (16) g62.0<2>UB g62.0<16,16,1>W {align1};
+mov.sat (16) g63.0<2>UB g63.0<16,16,1>W {align1};
+mov.sat (16) g64.0<2>UB g64.0<16,16,1>W {align1};
+mov.sat (16) g65.0<2>UB g65.0<16,16,1>W {align1};
+mov.sat (16) g66.0<2>UB g66.0<16,16,1>W {align1};
+mov.sat (16) g67.0<2>UB g67.0<16,16,1>W {align1};
+mov.sat (16) g68.0<2>UB g68.0<16,16,1>W {align1};
+mov.sat (16) g69.0<2>UB g69.0<16,16,1>W {align1};
+mov.sat (16) g70.0<2>UB g70.0<16,16,1>W {align1};
+mov.sat (16) g71.0<2>UB g71.0<16,16,1>W {align1};
+mov.sat (16) g72.0<2>UB g72.0<16,16,1>W {align1};
+mov.sat (16) g73.0<2>UB g73.0<16,16,1>W {align1};
+
+mov (16) m1.0<1>UB  g58.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g59.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g60.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g61.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB  g62.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g63.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB  g64.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g65.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB  g66.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g67.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB  g68.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g69.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB  g70.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g71.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB  g72.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g73.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(0,0,2,0) mlen 9 rlen 0 {align1};
+
+//U
+mov (1) g31.8<1>UD 0x0070007UD  { align1 };
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1D {align1};
+add (16) g74.0<1>W g99.0<16,16,1>W g74.0<16,16,1>UW {align1};
+add (16) g75.0<1>W g100.0<16,16,1>W g75.0<16,16,1>UW {align1};
+add (16) g76.0<1>W g101.0<16,16,1>W g76.0<16,16,1>UW {align1};
+add (16) g77.0<1>W g102.0<16,16,1>W g77.0<16,16,1>UW {align1};
+mov.sat (16) g74.0<2>UB g74.0<16,16,1>W {align1};
+mov.sat (16) g75.0<2>UB g75.0<16,16,1>W {align1};
+mov.sat (16) g76.0<2>UB g76.0<16,16,1>W {align1};
+mov.sat (16) g77.0<2>UB g77.0<16,16,1>W {align1};
+
+mov (16) m1.0<1>UB g74.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g75.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g76.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g77.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+//V
+add (16) g78.0<1>UW g103.0<16,16,1>W g78.0<16,16,1>UW {align1};
+add (16) g79.0<1>UW g104.0<16,16,1>W g79.0<16,16,1>UW {align1};
+add (16) g80.0<1>UW g105.0<16,16,1>W g80.0<16,16,1>UW {align1};
+add (16) g81.0<1>UW g106.0<16,16,1>W g81.0<16,16,1>UW {align1};
+mov.sat (16) g78.0<2>UB g78.0<16,16,1>W {align1};
+mov.sat (16) g79.0<2>UB g79.0<16,16,1>W {align1};
+mov.sat (16) g80.0<2>UB g80.0<16,16,1>W {align1};
+mov.sat (16) g81.0<2>UB g81.0<16,16,1>W {align1};
+
+mov (16) m1.0<1>UB g78.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g79.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB g80.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g81.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+send (16) 0 acc0<1>UW g0<8,8,1>UW
+        thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_intra.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_intra.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_intra.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_intra.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table 
+   g112~g115: intra IQ matrix in UW format (in order to use instruction compress), copys from g1~g2
+   g[a0.0]:DCT data of a block
+   g125:   ip before jump
+   if(v==0 && u==0 && intra_mb) 
+        F''[v][u] = QF[v][u] * intra_dc_mult
+   else 
+        F''[v][u] = (QF[v][u]*W[w][v][u]*quantiser_scale*2)/32       
+*/
+DO_IQ_INTRA:
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mov (1) g111.0<1>W g[a0.0]<1,1,1>W  {align1};
+mul (16) g116.0<1>D g[a0.0]<8,8,1>W g112.0<8,8,1>UW {align1 compr};
+mul (16) g116.0<1>D g116.0<8,8,1>D g109.0<8,8,0>UW {align1 compr};
+asr (16) g116.0<1>D g116.0<8,8,1>D 4UW {align1 compr};
+mul (1) g116.0<1>D g111<1,1,1>W g109.4<1,1,1>UW {align1};  //intra_dc_mult
+
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mul (16) g118.0<1>D g[a0.0]<8,8,1>W g113.0<8,8,1>UW {align1 compr};
+mul (16) g118.0<1>D g118.0<8,8,1>D g109.0<8,8,0>UW {align1 compr};
+asr (16) g118.0<1>D g118.0<8,8,1>D 4UW {align1 compr};
+
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mul (16) g120.0<1>D g[a0.0]<8,8,1>W g114.0<8,8,1>UW {align1 compr};
+mul (16) g120.0<1>D g120.0<8,8,1>D g109.0<8,8,0>UW {align1 compr};
+asr (16) g120.0<1>D g120.0<8,8,1>D 4UW {align1 compr};
+
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mul (16) g122.0<1>D g[a0.0]<8,8,1>W g115.0<8,8,1>UW {align1 compr};
+mul (16) g122.0<1>D g122.0<8,8,1>D g109.0<8,8,0>UW {align1 compr};
+asr (16) g122.0<1>D g122.0<8,8,1>D 4UW {align1 compr};
+
+add (1) ip g125.0<1,1,1>UD 0x20UD {align1};            //jump back
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_non_intra.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_non_intra.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_non_intra.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/do_iq_non_intra.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table 
+   g112~g115: intra IQ matrix in UW format (in order to use instruction compress), copys from g1~g2
+   g[a0.0]:DCT data of a block
+   g125:   ip before jump
+   F''[v][u]=(((QF[v][u]*2)+Sign(QF[v][u])) * W[w][v][u] * quantiser_scale)/32;  
+*/
+DO_IQ_NON_INTRA:
+add (1)  a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mul (16) g116.0<1>D g[a0.0]<8,8,1>W g112.0<8,8,1>UW {align1 compr};
+mul (16) g116.0<1>D g116.0<8,8,1>D  g109.0<8,8,0>UW {align1 compr};
+asr (16) g116.0<1>D g116.0<8,8,1>D  4UW {align1 compr};
+
+add (1)  a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mul (16) g118.0<1>D g[a0.0]<8,8,1>W g113.0<8,8,1>UW {align1 compr};
+mul (16) g118.0<1>D g118.0<8,8,1>D  g109.0<8,8,0>UW {align1 compr};
+asr (16) g118.0<1>D g118.0<8,8,1>D  4UW {align1 compr};
+
+add (1)  a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mul (16) g120.0<1>D g[a0.0]<8,8,1>W g114.0<8,8,1>UW {align1 compr};
+mul (16) g120.0<1>D g120.0<8,8,1>D  g109.0<8,8,0>UW {align1 compr};
+asr (16) g120.0<1>D g120.0<8,8,1>D  4UW {align1 compr};
+
+add (1)  a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+mul (16) g122.0<1>D g[a0.0]<8,8,1>W g115.0<8,8,1>UW {align1 compr};
+mul (16) g122.0<1>D g122.0<8,8,1>D  g109.0<8,8,0>UW {align1 compr};
+asr (16) g122.0<1>D g122.0<8,8,1>D  4UW {align1 compr};
+
+add (1) ip g125.0<1,1,1>UD 0x20UD {align1};            //jump back
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov(2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+mov (1) g126.8<1>UD ip {align1};
+mov (1) ip g21.0<1,1,1>UD {align1};
+
+/*field 0 of Y*/
+asr (2) g31.14<1>W g82.20<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x2000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`7')
+define(`mv1',`g82.20')
+define(`mv2',`g82.22')
+include(`motion_field_y.g4i')
+mov (8) g58.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g68.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g70.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g72.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 1 of Y*/
+asr (2) g31.14<1>W g82.28<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x8000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`7')
+define(`mv1',`g82.28')
+define(`mv2',`g82.30')
+include(`motion_field_y.g4i')
+mov (8) g59.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g69.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g71.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g73.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 0 of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g82.20<1>W g82.20<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.20<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x2000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u', `8')
+define(`surface_v', `9')
+define(`mv1',`g82.20')
+define(`mv2',`g82.22')
+include(`motion_field_uv.g4i')
+mov (8) g74.0<1>UW g32.0<8,8,1>UW {align1};
+mov (8) g75.0<1>UW g33.0<8,8,1>UW {align1};
+mov (8) g76.0<1>UW g34.0<8,8,1>UW {align1};
+mov (8) g77.0<1>UW g35.0<8,8,1>UW {align1};
+mov (8) g78.0<1>UW g36.0<8,8,1>UW {align1};
+mov (8) g79.0<1>UW g37.0<8,8,1>UW {align1};
+mov (8) g80.0<1>UW g38.0<8,8,1>UW {align1};
+mov (8) g81.0<1>UW g39.0<8,8,1>UW {align1};
+
+/*field 1 of UV*/
+asr (2) g82.28<1>W g82.28<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.28<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x8000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g82.28')
+define(`mv2',`g82.30')
+include(`motion_field_uv.g4i')
+mov (8) g74.16<1>UW g32.0<8,8,1>UW {align1};
+mov (8) g75.16<1>UW g33.0<8,8,1>UW {align1};
+mov (8) g76.16<1>UW g34.0<8,8,1>UW {align1};
+mov (8) g77.16<1>UW g35.0<8,8,1>UW {align1};
+mov (8) g78.16<1>UW g36.0<8,8,1>UW {align1};
+mov (8) g79.16<1>UW g37.0<8,8,1>UW {align1};
+mov (8) g80.16<1>UW g38.0<8,8,1>UW {align1};
+mov (8) g81.16<1>UW g39.0<8,8,1>UW {align1};
+
+include(`addidct.g4i')
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,553 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a543dad, 0x00450a54, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29a00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29e00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a200129, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x2a5c3dad, 0x00450a5c, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29b00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29f00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a300129, 0x008d04e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_backward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,553 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a543dad, 0x00450a54, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29a00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29e00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a200129, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x2a5c3dad, 0x00450a5c, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29b00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29f00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a300129, 0x008d04e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,213 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov(2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+mov (1) g126.8<1>UD ip {align1};
+mov (1) ip g21.0<1,1,1>UD {align1};
+
+/*field 0 forward prediction of Y*/
+asr (2) g31.14<1>W g82.16<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x1000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`4')
+define(`mv1',`g82.16')
+define(`mv2',`g82.18')
+include(`motion_field_y.g4i')
+mov (8) g58.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g68.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g70.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g72.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 1 forward prediction of Y*/
+asr (2) g31.14<1>W g82.24<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x4000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`4')
+define(`mv1',`g82.24')
+define(`mv2',`g82.26')
+include(`motion_field_y.g4i')
+mov (8) g59.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g69.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g71.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g73.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 0 forward prediction of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g82.16<1>W g82.16<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.16<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x1000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u', `5')
+define(`surface_v', `6')
+define(`mv1',`g82.16')
+define(`mv2',`g82.18')
+include(`motion_field_uv.g4i')
+mov (8) g74.0<1>UW g32.0<8,8,1>UW {align1};
+mov (8) g75.0<1>UW g33.0<8,8,1>UW {align1};
+mov (8) g76.0<1>UW g34.0<8,8,1>UW {align1};
+mov (8) g77.0<1>UW g35.0<8,8,1>UW {align1};
+mov (8) g78.0<1>UW g36.0<8,8,1>UW {align1};
+mov (8) g79.0<1>UW g37.0<8,8,1>UW {align1};
+mov (8) g80.0<1>UW g38.0<8,8,1>UW {align1};
+mov (8) g81.0<1>UW g39.0<8,8,1>UW {align1};
+
+/*field 1 forward prediction of UV*/
+asr (2) g82.24<1>W g82.24<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.24<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x4000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g82.24')
+define(`mv2',`g82.26')
+include(`motion_field_uv.g4i')
+mov (8) g74.16<1>UW g32.0<8,8,1>UW {align1};
+mov (8) g75.16<1>UW g33.0<8,8,1>UW {align1};
+mov (8) g76.16<1>UW g34.0<8,8,1>UW {align1};
+mov (8) g77.16<1>UW g35.0<8,8,1>UW {align1};
+mov (8) g78.16<1>UW g36.0<8,8,1>UW {align1};
+mov (8) g79.16<1>UW g37.0<8,8,1>UW {align1};
+mov (8) g80.16<1>UW g38.0<8,8,1>UW {align1};
+mov (8) g81.16<1>UW g39.0<8,8,1>UW {align1};
+
+/*field 0 backward prediction of Y*/
+mov(2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+
+asr (2) g31.14<1>W g82.20<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x2000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`7')
+define(`mv1',`g82.20')
+define(`mv2',`g82.22')
+include(`motion_field_y.g4i')
+avg.sat (16) g58.0<1>UW g58.0<16,16,1>UW g32.0<16,16,1>UW {align1};
+avg.sat (16) g60.0<1>UW g60.0<16,16,1>UW g33.0<16,16,1>UW {align1};
+avg.sat (16) g62.0<1>UW g62.0<16,16,1>UW g34.0<16,16,1>UW {align1};
+avg.sat (16) g64.0<1>UW g64.0<16,16,1>UW g35.0<16,16,1>UW {align1};
+avg.sat (16) g66.0<1>UW g66.0<16,16,1>UW g36.0<16,16,1>UW {align1};
+avg.sat (16) g68.0<1>UW g68.0<16,16,1>UW g37.0<16,16,1>UW {align1};
+avg.sat (16) g70.0<1>UW g70.0<16,16,1>UW g38.0<16,16,1>UW {align1};
+avg.sat (16) g72.0<1>UW g72.0<16,16,1>UW g39.0<16,16,1>UW {align1};
+
+/*field 1 backward prediction of Y*/
+asr (2) g31.14<1>W g82.28<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x8000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`7')
+define(`mv1',`g82.28')
+define(`mv2',`g82.30')
+include(`motion_field_y.g4i')
+avg.sat (16) g59.0<1>UW g59.0<16,16,1>UW g32.0<16,16,1>UW {align1};
+avg.sat (16) g61.0<1>UW g61.0<16,16,1>UW g33.0<16,16,1>UW {align1};
+avg.sat (16) g63.0<1>UW g63.0<16,16,1>UW g34.0<16,16,1>UW {align1};
+avg.sat (16) g65.0<1>UW g65.0<16,16,1>UW g35.0<16,16,1>UW {align1};
+avg.sat (16) g67.0<1>UW g67.0<16,16,1>UW g36.0<16,16,1>UW {align1};
+avg.sat (16) g69.0<1>UW g69.0<16,16,1>UW g37.0<16,16,1>UW {align1};
+avg.sat (16) g71.0<1>UW g71.0<16,16,1>UW g38.0<16,16,1>UW {align1};
+avg.sat (16) g73.0<1>UW g73.0<16,16,1>UW g39.0<16,16,1>UW {align1};
+
+/*field 0 backward prediction of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g82.20<1>W g82.20<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.20<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x2000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u', `8')
+define(`surface_v', `9')
+define(`mv1',`g82.20')
+define(`mv2',`g82.22')
+include(`motion_field_uv.g4i')
+avg.sat (8) g74.0<1>UW g74.0<8,8,1>UW g32.0<8,8,1>UW {align1};
+avg.sat (8) g75.0<1>UW g75.0<8,8,1>UW g33.0<8,8,1>UW {align1};
+avg.sat (8) g76.0<1>UW g76.0<8,8,1>UW g34.0<8,8,1>UW {align1};
+avg.sat (8) g77.0<1>UW g77.0<8,8,1>UW g35.0<8,8,1>UW {align1};
+avg.sat (8) g78.0<1>UW g78.0<8,8,1>UW g36.0<8,8,1>UW {align1};
+avg.sat (8) g79.0<1>UW g79.0<8,8,1>UW g37.0<8,8,1>UW {align1};
+avg.sat (8) g80.0<1>UW g80.0<8,8,1>UW g38.0<8,8,1>UW {align1};
+avg.sat (8) g81.0<1>UW g81.0<8,8,1>UW g39.0<8,8,1>UW {align1};
+
+/*field 1 backward prediction of UV*/
+asr (2) g82.28<1>W g82.28<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.28<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x8000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g82.28')
+define(`mv2',`g82.30')
+include(`motion_field_uv.g4i')
+avg.sat (8) g74.16<1>UW g74.16<8,8,1>UW g32.0<8,8,1>UW {align1};
+avg.sat (8) g75.16<1>UW g75.16<8,8,1>UW g33.0<8,8,1>UW {align1};
+avg.sat (8) g76.16<1>UW g76.16<8,8,1>UW g34.0<8,8,1>UW {align1};
+avg.sat (8) g77.16<1>UW g77.16<8,8,1>UW g35.0<8,8,1>UW {align1};
+avg.sat (8) g78.16<1>UW g78.16<8,8,1>UW g36.0<8,8,1>UW {align1};
+avg.sat (8) g79.16<1>UW g79.16<8,8,1>UW g37.0<8,8,1>UW {align1};
+avg.sat (8) g80.16<1>UW g80.16<8,8,1>UW g38.0<8,8,1>UW {align1};
+avg.sat (8) g81.16<1>UW g81.16<8,8,1>UW g39.0<8,8,1>UW {align1};
+
+include(`addidct.g4i')
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1007 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a503dad, 0x00450a50, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29a00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29e00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a200129, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x2a583dad, 0x00450a58, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29b00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29f00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a300129, 0x008d04e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x80800042, 0x27402529, 0x00b10740, 0x00b10400 },
+   { 0x80800042, 0x27802529, 0x00b10780, 0x00b10420 },
+   { 0x80800042, 0x27c02529, 0x00b107c0, 0x00b10440 },
+   { 0x80800042, 0x28002529, 0x00b10800, 0x00b10460 },
+   { 0x80800042, 0x28402529, 0x00b10840, 0x00b10480 },
+   { 0x80800042, 0x28802529, 0x00b10880, 0x00b104a0 },
+   { 0x80800042, 0x28c02529, 0x00b108c0, 0x00b104c0 },
+   { 0x80800042, 0x29002529, 0x00b10900, 0x00b104e0 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x80800042, 0x27602529, 0x00b10760, 0x00b10400 },
+   { 0x80800042, 0x27a02529, 0x00b107a0, 0x00b10420 },
+   { 0x80800042, 0x27e02529, 0x00b107e0, 0x00b10440 },
+   { 0x80800042, 0x28202529, 0x00b10820, 0x00b10460 },
+   { 0x80800042, 0x28602529, 0x00b10860, 0x00b10480 },
+   { 0x80800042, 0x28a02529, 0x00b108a0, 0x00b104a0 },
+   { 0x80800042, 0x28e02529, 0x00b108e0, 0x00b104c0 },
+   { 0x80800042, 0x29202529, 0x00b10920, 0x00b104e0 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a543dad, 0x00450a54, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x80600042, 0x29402529, 0x008d0940, 0x008d0400 },
+   { 0x80600042, 0x29602529, 0x008d0960, 0x008d0420 },
+   { 0x80600042, 0x29802529, 0x008d0980, 0x008d0440 },
+   { 0x80600042, 0x29a02529, 0x008d09a0, 0x008d0460 },
+   { 0x80600042, 0x29c02529, 0x008d09c0, 0x008d0480 },
+   { 0x80600042, 0x29e02529, 0x008d09e0, 0x008d04a0 },
+   { 0x80600042, 0x2a002529, 0x008d0a00, 0x008d04c0 },
+   { 0x80600042, 0x2a202529, 0x008d0a20, 0x008d04e0 },
+   { 0x0020000c, 0x2a5c3dad, 0x00450a5c, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a008 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x80600042, 0x29502529, 0x008d0950, 0x008d0400 },
+   { 0x80600042, 0x29702529, 0x008d0970, 0x008d0420 },
+   { 0x80600042, 0x29902529, 0x008d0990, 0x008d0440 },
+   { 0x80600042, 0x29b02529, 0x008d09b0, 0x008d0460 },
+   { 0x80600042, 0x29d02529, 0x008d09d0, 0x008d0480 },
+   { 0x80600042, 0x29f02529, 0x008d09f0, 0x008d04a0 },
+   { 0x80600042, 0x2a102529, 0x008d0a10, 0x008d04c0 },
+   { 0x80600042, 0x2a302529, 0x008d0a30, 0x008d04e0 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_f_b.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1007 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a503dad, 0x00450a50, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29a00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29e00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a200129, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x2a583dad, 0x00450a58, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29b00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29f00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a300129, 0x008d04e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x80800042, 0x27402529, 0x00b10740, 0x00b10400 },
+   { 0x80800042, 0x27802529, 0x00b10780, 0x00b10420 },
+   { 0x80800042, 0x27c02529, 0x00b107c0, 0x00b10440 },
+   { 0x80800042, 0x28002529, 0x00b10800, 0x00b10460 },
+   { 0x80800042, 0x28402529, 0x00b10840, 0x00b10480 },
+   { 0x80800042, 0x28802529, 0x00b10880, 0x00b104a0 },
+   { 0x80800042, 0x28c02529, 0x00b108c0, 0x00b104c0 },
+   { 0x80800042, 0x29002529, 0x00b10900, 0x00b104e0 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a007 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a007 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a007 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x80800042, 0x27602529, 0x00b10760, 0x00b10400 },
+   { 0x80800042, 0x27a02529, 0x00b107a0, 0x00b10420 },
+   { 0x80800042, 0x27e02529, 0x00b107e0, 0x00b10440 },
+   { 0x80800042, 0x28202529, 0x00b10820, 0x00b10460 },
+   { 0x80800042, 0x28602529, 0x00b10860, 0x00b10480 },
+   { 0x80800042, 0x28a02529, 0x00b108a0, 0x00b104a0 },
+   { 0x80800042, 0x28e02529, 0x00b108e0, 0x00b104c0 },
+   { 0x80800042, 0x29202529, 0x00b10920, 0x00b104e0 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a543dad, 0x00450a54, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x20002000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a54, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a56, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x80600042, 0x29402529, 0x008d0940, 0x008d0400 },
+   { 0x80600042, 0x29602529, 0x008d0960, 0x008d0420 },
+   { 0x80600042, 0x29802529, 0x008d0980, 0x008d0440 },
+   { 0x80600042, 0x29a02529, 0x008d09a0, 0x008d0460 },
+   { 0x80600042, 0x29c02529, 0x008d09c0, 0x008d0480 },
+   { 0x80600042, 0x29e02529, 0x008d09e0, 0x008d04a0 },
+   { 0x80600042, 0x2a002529, 0x008d0a00, 0x008d04c0 },
+   { 0x80600042, 0x2a202529, 0x008d0a20, 0x008d04e0 },
+   { 0x0020000c, 0x2a5c3dad, 0x00450a5c, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a5c, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x80008000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a5c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a5e, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a009 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a008 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a009 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a008 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a009 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x80600042, 0x29502529, 0x008d0950, 0x008d0400 },
+   { 0x80600042, 0x29702529, 0x008d0970, 0x008d0420 },
+   { 0x80600042, 0x29902529, 0x008d0990, 0x008d0440 },
+   { 0x80600042, 0x29b02529, 0x008d09b0, 0x008d0460 },
+   { 0x80600042, 0x29d02529, 0x008d09d0, 0x008d0480 },
+   { 0x80600042, 0x29f02529, 0x008d09f0, 0x008d04a0 },
+   { 0x80600042, 0x2a102529, 0x008d0a10, 0x008d04c0 },
+   { 0x80600042, 0x2a302529, 0x008d0a30, 0x008d04e0 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,130 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+mov (1) g126.8<1>UD ip {align1};
+mov (1) ip g21.0<1,1,1>UD {align1};
+
+/*field 0 of Y*/
+asr (2) g31.14<1>W g82.16<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x1000UW {align1};             //motion vertical field select
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`4')
+define(`mv1',`g82.16')
+define(`mv2',`g82.18')
+include(`motion_field_y.g4i')
+mov (8) g58.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g60.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g62.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g64.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g66.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g68.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g70.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g72.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 1 of Y*/
+asr (2) g31.14<1>W g82.24<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x4000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface',`4')
+define(`mv1',`g82.24')
+define(`mv2',`g82.26')
+include(`motion_field_y.g4i')
+mov (8) g59.0<1>UD g32.0<8,8,1>UD {align1};
+mov (8) g61.0<1>UD g33.0<8,8,1>UD {align1};
+mov (8) g63.0<1>UD g34.0<8,8,1>UD {align1};
+mov (8) g65.0<1>UD g35.0<8,8,1>UD {align1};
+mov (8) g67.0<1>UD g36.0<8,8,1>UD {align1};
+mov (8) g69.0<1>UD g37.0<8,8,1>UD {align1};
+mov (8) g71.0<1>UD g38.0<8,8,1>UD {align1};
+mov (8) g73.0<1>UD g39.0<8,8,1>UD {align1};
+
+/*field 0 of UV*/
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g82.16<1>W g82.16<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.16<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x1000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u', `5')
+define(`surface_v', `6')
+define(`mv1',`g82.16')
+define(`mv2',`g82.18')
+include(`motion_field_uv.g4i')
+mov (8) g74.0<1>UW g32.0<8,8,1>UW {align1};
+mov (8) g75.0<1>UW g33.0<8,8,1>UW {align1};
+mov (8) g76.0<1>UW g34.0<8,8,1>UW {align1};
+mov (8) g77.0<1>UW g35.0<8,8,1>UW {align1};
+mov (8) g78.0<1>UW g36.0<8,8,1>UW {align1};
+mov (8) g79.0<1>UW g37.0<8,8,1>UW {align1};
+mov (8) g80.0<1>UW g38.0<8,8,1>UW {align1};
+mov (8) g81.0<1>UW g39.0<8,8,1>UW {align1};
+
+/*field 1 of UV*/
+asr (2) g82.24<1>W g82.24<2,2,1>W 1W {align1};
+asr (2) g31.14<1>W g82.24<2,2,1>W 1W {align1};
+shl (1) g31.16<1>W g31.16<1,1,1>W 1W {align1};
+add (2) g115.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g82.2<1,1,1>UW 0x4000UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u', `5')
+define(`surface_v', `6')
+define(`mv1',`g82.24')
+define(`mv2',`g82.26')
+include(`motion_field_uv.g4i')
+mov (8) g74.16<1>UW g32.0<8,8,1>UW {align1};
+mov (8) g75.16<1>UW g33.0<8,8,1>UW {align1};
+mov (8) g76.16<1>UW g34.0<8,8,1>UW {align1};
+mov (8) g77.16<1>UW g35.0<8,8,1>UW {align1};
+mov (8) g78.16<1>UW g36.0<8,8,1>UW {align1};
+mov (8) g79.16<1>UW g37.0<8,8,1>UW {align1};
+mov (8) g80.16<1>UW g38.0<8,8,1>UW {align1};
+mov (8) g81.16<1>UW g39.0<8,8,1>UW {align1};
+
+include(`addidct.g4i')
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,555 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x008d0e60, 0x0411a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a503dad, 0x00450a50, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29a00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29e00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a200129, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x2a583dad, 0x00450a58, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000032 },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0414a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001d },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x008d0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x008d0e60, 0x0414a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x008d0e60, 0x0411a005 },
+   { 0x00800031, 0x26201d29, 0x008d0e60, 0x0411a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x00ad0e60, 0x0414a005 },
+   { 0x00800031, 0x25a01d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29b00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29f00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a300129, 0x008d04e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/field_forward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,555 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27400021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27800021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27c00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28000021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28c00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29000021, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000008a },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00800040, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x00800040, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x00800040, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x00800040, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x00800040, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x00800040, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x00800040, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x00800040, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10501 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10541 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b10581 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b105c1 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10601 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10641 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b10681 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b106c1 },
+   { 0x00800040, 0x24004529, 0x00b10400, 0x00b10541 },
+   { 0x00800040, 0x24204529, 0x00b10420, 0x00b10581 },
+   { 0x00800040, 0x24404529, 0x00b10440, 0x00b105c1 },
+   { 0x00800040, 0x24604529, 0x00b10460, 0x00b10601 },
+   { 0x00800040, 0x24804529, 0x00b10480, 0x00b10641 },
+   { 0x00800040, 0x24a04529, 0x00b104a0, 0x00b10681 },
+   { 0x00800040, 0x24c04529, 0x00b104c0, 0x00b106c1 },
+   { 0x00800040, 0x24e04529, 0x00b104e0, 0x00b10701 },
+   { 0x00800008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00800008, 0x24202d29, 0x00b10420, 0x00020002 },
+   { 0x00800008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00800008, 0x24602d29, 0x00b10460, 0x00020002 },
+   { 0x00800008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00800008, 0x24a02d29, 0x00b104a0, 0x00020002 },
+   { 0x00800008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00800008, 0x24e02d29, 0x00b104e0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b106c1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
+   { 0x01000005, 0x20002dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x27001d29, 0x408d0e60, 0x0218a004 },
+   { 0x80800042, 0x24004629, 0x00b10500, 0x00b10540 },
+   { 0x80800042, 0x24204629, 0x00b10540, 0x00b10580 },
+   { 0x80800042, 0x24404629, 0x00b10580, 0x00b105c0 },
+   { 0x80800042, 0x24604629, 0x00b105c0, 0x00b10600 },
+   { 0x80800042, 0x24804629, 0x00b10600, 0x00b10640 },
+   { 0x80800042, 0x24a04629, 0x00b10640, 0x00b10680 },
+   { 0x80800042, 0x24c04629, 0x00b10680, 0x00b106c0 },
+   { 0x80800042, 0x24e04629, 0x00b106c0, 0x00b10700 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000026 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25401d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00800031, 0x25c01d29, 0x408d0e60, 0x0218a004 },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x26001d29, 0x408d0e60, 0x0288a004 },
+   { 0x00800001, 0x24000229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00b106c0, 0x00000000 },
+   { 0x00600001, 0x27600021, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x27a00021, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x27e00021, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x28a00021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28e00021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x29200021, 0x008d04e0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x2a503dad, 0x00450a50, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x10001000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a50, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a52, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29400129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29600129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29800129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29a00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29c00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29e00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a000129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a200129, 0x008d04e0, 0x00000000 },
+   { 0x0020000c, 0x2a583dad, 0x00450a58, 0x00010001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a58, 0x00010001 },
+   { 0x00000009, 0x23f03dad, 0x002103f0, 0x00010001 },
+   { 0x00200040, 0x2e603421, 0x004503e0, 0x004503ee },
+   { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x40004000 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20003dbc, 0x00210a58, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000064 },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800040, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800040, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800040, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800040, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0501 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0521 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0541 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0561 },
+   { 0x00800040, 0x24004529, 0x00ad0400, 0x00ad0521 },
+   { 0x00800040, 0x24204529, 0x00ad0420, 0x00ad0541 },
+   { 0x00800040, 0x24404529, 0x00ad0440, 0x00ad0561 },
+   { 0x00800040, 0x24604529, 0x00ad0460, 0x00ad0581 },
+   { 0x00800040, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800040, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800040, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800040, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05a1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05c1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad05e1 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0601 },
+   { 0x00800040, 0x24804529, 0x00ad0480, 0x00ad05c1 },
+   { 0x00800040, 0x24a04529, 0x00ad04a0, 0x00ad05e1 },
+   { 0x00800040, 0x24c04529, 0x00ad04c0, 0x00ad0601 },
+   { 0x00800040, 0x24e04529, 0x00ad04e0, 0x00ad0621 },
+   { 0x00a02008, 0x24002d29, 0x00b10400, 0x00020002 },
+   { 0x00a02008, 0x24402d29, 0x00b10440, 0x00020002 },
+   { 0x00a02008, 0x24802d29, 0x00b10480, 0x00020002 },
+   { 0x00a02008, 0x24c02d29, 0x00b104c0, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000052 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0248a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0501 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0521 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0541 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0561 },
+   { 0x00800042, 0x24804629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x24a04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x24c04629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x24e04629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000003a },
+   { 0x01000005, 0x20003dbc, 0x00210a5a, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x408d0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x408d0e60, 0x0248a006 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
+   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
+   { 0x00800031, 0x25801d29, 0x408d0e60, 0x0218a005 },
+   { 0x00800031, 0x26201d29, 0x408d0e60, 0x0218a006 },
+   { 0x00800042, 0x24004629, 0x00ad0500, 0x00ad0520 },
+   { 0x00800042, 0x24204629, 0x00ad0520, 0x00ad0540 },
+   { 0x00800042, 0x24404629, 0x00ad0540, 0x00ad0560 },
+   { 0x00800042, 0x24604629, 0x00ad0560, 0x00ad0580 },
+   { 0x00800042, 0x24804629, 0x00ad05a0, 0x00ad05c0 },
+   { 0x00800042, 0x24a04629, 0x00ad05c0, 0x00ad05e0 },
+   { 0x00800042, 0x24c04629, 0x00ad05e0, 0x00ad0600 },
+   { 0x00800042, 0x24e04629, 0x00ad0600, 0x00ad0620 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x25001d29, 0x40ad0e60, 0x0248a005 },
+   { 0x00800031, 0x25a01d29, 0x40ad0e60, 0x0248a006 },
+   { 0x00800001, 0x24000229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x24200229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x24400229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x24600229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x24800229, 0x00ad05a0, 0x00000000 },
+   { 0x00800001, 0x24a00229, 0x00ad05c0, 0x00000000 },
+   { 0x00800001, 0x24c00229, 0x00ad05e0, 0x00000000 },
+   { 0x00800001, 0x24e00229, 0x00ad0600, 0x00000000 },
+   { 0x00600001, 0x29500129, 0x008d0400, 0x00000000 },
+   { 0x00600001, 0x29700129, 0x008d0420, 0x00000000 },
+   { 0x00600001, 0x29900129, 0x008d0440, 0x00000000 },
+   { 0x00600001, 0x29b00129, 0x008d0460, 0x00000000 },
+   { 0x00600001, 0x29d00129, 0x008d0480, 0x00000000 },
+   { 0x00600001, 0x29f00129, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x2a100129, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x2a300129, 0x008d04e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov(2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+mov (1) g126.8<1>UD ip {align1};
+mov (1) ip g21.0<1,1,1>UD {align1};
+ 
+//Y, (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) 
+asr (2) g31.14<1>W g82.20<2,2,1>W 1W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+define(`input_surface',	`7')
+define(`mv1',	`g82.20')
+define(`mv2',	`g82.22') 
+include(`motion_frame_y.g4i')
+
+//UV, (x', y') = (x >> 1, y >> 1) + (motion_vector.x >> 2, motion_vector.y >> 2)
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g31.14<1>W g82.20<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+define(`input_surface1', `8')
+define(`input_surface2', `9')
+include(`motion_frame_uv.g4i')
+
+include(`addidct.g4i')
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,369 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005f },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a007 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a008 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a008 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a009 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0414a009 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000025 },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a008 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a008 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a009 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x008d0400, 0x0414a008 },
+   { 0x00800031, 0x25001d29, 0x008d0400, 0x0414a009 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_backward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,369 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000be },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000090 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a007 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a008 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a008 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a009 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0248a009 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a008 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a008 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a009 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x408d0400, 0x0248a008 },
+   { 0x00800031, 0x25001d29, 0x408d0400, 0x0248a009 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+mov (1) g126.8<1>UD ip {align1};
+mov (1) ip g21.0<1,1,1>UD {align1};
+
+//Y, Forward
+mov (1) g31.8<1>UD 0x0070007UD {align1};  
+define(`input_surface',	`4')
+define(`mv1',	`g82.16')
+define(`mv2',	`g82.18')
+asr (2) g31.14<1>W g82.16<2,2,1>W 1W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+include(`motion_frame_y.g4i')
+//Save Forward
+mov (16) g108.0<1>UD g58.0<16,16,1>UD {align1 compr};
+mov (16) g110.0<1>UD g60.0<16,16,1>UD {align1 compr};
+mov (16) g112.0<1>UD g62.0<16,16,1>UD {align1 compr};
+mov (16) g114.0<1>UD g64.0<16,16,1>UD {align1 compr};
+mov (16) g116.0<1>UD g66.0<16,16,1>UD {align1 compr};
+mov (16) g118.0<1>UD g68.0<16,16,1>UD {align1 compr};
+mov (16) g120.0<1>UD g70.0<16,16,1>UD {align1 compr};
+mov (16) g122.0<1>UD g72.0<16,16,1>UD {align1 compr};
+//Y, Backward
+define(`input_surface',	`7')
+define(`mv1',	`g82.20')
+define(`mv2',	`g82.22')  
+asr (2) g31.14<1>W g82.20<2,2,1>W 1W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+include(`motion_frame_y.g4i')
+//Average Forward and Backward
+avg.sat (16) g58.0<1>UW g58.0<16,16,1>UW g108.0<16,16,1>UW {align1};
+avg.sat (16) g59.0<1>UW g59.0<16,16,1>UW g109.0<16,16,1>UW {align1};
+avg.sat (16) g60.0<1>UW g60.0<16,16,1>UW g110.0<16,16,1>UW {align1};
+avg.sat (16) g61.0<1>UW g61.0<16,16,1>UW g111.0<16,16,1>UW {align1};
+avg.sat (16) g62.0<1>UW g62.0<16,16,1>UW g112.0<16,16,1>UW {align1};
+avg.sat (16) g63.0<1>UW g63.0<16,16,1>UW g113.0<16,16,1>UW {align1};
+avg.sat (16) g64.0<1>UW g64.0<16,16,1>UW g114.0<16,16,1>UW {align1};
+avg.sat (16) g65.0<1>UW g65.0<16,16,1>UW g115.0<16,16,1>UW {align1};
+avg.sat (16) g66.0<1>UW g66.0<16,16,1>UW g116.0<16,16,1>UW {align1};
+avg.sat (16) g67.0<1>UW g67.0<16,16,1>UW g117.0<16,16,1>UW {align1};
+avg.sat (16) g68.0<1>UW g68.0<16,16,1>UW g118.0<16,16,1>UW {align1};
+avg.sat (16) g69.0<1>UW g69.0<16,16,1>UW g119.0<16,16,1>UW {align1};
+avg.sat (16) g70.0<1>UW g70.0<16,16,1>UW g120.0<16,16,1>UW {align1};
+avg.sat (16) g71.0<1>UW g71.0<16,16,1>UW g121.0<16,16,1>UW {align1};
+avg.sat (16) g72.0<1>UW g72.0<16,16,1>UW g122.0<16,16,1>UW {align1};
+avg.sat (16) g73.0<1>UW g73.0<16,16,1>UW g123.0<16,16,1>UW {align1};
+
+//UV, Forward
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g31.14<1>W g82.16<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+define(`input_surface1', `5')
+define(`input_surface2', `6')
+mov (1) g32.8<1>UD 0x007000fUD  {align1};
+include(`motion_frame_uv.g4i')
+//Save UV Forward
+mov (16) g108.0<1>UB  g74.0<16,16,2>UB {align1};
+mov (16) g108.16<1>UB g75.0<16,16,2>UB {align1};
+mov (16) g109.0<1>UB  g76.0<16,16,2>UB {align1};
+mov (16) g109.16<1>UB g77.0<16,16,2>UB {align1};
+mov (16) g110.0<1>UB  g78.0<16,16,2>UB {align1};
+mov (16) g110.16<1>UB g79.0<16,16,2>UB {align1};
+mov (16) g111.0<1>UB  g80.0<16,16,2>UB {align1};
+mov (16) g111.16<1>UB g81.0<16,16,2>UB {align1};
+//UV, Backward
+asr (2) g31.14<1>W g82.20<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+define(`input_surface1', `8')
+define(`input_surface2', `9')
+include(`motion_frame_uv.g4i')
+//Average Forward and Backward
+avg.sat (16) g74.0<1>UW g74.0<16,16,1>UW g108.0<16,16,1>UB {align1};
+avg.sat (16) g75.0<1>UW g75.0<16,16,1>UW g108.16<16,16,1>UB {align1};
+avg.sat (16) g76.0<1>UW g76.0<16,16,1>UW g109.0<16,16,1>UB {align1};
+avg.sat (16) g77.0<1>UW g77.0<16,16,1>UW g109.16<16,16,1>UB {align1};
+avg.sat (16) g78.0<1>UW g78.0<16,16,1>UW g110.0<16,16,1>UB {align1};
+avg.sat (16) g79.0<1>UW g79.0<16,16,1>UW g110.16<16,16,1>UB {align1};
+avg.sat (16) g80.0<1>UW g80.0<16,16,1>UW g111.0<16,16,1>UB {align1};
+avg.sat (16) g81.0<1>UW g81.0<16,16,1>UW g111.16<16,16,1>UB {align1};
+
+include(`addidct.g4i')
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,675 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a50, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005f },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a004 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x00802001, 0x2d800021, 0x00b10740, 0x00000000 },
+   { 0x00802001, 0x2dc00021, 0x00b10780, 0x00000000 },
+   { 0x00802001, 0x2e000021, 0x00b107c0, 0x00000000 },
+   { 0x00802001, 0x2e400021, 0x00b10800, 0x00000000 },
+   { 0x00802001, 0x2e800021, 0x00b10840, 0x00000000 },
+   { 0x00802001, 0x2ec00021, 0x00b10880, 0x00000000 },
+   { 0x00802001, 0x2f000021, 0x00b108c0, 0x00000000 },
+   { 0x00802001, 0x2f400021, 0x00b10900, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005f },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a007 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a007 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x80800042, 0x27402529, 0x00b10740, 0x00b10d80 },
+   { 0x80800042, 0x27602529, 0x00b10760, 0x00b10da0 },
+   { 0x80800042, 0x27802529, 0x00b10780, 0x00b10dc0 },
+   { 0x80800042, 0x27a02529, 0x00b107a0, 0x00b10de0 },
+   { 0x80800042, 0x27c02529, 0x00b107c0, 0x00b10e00 },
+   { 0x80800042, 0x27e02529, 0x00b107e0, 0x00b10e20 },
+   { 0x80800042, 0x28002529, 0x00b10800, 0x00b10e40 },
+   { 0x80800042, 0x28202529, 0x00b10820, 0x00b10e60 },
+   { 0x80800042, 0x28402529, 0x00b10840, 0x00b10e80 },
+   { 0x80800042, 0x28602529, 0x00b10860, 0x00b10ea0 },
+   { 0x80800042, 0x28802529, 0x00b10880, 0x00b10ec0 },
+   { 0x80800042, 0x28a02529, 0x00b108a0, 0x00b10ee0 },
+   { 0x80800042, 0x28c02529, 0x00b108c0, 0x00b10f00 },
+   { 0x80800042, 0x28e02529, 0x00b108e0, 0x00b10f20 },
+   { 0x80800042, 0x29002529, 0x00b10900, 0x00b10f40 },
+   { 0x80800042, 0x29202529, 0x00b10920, 0x00b10f60 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a005 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a005 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a006 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0414a006 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000025 },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a005 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a005 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a006 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x008d0400, 0x0414a005 },
+   { 0x00800031, 0x25001d29, 0x008d0400, 0x0414a006 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x2d800231, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x2d900231, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x2da00231, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x2db00231, 0x00b209a0, 0x00000000 },
+   { 0x00800001, 0x2dc00231, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x2dd00231, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x2de00231, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x2df00231, 0x00b20a20, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a008 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a008 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a009 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0414a008 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0414a009 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000025 },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a008 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a008 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a009 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x008d0400, 0x0414a008 },
+   { 0x00800031, 0x25001d29, 0x008d0400, 0x0414a009 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x80800042, 0x29404529, 0x00b10940, 0x00b10d80 },
+   { 0x80800042, 0x29604529, 0x00b10960, 0x00b10d90 },
+   { 0x80800042, 0x29804529, 0x00b10980, 0x00b10da0 },
+   { 0x80800042, 0x29a04529, 0x00b109a0, 0x00b10db0 },
+   { 0x80800042, 0x29c04529, 0x00b109c0, 0x00b10dc0 },
+   { 0x80800042, 0x29e04529, 0x00b109e0, 0x00b10dd0 },
+   { 0x80800042, 0x2a004529, 0x00b10a00, 0x00b10de0 },
+   { 0x80800042, 0x2a204529, 0x00b10a20, 0x00b10df0 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_f_b.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,675 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a50, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000be },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000090 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a004 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x00802001, 0x2d800021, 0x00b10740, 0x00000000 },
+   { 0x00802001, 0x2dc00021, 0x00b10780, 0x00000000 },
+   { 0x00802001, 0x2e000021, 0x00b107c0, 0x00000000 },
+   { 0x00802001, 0x2e400021, 0x00b10800, 0x00000000 },
+   { 0x00802001, 0x2e800021, 0x00b10840, 0x00000000 },
+   { 0x00802001, 0x2ec00021, 0x00b10880, 0x00000000 },
+   { 0x00802001, 0x2f000021, 0x00b108c0, 0x00000000 },
+   { 0x00802001, 0x2f400021, 0x00b10900, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000be },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000090 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a007 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a007 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a007 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x80800042, 0x27402529, 0x00b10740, 0x00b10d80 },
+   { 0x80800042, 0x27602529, 0x00b10760, 0x00b10da0 },
+   { 0x80800042, 0x27802529, 0x00b10780, 0x00b10dc0 },
+   { 0x80800042, 0x27a02529, 0x00b107a0, 0x00b10de0 },
+   { 0x80800042, 0x27c02529, 0x00b107c0, 0x00b10e00 },
+   { 0x80800042, 0x27e02529, 0x00b107e0, 0x00b10e20 },
+   { 0x80800042, 0x28002529, 0x00b10800, 0x00b10e40 },
+   { 0x80800042, 0x28202529, 0x00b10820, 0x00b10e60 },
+   { 0x80800042, 0x28402529, 0x00b10840, 0x00b10e80 },
+   { 0x80800042, 0x28602529, 0x00b10860, 0x00b10ea0 },
+   { 0x80800042, 0x28802529, 0x00b10880, 0x00b10ec0 },
+   { 0x80800042, 0x28a02529, 0x00b108a0, 0x00b10ee0 },
+   { 0x80800042, 0x28c02529, 0x00b108c0, 0x00b10f00 },
+   { 0x80800042, 0x28e02529, 0x00b108e0, 0x00b10f20 },
+   { 0x80800042, 0x29002529, 0x00b10900, 0x00b10f40 },
+   { 0x80800042, 0x29202529, 0x00b10920, 0x00b10f60 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a005 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a005 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a006 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0248a006 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a005 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a005 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a006 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x408d0400, 0x0248a005 },
+   { 0x00800031, 0x25001d29, 0x408d0400, 0x0248a006 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x00800001, 0x2d800231, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x2d900231, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x2da00231, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x2db00231, 0x00b209a0, 0x00000000 },
+   { 0x00800001, 0x2dc00231, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x2dd00231, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x2de00231, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x2df00231, 0x00b20a20, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a54, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a54, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a008 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a008 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a009 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0248a008 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0248a009 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x01000005, 0x20000d3c, 0x00210a56, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a008 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a009 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a008 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a009 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x408d0400, 0x0248a008 },
+   { 0x00800031, 0x25001d29, 0x408d0400, 0x0248a009 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x80800042, 0x29404529, 0x00b10940, 0x00b10d80 },
+   { 0x80800042, 0x29604529, 0x00b10960, 0x00b10d90 },
+   { 0x80800042, 0x29804529, 0x00b10980, 0x00b10da0 },
+   { 0x80800042, 0x29a04529, 0x00b109a0, 0x00b10db0 },
+   { 0x80800042, 0x29c04529, 0x00b109c0, 0x00b10dc0 },
+   { 0x80800042, 0x29e04529, 0x00b109e0, 0x00b10dd0 },
+   { 0x80800042, 0x2a004529, 0x00b10a00, 0x00b10de0 },
+   { 0x80800042, 0x2a204529, 0x00b10a20, 0x00b10df0 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+mov (1) g126.8<1>UD ip {align1};
+mov (1) ip g21.0<1,1,1>UD {align1};
+
+//Y, (x', y') = (x, y) + (motion_vector.x >> 1, motion_vector.y >> 1) 
+asr (2) g31.14<1>W g82.16<2,2,1>W 1W {align1};  
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+define(`input_surface',	`4')
+define(`mv1',	`g82.16')
+define(`mv2',	`g82.18')
+include(`motion_frame_y.g4i')
+
+//UV, (x', y') = (x >> 1, y >> 1) + (motion_vector.x >> 2, motion_vector.y >> 2)
+shr (2) g31.0<1>UD g31.0<2,2,1>UD 1UD {align1};
+asr (2) g31.14<1>W g82.16<2,2,1>W 2W {align1};
+add (2) g32.0<1>UD g31.0<2,2,1>UD g31.14<2,2,1>W {align1};
+define(`input_surface1', `5')
+define(`input_surface2', `6')
+include(`motion_frame_uv.g4i')
+
+include(`addidct.g4i')
+send (16) 0 acc0<1>UW g0<8,8,1>UW 
+	thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,369 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a50, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000005f },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000048 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a004 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000043 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002e },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x008d0400, 0x0411a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x008d0400, 0x0418a004 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a50, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000004e },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000040 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a005 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a005 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a006 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0414a005 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0414a006 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000025 },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000018 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x008d0400, 0x0418a005 },
+   { 0x00800031, 0x25801d29, 0x008d0400, 0x0418a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x008d0400, 0x0411a005 },
+   { 0x00800031, 0x26801d29, 0x008d0400, 0x0411a006 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x008d0400, 0x0414a005 },
+   { 0x00800031, 0x25001d29, 0x008d0400, 0x0414a006 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/frame_forward.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,369 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000001, 0x2fc80001, 0x00001400, 0x00000000 },
+   { 0x00000001, 0x34000020, 0x002102a0, 0x00000000 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00010001 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a50, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x000000be },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000090 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a004 },
+   { 0x00800040, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x00800040, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x00800040, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x00800040, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x00800040, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x00800040, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x00800040, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x00800040, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x00800040, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x00800040, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x00800040, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x00800040, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x00800040, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x00800040, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x00800040, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x00800040, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e0 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10500 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10520 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10540 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10560 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10580 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a0 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c0 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e0 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10600 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10620 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10640 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10660 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10680 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a0 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c0 },
+   { 0x00800040, 0x27404529, 0x00b10740, 0x00b104e1 },
+   { 0x00800040, 0x27604529, 0x00b10760, 0x00b10501 },
+   { 0x00800040, 0x27804529, 0x00b10780, 0x00b10521 },
+   { 0x00800040, 0x27a04529, 0x00b107a0, 0x00b10541 },
+   { 0x00800040, 0x27c04529, 0x00b107c0, 0x00b10561 },
+   { 0x00800040, 0x27e04529, 0x00b107e0, 0x00b10581 },
+   { 0x00800040, 0x28004529, 0x00b10800, 0x00b105a1 },
+   { 0x00800040, 0x28204529, 0x00b10820, 0x00b105c1 },
+   { 0x00800040, 0x28404529, 0x00b10840, 0x00b105e1 },
+   { 0x00800040, 0x28604529, 0x00b10860, 0x00b10601 },
+   { 0x00800040, 0x28804529, 0x00b10880, 0x00b10621 },
+   { 0x00800040, 0x28a04529, 0x00b108a0, 0x00b10641 },
+   { 0x00800040, 0x28c04529, 0x00b108c0, 0x00b10661 },
+   { 0x00800040, 0x28e04529, 0x00b108e0, 0x00b10681 },
+   { 0x00800040, 0x29004529, 0x00b10900, 0x00b106a1 },
+   { 0x00800040, 0x29204529, 0x00b10920, 0x00b106c1 },
+   { 0x80800008, 0x27402d29, 0x00b10740, 0x00020002 },
+   { 0x80800008, 0x27602d29, 0x00b10760, 0x00020002 },
+   { 0x80800008, 0x27802d29, 0x00b10780, 0x00020002 },
+   { 0x80800008, 0x27a02d29, 0x00b107a0, 0x00020002 },
+   { 0x80800008, 0x27c02d29, 0x00b107c0, 0x00020002 },
+   { 0x80800008, 0x27e02d29, 0x00b107e0, 0x00020002 },
+   { 0x80800008, 0x28002d29, 0x00b10800, 0x00020002 },
+   { 0x80800008, 0x28202d29, 0x00b10820, 0x00020002 },
+   { 0x80800008, 0x28402d29, 0x00b10840, 0x00020002 },
+   { 0x80800008, 0x28602d29, 0x00b10860, 0x00020002 },
+   { 0x80800008, 0x28802d29, 0x00b10880, 0x00020002 },
+   { 0x80800008, 0x28a02d29, 0x00b108a0, 0x00020002 },
+   { 0x80800008, 0x28c02d29, 0x00b108c0, 0x00020002 },
+   { 0x80800008, 0x28e02d29, 0x00b108e0, 0x00020002 },
+   { 0x80800008, 0x29002d29, 0x00b10900, 0x00020002 },
+   { 0x80800008, 0x29202d29, 0x00b10920, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000086 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104c1 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b104e1 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10501 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10521 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10541 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10561 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b10581 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105a1 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105c1 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b105e1 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10601 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10621 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10641 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10661 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b10681 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106a1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000005c },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x26c01d29, 0x408d0400, 0x0218a004 },
+   { 0x80800042, 0x27404629, 0x00b104c0, 0x00b104e0 },
+   { 0x80800042, 0x27604629, 0x00b104e0, 0x00b10500 },
+   { 0x80800042, 0x27804629, 0x00b10500, 0x00b10520 },
+   { 0x80800042, 0x27a04629, 0x00b10520, 0x00b10540 },
+   { 0x80800042, 0x27c04629, 0x00b10540, 0x00b10560 },
+   { 0x80800042, 0x27e04629, 0x00b10560, 0x00b10580 },
+   { 0x80800042, 0x28004629, 0x00b10580, 0x00b105a0 },
+   { 0x80800042, 0x28204629, 0x00b105a0, 0x00b105c0 },
+   { 0x80800042, 0x28404629, 0x00b105c0, 0x00b105e0 },
+   { 0x80800042, 0x28604629, 0x00b105e0, 0x00b10600 },
+   { 0x80800042, 0x28804629, 0x00b10600, 0x00b10620 },
+   { 0x80800042, 0x28a04629, 0x00b10620, 0x00b10640 },
+   { 0x80800042, 0x28c04629, 0x00b10640, 0x00b10660 },
+   { 0x80800042, 0x28e04629, 0x00b10660, 0x00b10680 },
+   { 0x80800042, 0x29004629, 0x00b10680, 0x00b106a0 },
+   { 0x80800042, 0x29204629, 0x00b106a0, 0x00b106c0 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00800031, 0x25c01d29, 0x408d0400, 0x0288a004 },
+   { 0x00800001, 0x27400229, 0x00b104c0, 0x00000000 },
+   { 0x00800001, 0x27600229, 0x00b104e0, 0x00000000 },
+   { 0x00800001, 0x27800229, 0x00b10500, 0x00000000 },
+   { 0x00800001, 0x27a00229, 0x00b10520, 0x00000000 },
+   { 0x00800001, 0x27c00229, 0x00b10540, 0x00000000 },
+   { 0x00800001, 0x27e00229, 0x00b10560, 0x00000000 },
+   { 0x00800001, 0x28000229, 0x00b10580, 0x00000000 },
+   { 0x00800001, 0x28200229, 0x00b105a0, 0x00000000 },
+   { 0x00800001, 0x28400229, 0x00b105c0, 0x00000000 },
+   { 0x00800001, 0x28600229, 0x00b105e0, 0x00000000 },
+   { 0x00800001, 0x28800229, 0x00b10600, 0x00000000 },
+   { 0x00800001, 0x28a00229, 0x00b10620, 0x00000000 },
+   { 0x00800001, 0x28c00229, 0x00b10640, 0x00000000 },
+   { 0x00800001, 0x28e00229, 0x00b10660, 0x00000000 },
+   { 0x00800001, 0x29000229, 0x00b10680, 0x00000000 },
+   { 0x00800001, 0x29200229, 0x00b106a0, 0x00000000 },
+   { 0x00200008, 0x23e00c21, 0x004503e0, 0x00000001 },
+   { 0x0020000c, 0x23ee3dad, 0x00450a50, 0x00020002 },
+   { 0x00200040, 0x24003421, 0x004503e0, 0x004503ee },
+   { 0x01000005, 0x20000d3c, 0x00210a50, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000009c },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000080 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a005 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a005 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a006 },
+   { 0x00600040, 0x29404629, 0x008d0440, 0x008d0441 },
+   { 0x00600040, 0x29504629, 0x008d0460, 0x008d0461 },
+   { 0x00600040, 0x29604629, 0x008d0480, 0x008d0481 },
+   { 0x00600040, 0x29704629, 0x008d04a0, 0x008d04a1 },
+   { 0x00600040, 0x29804629, 0x008d04c0, 0x008d04c1 },
+   { 0x00600040, 0x29904629, 0x008d04e0, 0x008d04e1 },
+   { 0x00600040, 0x29a04629, 0x008d0500, 0x008d0501 },
+   { 0x00600040, 0x29b04629, 0x008d0520, 0x008d0521 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0460 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0480 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a0 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c0 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e0 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0500 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0520 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0540 },
+   { 0x00600040, 0x29404529, 0x008d0940, 0x008d0461 },
+   { 0x00600040, 0x29504529, 0x008d0950, 0x008d0481 },
+   { 0x00600040, 0x29604529, 0x008d0960, 0x008d04a1 },
+   { 0x00600040, 0x29704529, 0x008d0970, 0x008d04c1 },
+   { 0x00600040, 0x29804529, 0x008d0980, 0x008d04e1 },
+   { 0x00600040, 0x29904529, 0x008d0990, 0x008d0501 },
+   { 0x00600040, 0x29a04529, 0x008d09a0, 0x008d0521 },
+   { 0x00600040, 0x29b04529, 0x008d09b0, 0x008d0541 },
+   { 0x00600040, 0x29c04629, 0x008d0580, 0x008d0581 },
+   { 0x00600040, 0x29d04629, 0x008d05a0, 0x008d05a1 },
+   { 0x00600040, 0x29e04629, 0x008d05c0, 0x008d05c1 },
+   { 0x00600040, 0x29f04629, 0x008d05e0, 0x008d05e1 },
+   { 0x00600040, 0x2a004629, 0x008d0600, 0x008d0601 },
+   { 0x00600040, 0x2a104629, 0x008d0620, 0x008d0621 },
+   { 0x00600040, 0x2a204629, 0x008d0640, 0x008d0641 },
+   { 0x00600040, 0x2a304629, 0x008d0660, 0x008d0661 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a0 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c0 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e0 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0600 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0620 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0640 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0660 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0680 },
+   { 0x00600040, 0x29c04529, 0x008d09c0, 0x008d05a1 },
+   { 0x00600040, 0x29d04529, 0x008d09d0, 0x008d05c1 },
+   { 0x00600040, 0x29e04529, 0x008d09e0, 0x008d05e1 },
+   { 0x00600040, 0x29f04529, 0x008d09f0, 0x008d0601 },
+   { 0x00600040, 0x2a004529, 0x008d0a00, 0x008d0621 },
+   { 0x00600040, 0x2a104529, 0x008d0a10, 0x008d0641 },
+   { 0x00600040, 0x2a204529, 0x008d0a20, 0x008d0661 },
+   { 0x00600040, 0x2a304529, 0x008d0a30, 0x008d0681 },
+   { 0x00800008, 0x29402d29, 0x00b10940, 0x00020002 },
+   { 0x00800008, 0x29602d29, 0x00b10960, 0x00020002 },
+   { 0x00800008, 0x29802d29, 0x00b10980, 0x00020002 },
+   { 0x00800008, 0x29a02d29, 0x00b109a0, 0x00020002 },
+   { 0x00800008, 0x29c02d29, 0x00b109c0, 0x00020002 },
+   { 0x00800008, 0x29e02d29, 0x00b109e0, 0x00020002 },
+   { 0x00800008, 0x2a002d29, 0x00b10a00, 0x00020002 },
+   { 0x00800008, 0x2a202d29, 0x00b10a20, 0x00020002 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000062 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0248a005 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0248a006 },
+   { 0x00800042, 0x29404629, 0x00ad0440, 0x00ad0441 },
+   { 0x00800042, 0x29604629, 0x00ad0460, 0x00ad0461 },
+   { 0x00800042, 0x29804629, 0x00ad0480, 0x00ad0481 },
+   { 0x00800042, 0x29a04629, 0x00ad04a0, 0x00ad04a1 },
+   { 0x00800042, 0x29c04629, 0x00ad0580, 0x00ad0581 },
+   { 0x00800042, 0x29e04629, 0x00ad05a0, 0x00ad05a1 },
+   { 0x00800042, 0x2a004629, 0x00ad05c0, 0x00ad05c1 },
+   { 0x00800042, 0x2a204629, 0x00ad05e0, 0x00ad05e1 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004a },
+   { 0x01000005, 0x20000d3c, 0x00210a52, 0x00000002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007001f },
+   { 0x00800031, 0x24401d29, 0x408d0400, 0x0288a005 },
+   { 0x00800031, 0x25801d29, 0x408d0400, 0x0288a006 },
+   { 0x00000040, 0x24040c21, 0x00210404, 0x00000008 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0000001f },
+   { 0x00800031, 0x25401d29, 0x408d0400, 0x0218a005 },
+   { 0x00800031, 0x26801d29, 0x408d0400, 0x0218a006 },
+   { 0x00600042, 0x29404629, 0x008d0440, 0x008d0460 },
+   { 0x00600042, 0x29504629, 0x008d0460, 0x008d0480 },
+   { 0x00600042, 0x29604629, 0x008d0480, 0x008d04a0 },
+   { 0x00600042, 0x29704629, 0x008d04a0, 0x008d04c0 },
+   { 0x00600042, 0x29804629, 0x008d04c0, 0x008d04e0 },
+   { 0x00600042, 0x29904629, 0x008d04e0, 0x008d0500 },
+   { 0x00600042, 0x29a04629, 0x008d0500, 0x008d0520 },
+   { 0x00600042, 0x29b04629, 0x008d0520, 0x008d0540 },
+   { 0x00600042, 0x29c04629, 0x008d0580, 0x008d05a0 },
+   { 0x00600042, 0x29d04629, 0x008d05a0, 0x008d05c0 },
+   { 0x00600042, 0x29e04629, 0x008d05c0, 0x008d05e0 },
+   { 0x00600042, 0x29f04629, 0x008d05e0, 0x008d0600 },
+   { 0x00600042, 0x2a004629, 0x008d0600, 0x008d0620 },
+   { 0x00600042, 0x2a104629, 0x008d0620, 0x008d0640 },
+   { 0x00600042, 0x2a204629, 0x008d0640, 0x008d0660 },
+   { 0x00600042, 0x2a304629, 0x008d0660, 0x008d0680 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00000001, 0x24080061, 0x00000000, 0x0007000f },
+   { 0x00800031, 0x24801d29, 0x408d0400, 0x0248a005 },
+   { 0x00800031, 0x25001d29, 0x408d0400, 0x0248a006 },
+   { 0x00800001, 0x29400229, 0x00ad0480, 0x00000000 },
+   { 0x00800001, 0x29600229, 0x00ad04a0, 0x00000000 },
+   { 0x00800001, 0x29800229, 0x00ad04c0, 0x00000000 },
+   { 0x00800001, 0x29a00229, 0x00ad04e0, 0x00000000 },
+   { 0x00800001, 0x29c00229, 0x00ad0500, 0x00000000 },
+   { 0x00800001, 0x29e00229, 0x00ad0520, 0x00000000 },
+   { 0x00800001, 0x2a000229, 0x00ad0540, 0x00000000 },
+   { 0x00800001, 0x2a200229, 0x00ad0560, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10a80, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10aa0, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10ac0, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10ae0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10b00, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10b20, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10b40, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10b60, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10b80, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10ba0, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10bc0, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10be0, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c00, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10c20, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800040, 0x274045ad, 0x00b10a60, 0x00b20740 },
+   { 0x00800040, 0x276045ad, 0x00b10b60, 0x00b20760 },
+   { 0x00800040, 0x278045ad, 0x00b10a80, 0x00b20780 },
+   { 0x00800040, 0x27a045ad, 0x00b10b80, 0x00b207a0 },
+   { 0x00800040, 0x27c045ad, 0x00b10aa0, 0x00b207c0 },
+   { 0x00800040, 0x27e045ad, 0x00b10ba0, 0x00b207e0 },
+   { 0x00800040, 0x280045ad, 0x00b10ac0, 0x00b20800 },
+   { 0x00800040, 0x282045ad, 0x00b10bc0, 0x00b20820 },
+   { 0x00800040, 0x284045ad, 0x00b10ae0, 0x00b20840 },
+   { 0x00800040, 0x286045ad, 0x00b10be0, 0x00b20860 },
+   { 0x00800040, 0x288045ad, 0x00b10b00, 0x00b20880 },
+   { 0x00800040, 0x28a045ad, 0x00b10c00, 0x00b208a0 },
+   { 0x00800040, 0x28c045ad, 0x00b10b20, 0x00b208c0 },
+   { 0x00800040, 0x28e045ad, 0x00b10c20, 0x00b208e0 },
+   { 0x00800040, 0x290045ad, 0x00b10b40, 0x00b20900 },
+   { 0x00800040, 0x292045ad, 0x00b10c40, 0x00b20920 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x474001b1, 0x00b10740, 0x00000000 },
+   { 0x80800001, 0x476001b1, 0x00b10760, 0x00000000 },
+   { 0x80800001, 0x478001b1, 0x00b10780, 0x00000000 },
+   { 0x80800001, 0x47a001b1, 0x00b107a0, 0x00000000 },
+   { 0x80800001, 0x47c001b1, 0x00b107c0, 0x00000000 },
+   { 0x80800001, 0x47e001b1, 0x00b107e0, 0x00000000 },
+   { 0x80800001, 0x480001b1, 0x00b10800, 0x00000000 },
+   { 0x80800001, 0x482001b1, 0x00b10820, 0x00000000 },
+   { 0x80800001, 0x484001b1, 0x00b10840, 0x00000000 },
+   { 0x80800001, 0x486001b1, 0x00b10860, 0x00000000 },
+   { 0x80800001, 0x488001b1, 0x00b10880, 0x00000000 },
+   { 0x80800001, 0x48a001b1, 0x00b108a0, 0x00000000 },
+   { 0x80800001, 0x48c001b1, 0x00b108c0, 0x00000000 },
+   { 0x80800001, 0x48e001b1, 0x00b108e0, 0x00000000 },
+   { 0x80800001, 0x490001b1, 0x00b10900, 0x00000000 },
+   { 0x80800001, 0x492001b1, 0x00b10920, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20740, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20760, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20780, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b207a0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b207c0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b207e0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20800, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20820, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20840, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20860, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20880, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b208a0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b208c0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b208e0, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20900, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20920, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01c21, 0x004503e0, 0x00000001 },
+   { 0x00800040, 0x294025ad, 0x00b10c60, 0x00b10940 },
+   { 0x00800040, 0x296025ad, 0x00b10c80, 0x00b10960 },
+   { 0x00800040, 0x298025ad, 0x00b10ca0, 0x00b10980 },
+   { 0x00800040, 0x29a025ad, 0x00b10cc0, 0x00b109a0 },
+   { 0x80800001, 0x494001b1, 0x00b10940, 0x00000000 },
+   { 0x80800001, 0x496001b1, 0x00b10960, 0x00000000 },
+   { 0x80800001, 0x498001b1, 0x00b10980, 0x00000000 },
+   { 0x80800001, 0x49a001b1, 0x00b109a0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20940, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20960, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20980, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b209a0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x00800040, 0x29c025a9, 0x00b10ce0, 0x00b109c0 },
+   { 0x00800040, 0x29e025a9, 0x00b10d00, 0x00b109e0 },
+   { 0x00800040, 0x2a0025a9, 0x00b10d20, 0x00b10a00 },
+   { 0x00800040, 0x2a2025a9, 0x00b10d40, 0x00b10a20 },
+   { 0x80800001, 0x49c001b1, 0x00b109c0, 0x00000000 },
+   { 0x80800001, 0x49e001b1, 0x00b109e0, 0x00000000 },
+   { 0x80800001, 0x4a0001b1, 0x00b10a00, 0x00000000 },
+   { 0x80800001, 0x4a2001b1, 0x00b10a20, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b209c0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b209e0, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a00, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20a20, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/idct.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/idct.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/idct.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/idct.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,147 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix in UB format
+           g3~g4:non intra IQ matrix in UB format
+           g5~g20:IDCT table
+   g56~g79:DCT data after IQ before idct
+   g83~g106: IDCT data after idct
+   g82:    thread payload backup
+   g125:   ip before idct
+*/
+IDCT_START:
+mov (1) g126.0<1>UD ip {align1};
+jmpi DO_IDCT;
+add (16) g32<1>D g32<8,8,1>D ROW_ADD {compr};
+add (16) g34<1>D g34<8,8,1>D ROW_ADD {compr};
+add (16) g36<1>D g36<8,8,1>D ROW_ADD {compr};
+add (16) g38<1>D g38<8,8,1>D ROW_ADD {compr};
+
+shr (16) g32<1>D g32<8,8,1>D ROW_SHIFT {compr};
+shr (16) g34<1>D g34<8,8,1>D ROW_SHIFT {compr};
+shr (16) g36<1>D g36<8,8,1>D ROW_SHIFT {compr};
+shr (16) g38<1>D g38<8,8,1>D ROW_SHIFT {compr};
+
+mov (16) g110.0<1>W g32<16,8,2>W {align1};
+mov (16) g111.0<1>W g34<16,8,2>W {align1};
+mov (16) g112.0<1>W g36<16,8,2>W {align1};
+mov (16) g113.0<1>W g38<16,8,2>W {align1};
+
+mov (1) g80.0<1>UD a0.0<1,1,1>UD {align1};  //save a0
+mov (1) a0.0<1>UD 0x0DB00DA0UD {align1};  //begin at g110.0, the output of idct_row.g4i
+mov (1) g126.0<1>UD ip {align1};
+jmpi DO_IDCT;
+
+add (16) g32<1>D g32<8,8,1>D COL_ADD {compr};
+add (16) g34<1>D g34<8,8,1>D COL_ADD {compr};
+add (16) g36<1>D g36<8,8,1>D COL_ADD {compr};
+add (16) g38<1>D g38<8,8,1>D COL_ADD {compr};
+
+shr (16) g32<1>D g32<8,8,1>D COL_SHIFT {compr};
+shr (16) g34<1>D g34<8,8,1>D COL_SHIFT {compr};
+shr (16) g36<1>D g36<8,8,1>D COL_SHIFT {compr};
+shr (16) g38<1>D g38<8,8,1>D COL_SHIFT {compr};
+
+mov (1) a0.0<1>UD g80.0<1,1,1>UD {align1};             //restore a0 
+add (1) ip g125.0<1,1,1>UD 0x20UD {align1};            //jump back
+
+DO_IDCT:
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};           //increase the address 
+dp4 (16) g40<1>D g[a0.0]<8,8,1>W g5<8,8,1>D {align1 compr};
+dp4 (16) g42<1>D g[a0.0]<8,8,1>W g7<8,8,1>D {align1 compr};
+dp4 (16) g44<1>D g[a0.0]<8,8,1>W g9<8,8,1>D {align1 compr};
+dp4 (16) g46<1>D g[a0.0]<8,8,1>W g11<8,8,1>D {align1 compr};
+dp4 (16) g48<1>D g[a0.0]<8,8,1>W g13<8,8,1>D {align1 compr};
+dp4 (16) g50<1>D g[a0.0]<8,8,1>W g15<8,8,1>D {align1 compr};
+dp4 (16) g52<1>D g[a0.0]<8,8,1>W g17<8,8,1>D {align1 compr};
+dp4 (16) g54<1>D g[a0.0]<8,8,1>W g19<8,8,1>D {align1 compr};
+add (2) g32.0<1>D g40.0<8,1,8>D g40.16<8,1,8>D {align1};
+add (2) g33.0<1>D g42.0<8,1,8>D g42.16<8,1,8>D {align1};
+add (2) g34.0<1>D g44.0<8,1,8>D g44.16<8,1,8>D {align1};
+add (2) g35.0<1>D g46.0<8,1,8>D g46.16<8,1,8>D {align1};
+add (2) g36.0<1>D g48.0<8,1,8>D g48.16<8,1,8>D {align1};
+add (2) g37.0<1>D g50.0<8,1,8>D g50.16<8,1,8>D {align1};
+add (2) g38.0<1>D g52.0<8,1,8>D g52.16<8,1,8>D {align1};
+add (2) g39.0<1>D g54.0<8,1,8>D g54.16<8,1,8>D {align1};
+
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+dp4 (16) g40<1>D g[a0.0]<8,8,1>W g5<8,8,1>D {align1 compr};
+dp4 (16) g42<1>D g[a0.0]<8,8,1>W g7<8,8,1>D {align1 compr};
+dp4 (16) g44<1>D g[a0.0]<8,8,1>W g9<8,8,1>D {align1 compr};
+dp4 (16) g46<1>D g[a0.0]<8,8,1>W g11<8,8,1>D {align1 compr};
+dp4 (16) g48<1>D g[a0.0]<8,8,1>W g13<8,8,1>D {align1 compr};
+dp4 (16) g50<1>D g[a0.0]<8,8,1>W g15<8,8,1>D {align1 compr};
+dp4 (16) g52<1>D g[a0.0]<8,8,1>W g17<8,8,1>D {align1 compr};
+dp4 (16) g54<1>D g[a0.0]<8,8,1>W g19<8,8,1>D {align1 compr};
+add (2) g32.8<1>D g40.0<8,1,8>D g40.16<8,1,8>D {align1};
+add (2) g33.8<1>D g42.0<8,1,8>D g42.16<8,1,8>D {align1};
+add (2) g34.8<1>D g44.0<8,1,8>D g44.16<8,1,8>D {align1};
+add (2) g35.8<1>D g46.0<8,1,8>D g46.16<8,1,8>D {align1};
+add (2) g36.8<1>D g48.0<8,1,8>D g48.16<8,1,8>D {align1};
+add (2) g37.8<1>D g50.0<8,1,8>D g50.16<8,1,8>D {align1};
+add (2) g38.8<1>D g52.0<8,1,8>D g52.16<8,1,8>D {align1};
+add (2) g39.8<1>D g54.0<8,1,8>D g54.16<8,1,8>D {align1};
+
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+dp4 (16) g40<1>D g[a0.0]<8,8,1>W g5<8,8,1>D {align1 compr};
+dp4 (16) g42<1>D g[a0.0]<8,8,1>W g7<8,8,1>D {align1 compr};
+dp4 (16) g44<1>D g[a0.0]<8,8,1>W g9<8,8,1>D {align1 compr};
+dp4 (16) g46<1>D g[a0.0]<8,8,1>W g11<8,8,1>D {align1 compr};
+dp4 (16) g48<1>D g[a0.0]<8,8,1>W g13<8,8,1>D {align1 compr};
+dp4 (16) g50<1>D g[a0.0]<8,8,1>W g15<8,8,1>D {align1 compr};
+dp4 (16) g52<1>D g[a0.0]<8,8,1>W g17<8,8,1>D {align1 compr};
+dp4 (16) g54<1>D g[a0.0]<8,8,1>W g19<8,8,1>D {align1 compr};
+add (2) g32.16<1>D g40.0<8,1,8>D g40.16<8,1,8>D {align1};
+add (2) g33.16<1>D g42.0<8,1,8>D g42.16<8,1,8>D {align1};
+add (2) g34.16<1>D g44.0<8,1,8>D g44.16<8,1,8>D {align1};
+add (2) g35.16<1>D g46.0<8,1,8>D g46.16<8,1,8>D {align1};
+add (2) g36.16<1>D g48.0<8,1,8>D g48.16<8,1,8>D {align1};
+add (2) g37.16<1>D g50.0<8,1,8>D g50.16<8,1,8>D {align1};
+add (2) g38.16<1>D g52.0<8,1,8>D g52.16<8,1,8>D {align1};
+add (2) g39.16<1>D g54.0<8,1,8>D g54.16<8,1,8>D {align1};
+
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00200020UD {align1};
+dp4 (16) g40<1>D g[a0.0]<8,8,1>W g5<8,8,1>D {align1 compr};
+dp4 (16) g42<1>D g[a0.0]<8,8,1>W g7<8,8,1>D {align1 compr};
+dp4 (16) g44<1>D g[a0.0]<8,8,1>W g9<8,8,1>D {align1 compr};
+dp4 (16) g46<1>D g[a0.0]<8,8,1>W g11<8,8,1>D {align1 compr};
+dp4 (16) g48<1>D g[a0.0]<8,8,1>W g13<8,8,1>D {align1 compr};
+dp4 (16) g50<1>D g[a0.0]<8,8,1>W g15<8,8,1>D {align1 compr};
+dp4 (16) g52<1>D g[a0.0]<8,8,1>W g17<8,8,1>D {align1 compr};
+dp4 (16) g54<1>D g[a0.0]<8,8,1>W g19<8,8,1>D {align1 compr};
+add (2) g32.24<1>D g40.0<8,1,8>D g40.16<8,1,8>D {align1};
+add (2) g33.24<1>D g42.0<8,1,8>D g42.16<8,1,8>D {align1};
+add (2) g34.24<1>D g44.0<8,1,8>D g44.16<8,1,8>D {align1};
+add (2) g35.24<1>D g46.0<8,1,8>D g46.16<8,1,8>D {align1};
+add (2) g36.24<1>D g48.0<8,1,8>D g48.16<8,1,8>D {align1};
+add (2) g37.24<1>D g50.0<8,1,8>D g50.16<8,1,8>D {align1};
+add (2) g38.24<1>D g52.0<8,1,8>D g52.16<8,1,8>D {align1};
+add (2) g39.24<1>D g54.0<8,1,8>D g54.16<8,1,8>D {align1};
+
+add (1) ip g126.0<1,1,1>UD 0x20UD {align1};            //jump back
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,209 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/*
+   GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT tab
+   g31:    read and write message descriptor
+   g32~g55:DCT data
+   g58~g81:reference data
+   g82:    thread payload 
+   g83~g106:IDCT data 
+*/
+mov (8) g82.0<1>UD g31.0<8,8,1>UD {align1};
+mov (2) g31.0<1>UD g82.12<2,2,1>UW {align1};
+
+include(`iq_intra.g4i')
+
+//defined for idct
+define(`ROW_SHIFT', `11UD') 
+define(`ROW_ADD', `0x400UD')          
+define(`COL_SHIFT', `20UD') 
+define(`COL_ADD', `0x80000UD')          
+
+mov (1) a0.0<1>UD 0x06F006E0UD {align1};      //0x06F006E0UD+0x00200020UD=0x07100700UD (g56.0 and g56.16)
+
+//Y0
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+add (8) g83.0<1>W g32.0<16,8,2>W 128UW {align1};
+add (8) g84.0<1>W g33.0<16,8,2>W 128UW {align1};
+add (8) g85.0<1>W g34.0<16,8,2>W 128UW {align1};
+add (8) g86.0<1>W g35.0<16,8,2>W 128UW {align1};
+add (8) g87.0<1>W g36.0<16,8,2>W 128UW {align1};
+add (8) g88.0<1>W g37.0<16,8,2>W 128UW {align1};
+add (8) g89.0<1>W g38.0<16,8,2>W 128UW {align1};
+add (8) g90.0<1>W g39.0<16,8,2>W 128UW {align1};
+
+//Y1
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+add (8) g83.16<1>W g32.0<16,8,2>W 128UW {align1};
+add (8) g84.16<1>W g33.0<16,8,2>W 128UW {align1};
+add (8) g85.16<1>W g34.0<16,8,2>W 128UW {align1};
+add (8) g86.16<1>W g35.0<16,8,2>W 128UW {align1};
+add (8) g87.16<1>W g36.0<16,8,2>W 128UW {align1};
+add (8) g88.16<1>W g37.0<16,8,2>W 128UW {align1};
+add (8) g89.16<1>W g38.0<16,8,2>W 128UW {align1};
+add (8) g90.16<1>W g39.0<16,8,2>W 128UW {align1};
+
+//Y2
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+add (8) g91.0<1>W g32.0<16,8,2>W 128UW {align1};
+add (8) g92.0<1>W g33.0<16,8,2>W 128UW {align1};
+add (8) g93.0<1>W g34.0<16,8,2>W 128UW {align1};
+add (8) g94.0<1>W g35.0<16,8,2>W 128UW {align1};
+add (8) g95.0<1>W g36.0<16,8,2>W 128UW {align1};
+add (8) g96.0<1>W g37.0<16,8,2>W 128UW {align1};
+add (8) g97.0<1>W g38.0<16,8,2>W 128UW {align1};
+add (8) g98.0<1>W g39.0<16,8,2>W 128UW {align1};
+
+//Y3
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+add (8) g91.16<1>W g32.0<16,8,2>W 128UW {align1};
+add (8) g92.16<1>W g33.0<16,8,2>W 128UW {align1};
+add (8) g93.16<1>W g34.0<16,8,2>W 128UW {align1};
+add (8) g94.16<1>W g35.0<16,8,2>W 128UW {align1};
+add (8) g95.16<1>W g36.0<16,8,2>W 128UW {align1};
+add (8) g96.16<1>W g37.0<16,8,2>W 128UW {align1};
+add (8) g97.16<1>W g38.0<16,8,2>W 128UW {align1};
+add (8) g98.16<1>W g39.0<16,8,2>W 128UW {align1};
+
+//U
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+add (16) g99.0<1>W g32.0<16,8,2>W 128UW {align1};
+add (16) g100.0<1>W g34.0<16,8,2>W 128UW {align1};
+add (16) g101.0<1>W g36.0<16,8,2>W 128UW {align1};
+add (16) g102.0<1>W g38.0<16,8,2>W 128UW {align1};
+
+//V
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+add (16) g103.0<1>W g32.0<16,8,2>W 128UW {align1};
+add (16) g104.0<1>W g34.0<16,8,2>W 128UW {align1};
+add (16) g105.0<1>W g36.0<16,8,2>W 128UW {align1};
+add (16) g106.0<1>W g38.0<16,8,2>W 128UW {align1};
+
+/******************* MC ************************/
+mov (1) g31.8<1>UD 0x00F000FUD {align1};
+mov.sat (16) g83.0<2>UB g83.0<16,16,1>W {align1};
+mov.sat (16) g84.0<2>UB g84.0<16,16,1>W {align1};
+mov.sat (16) g85.0<2>UB g85.0<16,16,1>W {align1};
+mov.sat (16) g86.0<2>UB g86.0<16,16,1>W {align1};
+mov.sat (16) g87.0<2>UB g87.0<16,16,1>W {align1};
+mov.sat (16) g88.0<2>UB g88.0<16,16,1>W {align1};
+mov.sat (16) g89.0<2>UB g89.0<16,16,1>W {align1};
+mov.sat (16) g90.0<2>UB g90.0<16,16,1>W {align1};
+mov.sat (16) g91.0<2>UB g91.0<16,16,1>W {align1};
+mov.sat (16) g92.0<2>UB g92.0<16,16,1>W {align1};
+mov.sat (16) g93.0<2>UB g93.0<16,16,1>W {align1};
+mov.sat (16) g94.0<2>UB g94.0<16,16,1>W {align1};
+mov.sat (16) g95.0<2>UB g95.0<16,16,1>W {align1};
+mov.sat (16) g96.0<2>UB g96.0<16,16,1>W {align1};
+mov.sat (16) g97.0<2>UB g97.0<16,16,1>W {align1};
+mov.sat (16) g98.0<2>UB g98.0<16,16,1>W {align1};
+
+and.nz (1) null g82.2<1,1,1>UW 0x20UW{align1};
+(f0) jmpi field_dct;
+
+mov (16) m1.0<1>UB  g83.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g84.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g85.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g86.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB  g87.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g88.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB  g89.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g90.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB  g91.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g92.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB  g93.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g94.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB  g95.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g96.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB  g97.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g98.0<16,16,2>UB {align1};
+jmpi write_back;
+
+field_dct:
+mov (16) m1.0<1>UB  g83.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g91.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g84.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g92.0<16,16,2>UB {align1};
+mov (16) m3.0<1>UB  g85.0<16,16,2>UB {align1};
+mov (16) m3.16<1>UB g93.0<16,16,2>UB {align1};
+mov (16) m4.0<1>UB  g86.0<16,16,2>UB {align1};
+mov (16) m4.16<1>UB g94.0<16,16,2>UB {align1};
+mov (16) m5.0<1>UB  g87.0<16,16,2>UB {align1};
+mov (16) m5.16<1>UB g95.0<16,16,2>UB {align1};
+mov (16) m6.0<1>UB  g88.0<16,16,2>UB {align1};
+mov (16) m6.16<1>UB g96.0<16,16,2>UB {align1};
+mov (16) m7.0<1>UB  g89.0<16,16,2>UB {align1};
+mov (16) m7.16<1>UB g97.0<16,16,2>UB {align1};
+mov (16) m8.0<1>UB  g90.0<16,16,2>UB {align1};
+mov (16) m8.16<1>UB g98.0<16,16,2>UB {align1};
+
+write_back:
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(0,0,2,0) mlen 9 rlen 0 {align1};
+
+//U
+mov (1) g31.8<1>UD 0x0070007UD  { align1 };
+shr (2) g31.0<1>UD g82.12<2,2,1>UW 1D {align1};
+mov.sat (16) g99.0<2>UB g99.0<16,16,1>W {align1};
+mov.sat (16) g100.0<2>UB g100.0<16,16,1>W {align1};
+mov.sat (16) g101.0<2>UB g101.0<16,16,1>W {align1};
+mov.sat (16) g102.0<2>UB g102.0<16,16,1>W {align1};
+
+mov (16) m1.0<1>UB  g99.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g100.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g101.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g102.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+//V
+mov.sat (16) g103.0<2>UB g103.0<16,16,1>W {align1};
+mov.sat (16) g104.0<2>UB g104.0<16,16,1>W {align1};
+mov.sat (16) g105.0<2>UB g105.0<16,16,1>W {align1};
+mov.sat (16) g106.0<2>UB g106.0<16,16,1>W {align1};
+
+mov (16) m1.0<1>UB  g103.0<16,16,2>UB {align1};
+mov (16) m1.16<1>UB g104.0<16,16,2>UB {align1};
+mov (16) m2.0<1>UB  g105.0<16,16,2>UB {align1};
+mov (16) m2.16<1>UB g106.0<16,16,2>UB {align1};
+send (16) 0 acc0<1>UW g31<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 };
+
+OUT:
+send (16) 0 acc0<1>UW g0<8,8,1>UW
+        thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT};
+
+include(`do_iq_intra.g4i')
+include(`idct.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,313 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000005, 0x2da02d29, 0x00210a48, 0x001f001f },
+   { 0x00000005, 0x2da42d29, 0x00210a48, 0x60006000 },
+   { 0x00000008, 0x2da42d29, 0x00210da4, 0x000d000d },
+   { 0x00000001, 0x2da60169, 0x00000000, 0x00080008 },
+   { 0x00000008, 0x2da42529, 0x00210da6, 0x00210da4 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00090009 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00110011 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00190019 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffe7ffe7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00030003 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x00400040 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000009 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xfff7fff7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00010001 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x000a000a },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000005 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffefffef },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00020002 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x001c001c },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000001 },
+   { 0x00000009, 0x2da00d29, 0x00210da0, 0x00000001 },
+   { 0x00000001, 0x2dc00129, 0x00210da0, 0x00000000 },
+   { 0x00800001, 0x2e000229, 0x00b10020, 0x00000000 },
+   { 0x00800001, 0x2e200229, 0x00b10030, 0x00000000 },
+   { 0x00800001, 0x2e400229, 0x00b10040, 0x00000000 },
+   { 0x00800001, 0x2e600229, 0x00b10050, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x03f003e0 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000a1 },
+   { 0x00800001, 0x270001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x272001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x274001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x276001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000009b },
+   { 0x00800001, 0x278001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x27a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x27c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x27e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000095 },
+   { 0x00800001, 0x280001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x282001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x284001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x286001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000008f },
+   { 0x00800001, 0x288001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x28a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x28c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x28e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000089 },
+   { 0x00800001, 0x290001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x292001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x294001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x296001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000083 },
+   { 0x00800001, 0x298001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x29a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x29c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x29e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x06f006e0 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000008f },
+   { 0x00600040, 0x2a602dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2a802dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2aa02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2ac02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2ae02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2b002dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2b202dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2b402dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000085 },
+   { 0x00600040, 0x2a702dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2a902dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2ab02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2ad02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2af02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2b102dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2b302dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2b502dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000007b },
+   { 0x00600040, 0x2b602dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2b802dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2ba02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2bc02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2be02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2c002dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2c202dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2c402dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000071 },
+   { 0x00600040, 0x2b702dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2b902dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2bb02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2bd02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2bf02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2c102dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2c302dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2c502dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000067 },
+   { 0x00800040, 0x2c602dad, 0x00ae0400, 0x00800080 },
+   { 0x00800040, 0x2c802dad, 0x00ae0440, 0x00800080 },
+   { 0x00800040, 0x2ca02dad, 0x00ae0480, 0x00800080 },
+   { 0x00800040, 0x2cc02dad, 0x00ae04c0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000061 },
+   { 0x00800040, 0x2ce02dad, 0x00ae0400, 0x00800080 },
+   { 0x00800040, 0x2d002dad, 0x00ae0440, 0x00800080 },
+   { 0x00800040, 0x2d202dad, 0x00ae0480, 0x00800080 },
+   { 0x00800040, 0x2d402dad, 0x00ae04c0, 0x00800080 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x4a6001b1, 0x00b10a60, 0x00000000 },
+   { 0x80800001, 0x4a8001b1, 0x00b10a80, 0x00000000 },
+   { 0x80800001, 0x4aa001b1, 0x00b10aa0, 0x00000000 },
+   { 0x80800001, 0x4ac001b1, 0x00b10ac0, 0x00000000 },
+   { 0x80800001, 0x4ae001b1, 0x00b10ae0, 0x00000000 },
+   { 0x80800001, 0x4b0001b1, 0x00b10b00, 0x00000000 },
+   { 0x80800001, 0x4b2001b1, 0x00b10b20, 0x00000000 },
+   { 0x80800001, 0x4b4001b1, 0x00b10b40, 0x00000000 },
+   { 0x80800001, 0x4b6001b1, 0x00b10b60, 0x00000000 },
+   { 0x80800001, 0x4b8001b1, 0x00b10b80, 0x00000000 },
+   { 0x80800001, 0x4ba001b1, 0x00b10ba0, 0x00000000 },
+   { 0x80800001, 0x4bc001b1, 0x00b10bc0, 0x00000000 },
+   { 0x80800001, 0x4be001b1, 0x00b10be0, 0x00000000 },
+   { 0x80800001, 0x4c0001b1, 0x00b10c00, 0x00000000 },
+   { 0x80800001, 0x4c2001b1, 0x00b10c20, 0x00000000 },
+   { 0x80800001, 0x4c4001b1, 0x00b10c40, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x00800001, 0x20200232, 0x00b20a60, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20a80, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20aa0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20ac0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20ae0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20b00, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20b20, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20b40, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20b60, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20b80, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20ba0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20bc0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20be0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20c00, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20c20, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20c40, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00800001, 0x20200232, 0x00b20a60, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20b60, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a80, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20b80, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20aa0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20ba0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20ac0, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20bc0, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20ae0, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20be0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20b00, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20c00, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20b20, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20c20, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20b40, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20c40, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05902000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01d21, 0x00450a4c, 0x00000001 },
+   { 0x80800001, 0x4c6001b1, 0x00b10c60, 0x00000000 },
+   { 0x80800001, 0x4c8001b1, 0x00b10c80, 0x00000000 },
+   { 0x80800001, 0x4ca001b1, 0x00b10ca0, 0x00000000 },
+   { 0x80800001, 0x4cc001b1, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20c60, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20c80, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20ca0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20cc0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302001 },
+   { 0x80800001, 0x4ce001b1, 0x00b10ce0, 0x00000000 },
+   { 0x80800001, 0x4d0001b1, 0x00b10d00, 0x00000000 },
+   { 0x80800001, 0x4d2001b1, 0x00b10d20, 0x00000000 },
+   { 0x80800001, 0x4d4001b1, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20ce0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20d00, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20d20, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20d40, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x008d03e0, 0x05302002 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00000001, 0x2de001ad, 0x00218000, 0x00000000 },
+   { 0x00802041, 0x2e8025a5, 0x008d8000, 0x008d0e00 },
+   { 0x00802041, 0x2e8024a5, 0x008d0e80, 0x008c0da0 },
+   { 0x0080200c, 0x2e802ca5, 0x008d0e80, 0x00040004 },
+   { 0x00000041, 0x2e8025a5, 0x00210de0, 0x00210da4 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2ec025a5, 0x008d8000, 0x008d0e20 },
+   { 0x00802041, 0x2ec024a5, 0x008d0ec0, 0x008c0da0 },
+   { 0x0080200c, 0x2ec02ca5, 0x008d0ec0, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f0025a5, 0x008d8000, 0x008d0e40 },
+   { 0x00802041, 0x2f0024a5, 0x008d0f00, 0x008c0da0 },
+   { 0x0080200c, 0x2f002ca5, 0x008d0f00, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f4025a5, 0x008d8000, 0x008d0e60 },
+   { 0x00802041, 0x2f4024a5, 0x008d0f40, 0x008c0da0 },
+   { 0x0080200c, 0x2f402ca5, 0x008d0f40, 0x00040004 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00000400 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00000400 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00000400 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00000400 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x0000000b },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x0000000b },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x0000000b },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x0000000b },
+   { 0x00800001, 0x2dc001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2de001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2e0001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2e2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00000001, 0x2a000001, 0x00210200, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x0db00da0 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00080000 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00080000 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00080000 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00080000 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x00000014 },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x00000014 },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x00000014 },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x00000014 },
+   { 0x00000001, 0x22000020, 0x00210a00, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x34000c20, 0x00210fc0, 0x00000020 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/ipicture.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,313 @@
+   { 0x00600001, 0x2a400021, 0x008d03e0, 0x00000000 },
+   { 0x00200001, 0x23e00121, 0x00450a4c, 0x00000000 },
+   { 0x00000005, 0x2da02d29, 0x00210a48, 0x001f001f },
+   { 0x00000005, 0x2da42d29, 0x00210a48, 0x60006000 },
+   { 0x00000008, 0x2da42d29, 0x00210da4, 0x000d000d },
+   { 0x00000001, 0x2da60169, 0x00000000, 0x00080008 },
+   { 0x00000008, 0x2da42529, 0x00210da6, 0x00210da4 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00090009 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00110011 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00190019 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffe7ffe7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00030003 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x00400040 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xfff7fff7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00010001 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x000a000a },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffefffef },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00020002 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x001c001c },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00000009, 0x2da00d29, 0x00210da0, 0x00000001 },
+   { 0x00000001, 0x2dc00129, 0x00210da0, 0x00000000 },
+   { 0x00800001, 0x2e000229, 0x00b10020, 0x00000000 },
+   { 0x00800001, 0x2e200229, 0x00b10030, 0x00000000 },
+   { 0x00800001, 0x2e400229, 0x00b10040, 0x00000000 },
+   { 0x00800001, 0x2e600229, 0x00b10050, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x03f003e0 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000142 },
+   { 0x00800001, 0x270001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x272001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x274001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x276001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000136 },
+   { 0x00800001, 0x278001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x27a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x27c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x27e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000012a },
+   { 0x00800001, 0x280001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x282001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x284001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x286001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000011e },
+   { 0x00800001, 0x288001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x28a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x28c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x28e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000112 },
+   { 0x00800001, 0x290001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x292001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x294001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x296001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000106 },
+   { 0x00800001, 0x298001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x29a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x29c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x29e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x06f006e0 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000011e },
+   { 0x00600040, 0x2a602dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2a802dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2aa02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2ac02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2ae02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2b002dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2b202dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2b402dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000010a },
+   { 0x00600040, 0x2a702dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2a902dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2ab02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2ad02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2af02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2b102dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2b302dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2b502dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000f6 },
+   { 0x00600040, 0x2b602dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2b802dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2ba02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2bc02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2be02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2c002dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2c202dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2c402dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000e2 },
+   { 0x00600040, 0x2b702dad, 0x00ae0400, 0x00800080 },
+   { 0x00600040, 0x2b902dad, 0x00ae0420, 0x00800080 },
+   { 0x00600040, 0x2bb02dad, 0x00ae0440, 0x00800080 },
+   { 0x00600040, 0x2bd02dad, 0x00ae0460, 0x00800080 },
+   { 0x00600040, 0x2bf02dad, 0x00ae0480, 0x00800080 },
+   { 0x00600040, 0x2c102dad, 0x00ae04a0, 0x00800080 },
+   { 0x00600040, 0x2c302dad, 0x00ae04c0, 0x00800080 },
+   { 0x00600040, 0x2c502dad, 0x00ae04e0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000ce },
+   { 0x00800040, 0x2c602dad, 0x00ae0400, 0x00800080 },
+   { 0x00800040, 0x2c802dad, 0x00ae0440, 0x00800080 },
+   { 0x00800040, 0x2ca02dad, 0x00ae0480, 0x00800080 },
+   { 0x00800040, 0x2cc02dad, 0x00ae04c0, 0x00800080 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000c2 },
+   { 0x00800040, 0x2ce02dad, 0x00ae0400, 0x00800080 },
+   { 0x00800040, 0x2d002dad, 0x00ae0440, 0x00800080 },
+   { 0x00800040, 0x2d202dad, 0x00ae0480, 0x00800080 },
+   { 0x00800040, 0x2d402dad, 0x00ae04c0, 0x00800080 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x000f000f },
+   { 0x80800001, 0x4a6001b1, 0x00b10a60, 0x00000000 },
+   { 0x80800001, 0x4a8001b1, 0x00b10a80, 0x00000000 },
+   { 0x80800001, 0x4aa001b1, 0x00b10aa0, 0x00000000 },
+   { 0x80800001, 0x4ac001b1, 0x00b10ac0, 0x00000000 },
+   { 0x80800001, 0x4ae001b1, 0x00b10ae0, 0x00000000 },
+   { 0x80800001, 0x4b0001b1, 0x00b10b00, 0x00000000 },
+   { 0x80800001, 0x4b2001b1, 0x00b10b20, 0x00000000 },
+   { 0x80800001, 0x4b4001b1, 0x00b10b40, 0x00000000 },
+   { 0x80800001, 0x4b6001b1, 0x00b10b60, 0x00000000 },
+   { 0x80800001, 0x4b8001b1, 0x00b10b80, 0x00000000 },
+   { 0x80800001, 0x4ba001b1, 0x00b10ba0, 0x00000000 },
+   { 0x80800001, 0x4bc001b1, 0x00b10bc0, 0x00000000 },
+   { 0x80800001, 0x4be001b1, 0x00b10be0, 0x00000000 },
+   { 0x80800001, 0x4c0001b1, 0x00b10c00, 0x00000000 },
+   { 0x80800001, 0x4c2001b1, 0x00b10c20, 0x00000000 },
+   { 0x80800001, 0x4c4001b1, 0x00b10c40, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a42, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x00800001, 0x20200232, 0x00b20a60, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20a80, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20aa0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20ac0, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20ae0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20b00, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20b20, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20b40, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20b60, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20b80, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20ba0, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20bc0, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20be0, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20c00, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20c20, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20c40, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000020 },
+   { 0x00800001, 0x20200232, 0x00b20a60, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20b60, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20a80, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20b80, 0x00000000 },
+   { 0x00800001, 0x20600232, 0x00b20aa0, 0x00000000 },
+   { 0x00800001, 0x20700232, 0x00b20ba0, 0x00000000 },
+   { 0x00800001, 0x20800232, 0x00b20ac0, 0x00000000 },
+   { 0x00800001, 0x20900232, 0x00b20bc0, 0x00000000 },
+   { 0x00800001, 0x20a00232, 0x00b20ae0, 0x00000000 },
+   { 0x00800001, 0x20b00232, 0x00b20be0, 0x00000000 },
+   { 0x00800001, 0x20c00232, 0x00b20b00, 0x00000000 },
+   { 0x00800001, 0x20d00232, 0x00b20c00, 0x00000000 },
+   { 0x00800001, 0x20e00232, 0x00b20b20, 0x00000000 },
+   { 0x00800001, 0x20f00232, 0x00b20c20, 0x00000000 },
+   { 0x00800001, 0x21000232, 0x00b20b40, 0x00000000 },
+   { 0x00800001, 0x21100232, 0x00b20c40, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x12082000 },
+   { 0x00000001, 0x23e80061, 0x00000000, 0x00070007 },
+   { 0x00200008, 0x23e01d21, 0x00450a4c, 0x00000001 },
+   { 0x80800001, 0x4c6001b1, 0x00b10c60, 0x00000000 },
+   { 0x80800001, 0x4c8001b1, 0x00b10c80, 0x00000000 },
+   { 0x80800001, 0x4ca001b1, 0x00b10ca0, 0x00000000 },
+   { 0x80800001, 0x4cc001b1, 0x00b10cc0, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20c60, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20c80, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20ca0, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20cc0, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082001 },
+   { 0x80800001, 0x4ce001b1, 0x00b10ce0, 0x00000000 },
+   { 0x80800001, 0x4d0001b1, 0x00b10d00, 0x00000000 },
+   { 0x80800001, 0x4d2001b1, 0x00b10d20, 0x00000000 },
+   { 0x80800001, 0x4d4001b1, 0x00b10d40, 0x00000000 },
+   { 0x00800001, 0x20200232, 0x00b20ce0, 0x00000000 },
+   { 0x00800001, 0x20300232, 0x00b20d00, 0x00000000 },
+   { 0x00800001, 0x20400232, 0x00b20d20, 0x00000000 },
+   { 0x00800001, 0x20500232, 0x00b20d40, 0x00000000 },
+   { 0x00800031, 0x24001d28, 0x508d03e0, 0x06082002 },
+   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00000001, 0x2de001ad, 0x00218000, 0x00000000 },
+   { 0x00802041, 0x2e8025a5, 0x008d8000, 0x008d0e00 },
+   { 0x00802041, 0x2e8024a5, 0x008d0e80, 0x008c0da0 },
+   { 0x0080200c, 0x2e802ca5, 0x008d0e80, 0x00040004 },
+   { 0x00000041, 0x2e8025a5, 0x00210de0, 0x00210da4 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2ec025a5, 0x008d8000, 0x008d0e20 },
+   { 0x00802041, 0x2ec024a5, 0x008d0ec0, 0x008c0da0 },
+   { 0x0080200c, 0x2ec02ca5, 0x008d0ec0, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f0025a5, 0x008d8000, 0x008d0e40 },
+   { 0x00802041, 0x2f0024a5, 0x008d0f00, 0x008c0da0 },
+   { 0x0080200c, 0x2f002ca5, 0x008d0f00, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f4025a5, 0x008d8000, 0x008d0e60 },
+   { 0x00802041, 0x2f4024a5, 0x008d0f40, 0x008c0da0 },
+   { 0x0080200c, 0x2f402ca5, 0x008d0f40, 0x00040004 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00000400 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00000400 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00000400 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00000400 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x0000000b },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x0000000b },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x0000000b },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x0000000b },
+   { 0x00800001, 0x2dc001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2de001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2e0001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2e2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00000001, 0x2a000001, 0x00210200, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x0db00da0 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00080000 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00080000 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00080000 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00080000 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x00000014 },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x00000014 },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x00000014 },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x00000014 },
+   { 0x00000001, 0x22000020, 0x00210a00, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x34000c20, 0x00210fc0, 0x00000020 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_intra.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_intra.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_intra.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_intra.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,131 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix in UB format
+           g3~g4:non intra IQ matrix in UB format
+           g5~g20:IDCT table
+   g32~g55:DCT data before IQ
+   g56~g79:DCT data after IQ
+   g82:    thread payload backup
+   g109:   g109.0:q_scale_code, g109.4:intra_dc_mult, 
+   g110:   q_scale_code
+   g111:   intra DC coefficient 
+   g112~g115: intra IQ matrix in UW format (in order to use instruction compress), copys from g1~g2
+   g125:   ip before jump
+*/
+and (1) g109.0<1>UW g82.8<1,1,1>UW 0x1fUW {align1};    //q_scale_code
+
+and (1) g109.4<1>UW g82.8<1,1,1>UW 0x6000UW {align1};   //intra_dc_presion
+shr (1) g109.4<1>UW g109.4<1,1,1>UW 13UW {align1};
+mov (1) g109.6<1>UW 0x8UW {align1};
+shr (1) g109.4<1>UW g109.6<1,1,1>UW g109.4<1,1,1>UW {align1};  //intra_dc_mult
+ 
+and.z (1) null g82.8<1,1,1>UW 0x20UW {align1};   //if(q_scale_type==0) q_scale=q_scale_code*2;
+(f0) jmpi Q_SCALE_TYPE_0;
+
+cmp.l (1) null g109.0<1,1,1>UW 9UW {align1};      //if(q_scale_type!=0) calculate q_scale
+(f0) jmpi DO_IQ;
+cmp.l (1) null g109.0<1,1,1>UW 17UW {align1};
+(f0) jmpi RANG_9_16;
+cmp.l (1) null g109.0<1,1,1>UW 25UW {align1};
+(f0) jmpi RANG_17_24;
+
+RANG_25_31:
+add (1) g109.0<1>UW g109.0<1,1,1>UW -25W {align1};
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 3UW {align1};
+add (1) g109.0<1>UW g109.0<1,1,1>UW 64UW {align1};
+jmpi DO_IQ;
+
+RANG_9_16:
+add (1) g109.0<1>UW g109.0<1,1,1>UW -9W {align1};
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 1UW {align1};
+add (1) g109.0<1>UW g109.0<1,1,1>UW 10UW {align1};
+jmpi DO_IQ;
+
+RANG_17_24:
+add (1) g109.0<1>UW g109.0<1,1,1>UW -17W {align1};
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 2UW {align1};
+add (1) g109.0<1>UW g109.0<1,1,1>UW 28UW {align1};
+jmpi DO_IQ;
+
+Q_SCALE_TYPE_0:
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 1UD {align1};
+
+DO_IQ:
+mov (1) g110.0<1>UW g109.0<1,1,1>UW {align1};
+
+mov (16) g112.0<1>UW g1.0<16,16,1>UB {align1};
+mov (16) g113.0<1>UW g1.16<16,16,1>UB {align1};
+mov (16) g114.0<1>UW g2.0<16,16,1>UB {align1};
+mov (16) g115.0<1>UW g2.16<16,16,1>UB {align1};
+
+mov (1) a0.0<1>UD 0x03F003E0UD {align1};
+
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_INTRA;
+mov (16) g56.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g57.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g58.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g59.0<1>W g122.0<16,8,2>W {align1};
+
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_INTRA;
+mov (16) g60.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g61.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g62.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g63.0<1>W g122.0<16,8,2>W {align1};
+
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_INTRA;
+mov (16) g64.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g65.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g66.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g67.0<1>W g122.0<16,8,2>W {align1};
+
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_INTRA;
+mov (16) g68.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g69.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g70.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g71.0<1>W g122.0<16,8,2>W {align1};
+
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_INTRA;
+mov (16) g72.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g73.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g74.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g75.0<1>W g122.0<16,8,2>W {align1};
+
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_INTRA;
+mov (16) g76.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g77.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g78.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g79.0<1>W g122.0<16,8,2>W {align1};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_non_intra.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_non_intra.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_non_intra.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/iq_non_intra.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,150 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix in UB format
+           g3~g4:non intra IQ matrix in UB format
+           g5~g20:IDCT table
+   g32~g55:DCT data before IQ
+   g56~g79:DCT data after IQ
+   g82:    thread payload backup
+   g109:   q_scale_code
+   g110:   q_scale_code
+   g112~g115: non intra IQ matrix in UW format (in order to use instruction compress), copys from g3~g4
+   g125:   ip before jump
+*/
+and (1) g109.0<1>UW g82.8<1,1,1>UW 0x1fUW {align1}; //q_scale_code
+
+and.z (1) null g82.8<1,1,1>UW 0x20UW {align1};   //if(q_scale_type==0) q_scale=q_scale_code*2;
+(f0) jmpi Q_SCALE_TYPE_0;
+
+cmp.l (1) null g109.0<1,1,1>UW 9UW {align1};      //if(q_scale_type!=0) calculate q_scale
+(f0) jmpi DO_IQ;
+cmp.l (1) null g109.0<1,1,1>UW 17UW {align1};
+(f0) jmpi RANG_9_16;
+cmp.l (1) null g109.0<1,1,1>UW 25UW {align1};
+(f0) jmpi RANG_17_24;
+
+RANG_25_31:
+add (1) g109.0<1>UW g109.0<1,1,1>UW -25W {align1};
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 3UW {align1};
+add (1) g109.0<1>UW g109.0<1,1,1>UW 64UW {align1};
+jmpi DO_IQ;
+
+RANG_9_16:
+add (1) g109.0<1>UW g109.0<1,1,1>UW -9W {align1};
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 1UW {align1};
+add (1) g109.0<1>UW g109.0<1,1,1>UW 10UW {align1};
+jmpi DO_IQ;
+
+RANG_17_24:
+add (1) g109.0<1>UW g109.0<1,1,1>UW -17W {align1};
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 2UW {align1};
+add (1) g109.0<1>UW g109.0<1,1,1>UW 28UW {align1};
+jmpi DO_IQ;
+
+Q_SCALE_TYPE_0:
+shl (1) g109.0<1>UW g109.0<1,1,1>UW 1UD {align1};
+
+DO_IQ:
+mov (1) g110.0<1>UW g109.0<1,1,1>UW {align1};
+
+mov (16) g112.0<1>UW g3.0<16,16,1>UB {align1};
+mov (16) g113.0<1>UW g3.16<16,16,1>UB {align1};
+mov (16) g114.0<1>UW g4.0<16,16,1>UB {align1};
+mov (16) g115.0<1>UW g4.16<16,16,1>UB {align1};
+
+mov (1) a0.0<1>UD 0x03F003E0UD {align1};
+
+//Y0
+iq_non_intra_y0:
+and.z (1) null g82.8<1,1,1>UW 0x800UW {align1};
+(f0) jmpi iq_non_intra_y1;
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_NON_INTRA;
+mov (16) g56.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g57.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g58.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g59.0<1>W g122.0<16,8,2>W {align1};
+
+//Y1
+iq_non_intra_y1:
+and.z (1) null g82.8<1,1,1>UW 0x400UW {align1};
+(f0) jmpi iq_non_intra_y2;
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_NON_INTRA;
+mov (16) g60.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g61.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g62.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g63.0<1>W g122.0<16,8,2>W {align1};
+
+//Y2
+iq_non_intra_y2:
+and.z (1) null g82.8<1,1,1>UW 0x200UW {align1};
+(f0) jmpi iq_non_intra_y3;
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_NON_INTRA;
+mov (16) g64.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g65.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g66.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g67.0<1>W g122.0<16,8,2>W {align1};
+
+//Y3
+iq_non_intra_y3:
+and.z (1) null g82.8<1,1,1>UW 0x100UW {align1};
+(f0) jmpi iq_non_intra_u;
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_NON_INTRA;
+mov (16) g68.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g69.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g70.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g71.0<1>W g122.0<16,8,2>W {align1};
+
+//U
+iq_non_intra_u:
+and.z (1) null g82.8<1,1,1>UW 0x80UW {align1};
+(f0) jmpi iq_non_intra_v;
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_NON_INTRA;
+mov (16) g72.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g73.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g74.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g75.0<1>W g122.0<16,8,2>W {align1};
+
+//V
+iq_non_intra_v:
+and.z (1) null g82.8<1,1,1>UW 0x40UW {align1};
+(f0) jmpi iq_non_intra_end;
+mov (1) g125.0<1>UD ip {align1};
+jmpi DO_IQ_NON_INTRA;
+mov (16) g76.0<1>W g116.0<16,8,2>W {align1};
+mov (16) g77.0<1>W g118.0<16,8,2>W {align1};
+mov (16) g78.0<1>W g120.0<16,8,2>W {align1};
+mov (16) g79.0<1>W g122.0<16,8,2>W {align1};
+
+iq_non_intra_end:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4a new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4a
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4a	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4a	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,190 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix in UB format
+           g3~g4:non intra IQ matrix in UB format
+           g5~g20:IDCT table
+   g32~g55:DCT data before IQ
+   g56~g79:DCT data after IQ
+   g83~g106: IDCT data after idct
+   g82:    thread payload backup
+   g125:   ip before jump
+*/
+include(`iq_non_intra.g4i')
+
+define(`ROW_SHIFT', `11UD') //define for idct
+define(`ROW_ADD', `0x400UD')            
+define(`COL_SHIFT', `20UD') 
+define(`COL_ADD', `0x80000UD')           
+
+mov (1) a0.0<1>UD 0x06F006E0UD {align1};//0x06F006E0UD+0x00200020UD=0x07100700UD (g56.0 and g56.16,the start of DCT data)
+
+//Y0
+and.nz (1) null g82.8<1,1,1>UW 0x800UW {align1};
+(f0) jmpi do_idct_y0;
+
+mov (8) g83.0<1>UW 0UW {align1}; 
+mov (8) g84.0<1>UW 0UW {align1}; 
+mov (8) g85.0<1>UW 0UW {align1}; 
+mov (8) g86.0<1>UW 0UW {align1}; 
+mov (8) g87.0<1>UW 0UW {align1}; 
+mov (8) g88.0<1>UW 0UW {align1}; 
+mov (8) g89.0<1>UW 0UW {align1}; 
+mov (8) g90.0<1>UW 0UW {align1}; 
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00800080UD {align1};
+jmpi block_y1;
+do_idct_y0:
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+mov (8) g83.0<1>W g32.0<16,8,2>W {align1};
+mov (8) g84.0<1>W g33.0<16,8,2>W {align1};
+mov (8) g85.0<1>W g34.0<16,8,2>W {align1};
+mov (8) g86.0<1>W g35.0<16,8,2>W {align1};
+mov (8) g87.0<1>W g36.0<16,8,2>W {align1};
+mov (8) g88.0<1>W g37.0<16,8,2>W {align1};
+mov (8) g89.0<1>W g38.0<16,8,2>W {align1};
+mov (8) g90.0<1>W g39.0<16,8,2>W {align1};
+
+//Y1
+block_y1:
+and.nz (1) null g82.8<1,1,1>UW 0x400UW {align1};
+(f0) jmpi do_idct_y1;
+mov (8) g83.16<1>UW 0UW {align1}; 
+mov (8) g84.16<1>UW 0UW {align1}; 
+mov (8) g85.16<1>UW 0UW {align1}; 
+mov (8) g86.16<1>UW 0UW {align1}; 
+mov (8) g87.16<1>UW 0UW {align1}; 
+mov (8) g88.16<1>UW 0UW {align1}; 
+mov (8) g89.16<1>UW 0UW {align1}; 
+mov (8) g90.16<1>UW 0UW {align1}; 
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00800080UD {align1};
+jmpi block_y2;
+do_idct_y1:
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+mov (8) g83.16<1>W g32.0<16,8,2>W {align1};
+mov (8) g84.16<1>W g33.0<16,8,2>W {align1};
+mov (8) g85.16<1>W g34.0<16,8,2>W {align1};
+mov (8) g86.16<1>W g35.0<16,8,2>W {align1};
+mov (8) g87.16<1>W g36.0<16,8,2>W {align1};
+mov (8) g88.16<1>W g37.0<16,8,2>W {align1};
+mov (8) g89.16<1>W g38.0<16,8,2>W {align1};
+mov (8) g90.16<1>W g39.0<16,8,2>W {align1};
+
+//Y2
+block_y2:
+and.nz (1) null g82.8<1,1,1>UW 0x200UW {align1};
+(f0) jmpi do_idct_y2;
+mov (8) g91.0<1>UW 0UW {align1}; 
+mov (8) g92.0<1>UW 0UW {align1}; 
+mov (8) g93.0<1>UW 0UW {align1}; 
+mov (8) g94.0<1>UW 0UW {align1}; 
+mov (8) g95.0<1>UW 0UW {align1}; 
+mov (8) g96.0<1>UW 0UW {align1}; 
+mov (8) g97.0<1>UW 0UW {align1}; 
+mov (8) g98.0<1>UW 0UW {align1}; 
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00800080UD {align1};
+jmpi block_y3;
+do_idct_y2:
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+mov (8) g91.0<1>W g32.0<16,8,2>W {align1};
+mov (8) g92.0<1>W g33.0<16,8,2>W {align1};
+mov (8) g93.0<1>W g34.0<16,8,2>W {align1};
+mov (8) g94.0<1>W g35.0<16,8,2>W {align1};
+mov (8) g95.0<1>W g36.0<16,8,2>W {align1};
+mov (8) g96.0<1>W g37.0<16,8,2>W {align1};
+mov (8) g97.0<1>W g38.0<16,8,2>W {align1};
+mov (8) g98.0<1>W g39.0<16,8,2>W {align1};
+
+//Y3
+block_y3:
+and.nz (1) null g82.8<1,1,1>UW 0x100UW {align1};
+(f0) jmpi do_idct_y3;
+mov (8) g91.16<1>UW 0UW {align1}; 
+mov (8) g92.16<1>UW 0UW {align1}; 
+mov (8) g93.16<1>UW 0UW {align1}; 
+mov (8) g94.16<1>UW 0UW {align1}; 
+mov (8) g95.16<1>UW 0UW {align1}; 
+mov (8) g96.16<1>UW 0UW {align1}; 
+mov (8) g97.16<1>UW 0UW {align1}; 
+mov (8) g98.16<1>UW 0UW {align1}; 
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00800080UD {align1};
+jmpi block_u;
+do_idct_y3:
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+mov (8) g91.16<1>W g32.0<16,8,2>W {align1};
+mov (8) g92.16<1>W g33.0<16,8,2>W {align1};
+mov (8) g93.16<1>W g34.0<16,8,2>W {align1};
+mov (8) g94.16<1>W g35.0<16,8,2>W {align1};
+mov (8) g95.16<1>W g36.0<16,8,2>W {align1};
+mov (8) g96.16<1>W g37.0<16,8,2>W {align1};
+mov (8) g97.16<1>W g38.0<16,8,2>W {align1};
+mov (8) g98.16<1>W g39.0<16,8,2>W {align1};
+
+//U
+block_u:
+and.nz (1) null g82.8<1,1,1>UW 0x80UW {align1};
+(f0) jmpi do_idct_u;
+mov (16) g99.0<1>UW 0UW {align1}; 
+mov (16) g100.0<1>UW 0UW {align1}; 
+mov (16) g101.0<1>UW 0UW {align1}; 
+mov (16) g102.0<1>UW 0UW {align1}; 
+add (1) a0.0<1>UD a0.0<1,1,1>UD 0x00800080UD {align1};
+jmpi block_v;
+do_idct_u:
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+mov (16) g99.0<1>W g32.0<16,8,2>W {align1};
+mov (16) g100.0<1>W g34.0<16,8,2>W {align1};
+mov (16) g101.0<1>W g36.0<16,8,2>W {align1};
+mov (16) g102.0<1>W g38.0<16,8,2>W {align1};
+
+//V
+block_v:
+and.nz (1) null g82.8<1,1,1>UW 0x40UW {align1};
+(f0) jmpi do_idct_v;
+mov (16) g103.0<1>UW 0UW {align1}; 
+mov (16) g104.0<1>UW 0UW {align1}; 
+mov (16) g105.0<1>UW 0UW {align1}; 
+mov (16) g106.0<1>UW 0UW {align1};  
+jmpi block_end;
+do_idct_v:
+mov (1) g125.0<1>UD ip {align1};
+jmpi IDCT_START;
+mov (16) g103.0<1>W g32.0<16,8,2>W {align1};
+mov (16) g104.0<1>W g34.0<16,8,2>W {align1};
+mov (16) g105.0<1>W g36.0<16,8,2>W {align1};
+mov (16) g106.0<1>W g38.0<16,8,2>W {align1};
+block_end:
+
+add (1) ip g126.8<1,1,1>UD 0x20UD {align1};            //jump back
+include(`do_iq_non_intra.g4i')
+include(`idct.g4i')
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,307 @@
+   { 0x00000005, 0x2da02d29, 0x00210a48, 0x001f001f },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00090009 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000011 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00110011 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00190019 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffe7ffe7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00030003 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x00400040 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000009 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xfff7fff7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00010001 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x000a000a },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000005 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffefffef },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00020002 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x001c001c },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000001 },
+   { 0x00000009, 0x2da00d29, 0x00210da0, 0x00000001 },
+   { 0x00000001, 0x2dc00129, 0x00210da0, 0x00000000 },
+   { 0x00800001, 0x2e000229, 0x00b10060, 0x00000000 },
+   { 0x00800001, 0x2e200229, 0x00b10070, 0x00000000 },
+   { 0x00800001, 0x2e400229, 0x00b10080, 0x00000000 },
+   { 0x00800001, 0x2e600229, 0x00b10090, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x03f003e0 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x08000800 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000a1 },
+   { 0x00800001, 0x270001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x272001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x274001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x276001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x04000400 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000099 },
+   { 0x00800001, 0x278001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x27a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x27c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x27e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x02000200 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000091 },
+   { 0x00800001, 0x280001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x282001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x284001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x286001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x01000100 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000089 },
+   { 0x00800001, 0x288001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x28a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x28c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x28e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00800080 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000081 },
+   { 0x00800001, 0x290001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x292001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x294001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x296001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00400040 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000079 },
+   { 0x00800001, 0x298001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x29a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x29c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x29e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x06f006e0 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x08000800 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00600001, 0x2a600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2a800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2aa00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ac00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ae00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b400169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000077 },
+   { 0x00600001, 0x2a6001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2a8001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2aa001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2ac001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2ae001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2b0001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2b2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2b4001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x04000400 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00600001, 0x2a700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2a900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ab00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ad00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2af00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b500169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000061 },
+   { 0x00600001, 0x2a7001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2a9001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2ab001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2ad001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2af001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2b1001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2b3001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2b5001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x02000200 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00600001, 0x2b600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ba00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bc00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2be00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c400169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000004b },
+   { 0x00600001, 0x2b6001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2b8001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2ba001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2bc001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2be001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2c0001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2c2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2c4001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x01000100 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00600001, 0x2b700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bb00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bd00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bf00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c500169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000035 },
+   { 0x00600001, 0x2b7001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2b9001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2bb001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2bd001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2bf001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2c1001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2c3001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2c5001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x00800080 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00800001, 0x2c600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2c800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2ca00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2cc00169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000023 },
+   { 0x00800001, 0x2c6001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2c8001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2ca001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2cc001ad, 0x00ae04c0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x00400040 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000005 },
+   { 0x00800001, 0x2ce00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d400169, 0x00000000, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000016 },
+   { 0x00800001, 0x2ce001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2d0001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2d2001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2d4001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2e8025a5, 0x008d8000, 0x008d0e00 },
+   { 0x00802041, 0x2e8024a5, 0x008d0e80, 0x008c0da0 },
+   { 0x0080200c, 0x2e802ca5, 0x008d0e80, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2ec025a5, 0x008d8000, 0x008d0e20 },
+   { 0x00802041, 0x2ec024a5, 0x008d0ec0, 0x008c0da0 },
+   { 0x0080200c, 0x2ec02ca5, 0x008d0ec0, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f0025a5, 0x008d8000, 0x008d0e40 },
+   { 0x00802041, 0x2f0024a5, 0x008d0f00, 0x008c0da0 },
+   { 0x0080200c, 0x2f002ca5, 0x008d0f00, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f4025a5, 0x008d8000, 0x008d0e60 },
+   { 0x00802041, 0x2f4024a5, 0x008d0f40, 0x008c0da0 },
+   { 0x0080200c, 0x2f402ca5, 0x008d0f40, 0x00040004 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000001a },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00000400 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00000400 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00000400 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00000400 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x0000000b },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x0000000b },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x0000000b },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x0000000b },
+   { 0x00800001, 0x2dc001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2de001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2e0001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2e2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00000001, 0x2a000001, 0x00210200, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x0db00da0 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00080000 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00080000 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00080000 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00080000 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x00000014 },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x00000014 },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x00000014 },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x00000014 },
+   { 0x00000001, 0x22000020, 0x00210a00, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x34000c20, 0x00210fc0, 0x00000020 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b.gen5 new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b.gen5
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b.gen5	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/lib.g4b.gen5	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,307 @@
+   { 0x00000005, 0x2da02d29, 0x00210a48, 0x001f001f },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000024 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00090009 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000022 },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00110011 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x05000010, 0x20002d3c, 0x00210da0, 0x00190019 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000010 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffe7ffe7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00030003 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x00400040 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000012 },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xfff7fff7 },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00010001 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x000a000a },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00000040, 0x2da03d29, 0x00210da0, 0xffefffef },
+   { 0x00000009, 0x2da02d29, 0x00210da0, 0x00020002 },
+   { 0x00000040, 0x2da02d29, 0x00210da0, 0x001c001c },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000002 },
+   { 0x00000009, 0x2da00d29, 0x00210da0, 0x00000001 },
+   { 0x00000001, 0x2dc00129, 0x00210da0, 0x00000000 },
+   { 0x00800001, 0x2e000229, 0x00b10060, 0x00000000 },
+   { 0x00800001, 0x2e200229, 0x00b10070, 0x00000000 },
+   { 0x00800001, 0x2e400229, 0x00b10080, 0x00000000 },
+   { 0x00800001, 0x2e600229, 0x00b10090, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x03f003e0 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x08000800 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000142 },
+   { 0x00800001, 0x270001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x272001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x274001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x276001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x04000400 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000132 },
+   { 0x00800001, 0x278001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x27a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x27c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x27e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x02000200 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000122 },
+   { 0x00800001, 0x280001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x282001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x284001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x286001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x01000100 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000112 },
+   { 0x00800001, 0x288001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x28a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x28c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x28e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00800080 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000102 },
+   { 0x00800001, 0x290001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x292001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x294001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x296001ad, 0x00ae0f40, 0x00000000 },
+   { 0x01000005, 0x20002d3c, 0x00210a48, 0x00400040 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000f2 },
+   { 0x00800001, 0x298001ad, 0x00ae0e80, 0x00000000 },
+   { 0x00800001, 0x29a001ad, 0x00ae0ec0, 0x00000000 },
+   { 0x00800001, 0x29c001ad, 0x00ae0f00, 0x00000000 },
+   { 0x00800001, 0x29e001ad, 0x00ae0f40, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x06f006e0 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x08000800 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00600001, 0x2a600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2a800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2aa00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ac00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ae00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b400169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000ee },
+   { 0x00600001, 0x2a6001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2a8001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2aa001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2ac001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2ae001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2b0001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2b2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2b4001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x04000400 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00600001, 0x2a700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2a900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ab00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ad00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2af00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b500169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x000000c2 },
+   { 0x00600001, 0x2a7001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2a9001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2ab001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2ad001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2af001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2b1001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2b3001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2b5001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x02000200 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00600001, 0x2b600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2ba00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bc00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2be00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c400169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000096 },
+   { 0x00600001, 0x2b6001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2b8001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2ba001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2bc001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2be001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2c0001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2c2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2c4001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x01000100 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00600001, 0x2b700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2b900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bb00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bd00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2bf00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x2c500169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000006a },
+   { 0x00600001, 0x2b7001ad, 0x00ae0400, 0x00000000 },
+   { 0x00600001, 0x2b9001ad, 0x00ae0420, 0x00000000 },
+   { 0x00600001, 0x2bb001ad, 0x00ae0440, 0x00000000 },
+   { 0x00600001, 0x2bd001ad, 0x00ae0460, 0x00000000 },
+   { 0x00600001, 0x2bf001ad, 0x00ae0480, 0x00000000 },
+   { 0x00600001, 0x2c1001ad, 0x00ae04a0, 0x00000000 },
+   { 0x00600001, 0x2c3001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00600001, 0x2c5001ad, 0x00ae04e0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x00800080 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00800001, 0x2c600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2c800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2ca00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2cc00169, 0x00000000, 0x00000000 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00800080 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000046 },
+   { 0x00800001, 0x2c6001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2c8001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2ca001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2cc001ad, 0x00ae04c0, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x00210a48, 0x00400040 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x0000000a },
+   { 0x00800001, 0x2ce00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x2d400169, 0x00000000, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000000c },
+   { 0x00000001, 0x2fa00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
+   { 0x00800001, 0x2ce001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2d0001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2d2001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2d4001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fc8, 0x00000020 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2e8025a5, 0x008d8000, 0x008d0e00 },
+   { 0x00802041, 0x2e8024a5, 0x008d0e80, 0x008c0da0 },
+   { 0x0080200c, 0x2e802ca5, 0x008d0e80, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2ec025a5, 0x008d8000, 0x008d0e20 },
+   { 0x00802041, 0x2ec024a5, 0x008d0ec0, 0x008c0da0 },
+   { 0x0080200c, 0x2ec02ca5, 0x008d0ec0, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f0025a5, 0x008d8000, 0x008d0e40 },
+   { 0x00802041, 0x2f0024a5, 0x008d0f00, 0x008c0da0 },
+   { 0x0080200c, 0x2f002ca5, 0x008d0f00, 0x00040004 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802041, 0x2f4025a5, 0x008d8000, 0x008d0e60 },
+   { 0x00802041, 0x2f4024a5, 0x008d0f40, 0x008c0da0 },
+   { 0x0080200c, 0x2f402ca5, 0x008d0f40, 0x00040004 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000034 },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00000400 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00000400 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00000400 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00000400 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x0000000b },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x0000000b },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x0000000b },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x0000000b },
+   { 0x00800001, 0x2dc001ad, 0x00ae0400, 0x00000000 },
+   { 0x00800001, 0x2de001ad, 0x00ae0440, 0x00000000 },
+   { 0x00800001, 0x2e0001ad, 0x00ae0480, 0x00000000 },
+   { 0x00800001, 0x2e2001ad, 0x00ae04c0, 0x00000000 },
+   { 0x00000001, 0x2a000001, 0x00210200, 0x00000000 },
+   { 0x00000001, 0x22000060, 0x00000000, 0x0db00da0 },
+   { 0x00000001, 0x2fc00001, 0x00001400, 0x00000000 },
+   { 0x00000020, 0x34001c00, 0x00001400, 0x00000014 },
+   { 0x00802040, 0x24000ca5, 0x008d0400, 0x00080000 },
+   { 0x00802040, 0x24400ca5, 0x008d0440, 0x00080000 },
+   { 0x00802040, 0x24800ca5, 0x008d0480, 0x00080000 },
+   { 0x00802040, 0x24c00ca5, 0x008d04c0, 0x00080000 },
+   { 0x00802008, 0x24000ca5, 0x008d0400, 0x00000014 },
+   { 0x00802008, 0x24400ca5, 0x008d0440, 0x00000014 },
+   { 0x00802008, 0x24800ca5, 0x008d0480, 0x00000014 },
+   { 0x00802008, 0x24c00ca5, 0x008d04c0, 0x00000014 },
+   { 0x00000001, 0x22000020, 0x00210a00, 0x00000000 },
+   { 0x00000040, 0x34000c20, 0x00210fa0, 0x00000020 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x240814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x242814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x244814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x246814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x248814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24a814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24c814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24e814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241014a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243014a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245014a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247014a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249014a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b014a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d014a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f014a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x22000c00, 0x00210200, 0x00200020 },
+   { 0x00802054, 0x250015a5, 0x008d8000, 0x008d00a0 },
+   { 0x00802054, 0x254015a5, 0x008d8000, 0x008d00e0 },
+   { 0x00802054, 0x258015a5, 0x008d8000, 0x008d0120 },
+   { 0x00802054, 0x25c015a5, 0x008d8000, 0x008d0160 },
+   { 0x00802054, 0x260015a5, 0x008d8000, 0x008d01a0 },
+   { 0x00802054, 0x264015a5, 0x008d8000, 0x008d01e0 },
+   { 0x00802054, 0x268015a5, 0x008d8000, 0x008d0220 },
+   { 0x00802054, 0x26c015a5, 0x008d8000, 0x008d0260 },
+   { 0x00200040, 0x241814a5, 0x00800500, 0x00800510 },
+   { 0x00200040, 0x243814a5, 0x00800540, 0x00800550 },
+   { 0x00200040, 0x245814a5, 0x00800580, 0x00800590 },
+   { 0x00200040, 0x247814a5, 0x008005c0, 0x008005d0 },
+   { 0x00200040, 0x249814a5, 0x00800600, 0x00800610 },
+   { 0x00200040, 0x24b814a5, 0x00800640, 0x00800650 },
+   { 0x00200040, 0x24d814a5, 0x00800680, 0x00800690 },
+   { 0x00200040, 0x24f814a5, 0x008006c0, 0x008006d0 },
+   { 0x00000040, 0x34000c20, 0x00210fc0, 0x00000020 },
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,74 @@
+
+INTEL_G4I = addidct.g4i               \
+	    do_iq_intra.g4i           \
+	    do_iq_non_intra.g4i       \
+	    idct.g4i                  \
+	    iq_intra.g4i              \
+	    iq_non_intra.g4i          \
+	    motion_field_uv.g4i       \
+	    motion_field_y.g4i        \
+	    motion_frame_uv.g4i       \
+	    motion_frame_y.g4i        \
+	    read_field_x0y0_uv.g4i    \
+	    read_field_x0y1_uv.g4i    \
+	    read_field_x1y0_uv.g4i    \
+	    read_field_x1y1_uv.g4i    \
+	    read_field_x0y0_y.g4i     \
+	    read_field_x0y1_y.g4i     \
+	    read_field_x1y0_y.g4i     \
+	    read_field_x1y1_y.g4i     \
+	    read_frame_x0y0_uv.g4i    \
+	    read_frame_x0y1_uv.g4i    \
+	    read_frame_x1y0_uv.g4i    \
+	    read_frame_x1y1_uv.g4i    \
+	    read_frame_x0y0_y.g4i     \
+	    read_frame_x0y1_y.g4i     \
+	    read_frame_x1y0_y.g4i     \
+	    read_frame_x1y1_y.g4i
+
+INTEL_G4A = ipicture.g4a 	\
+	    lib.g4a		\
+	    frame_forward.g4a	\
+	    frame_backward.g4a	\
+	    frame_f_b.g4a	\
+	    field_forward.g4a	\
+	    field_backward.g4a	\
+	    field_f_b.g4a	
+
+INTEL_G4B = ipicture.g4b	\
+	    lib.g4b		\
+	    frame_forward.g4b	\
+	    frame_backward.g4b	\
+	    frame_f_b.g4b	\
+	    field_forward.g4b	\
+	    field_backward.g4b  \
+	    field_f_b.g4b
+
+INTEL_G4B_GEN5 = ipicture.g4b.gen5	\
+	    lib.g4b.gen5		\
+	    frame_forward.g4b.gen5	\
+	    frame_backward.g4b.gen5	\
+	    frame_f_b.g4b.gen5		\
+	    field_forward.g4b.gen5	\
+	    field_backward.g4b.gen5  	\
+	    field_f_b.g4b.gen5
+
+EXTRA_DIST = $(INTEL_G4I)	\
+	     $(INTEL_G4A)       \
+	     $(INTEL_G4B)    	\
+	     $(INTEL_G4B_GEN5)
+
+if HAVE_GEN4ASM
+
+SUFFIXES = .g4a .g4b
+.g4a.g4b:
+	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
+
+$(INTEL_G4B): $(INTEL_G4I)
+
+BUILT_SOURCES= $(INTEL_G4B)
+
+clean-local:
+	-rm -f $(INTEL_G4B)
+	-rm -f $(INTEL_G4B_GEN5)
+endif    
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,449 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/xvmc/shader/vld
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRIVER_NAME = @DRIVER_NAME@
+DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
+DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
+DRM_CFLAGS = @DRM_CFLAGS@
+DRM_LIBS = @DRM_LIBS@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
+GREP = @GREP@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_LIBS = @XORG_LIBS@
+XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
+XVMCLIB_LIBS = @XVMCLIB_LIBS@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+INTEL_G4I = addidct.g4i               \
+	    do_iq_intra.g4i           \
+	    do_iq_non_intra.g4i       \
+	    idct.g4i                  \
+	    iq_intra.g4i              \
+	    iq_non_intra.g4i          \
+	    motion_field_uv.g4i       \
+	    motion_field_y.g4i        \
+	    motion_frame_uv.g4i       \
+	    motion_frame_y.g4i        \
+	    read_field_x0y0_uv.g4i    \
+	    read_field_x0y1_uv.g4i    \
+	    read_field_x1y0_uv.g4i    \
+	    read_field_x1y1_uv.g4i    \
+	    read_field_x0y0_y.g4i     \
+	    read_field_x0y1_y.g4i     \
+	    read_field_x1y0_y.g4i     \
+	    read_field_x1y1_y.g4i     \
+	    read_frame_x0y0_uv.g4i    \
+	    read_frame_x0y1_uv.g4i    \
+	    read_frame_x1y0_uv.g4i    \
+	    read_frame_x1y1_uv.g4i    \
+	    read_frame_x0y0_y.g4i     \
+	    read_frame_x0y1_y.g4i     \
+	    read_frame_x1y0_y.g4i     \
+	    read_frame_x1y1_y.g4i
+
+INTEL_G4A = ipicture.g4a 	\
+	    lib.g4a		\
+	    frame_forward.g4a	\
+	    frame_backward.g4a	\
+	    frame_f_b.g4a	\
+	    field_forward.g4a	\
+	    field_backward.g4a	\
+	    field_f_b.g4a	
+
+INTEL_G4B = ipicture.g4b	\
+	    lib.g4b		\
+	    frame_forward.g4b	\
+	    frame_backward.g4b	\
+	    frame_f_b.g4b	\
+	    field_forward.g4b	\
+	    field_backward.g4b  \
+	    field_f_b.g4b
+
+INTEL_G4B_GEN5 = ipicture.g4b.gen5	\
+	    lib.g4b.gen5		\
+	    frame_forward.g4b.gen5	\
+	    frame_backward.g4b.gen5	\
+	    frame_f_b.g4b.gen5		\
+	    field_forward.g4b.gen5	\
+	    field_backward.g4b.gen5  	\
+	    field_f_b.g4b.gen5
+
+EXTRA_DIST = $(INTEL_G4I)	\
+	     $(INTEL_G4A)       \
+	     $(INTEL_G4B)    	\
+	     $(INTEL_G4B_GEN5)
+
+@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
+@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .g4a .g4b
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/xvmc/shader/vld/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  src/xvmc/shader/vld/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+@HAVE_GEN4ASM_FALSE@clean-local:
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-info-am
+
+@HAVE_GEN4ASM_TRUE@.g4a.g4b:
+@HAVE_GEN4ASM_TRUE@	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
+
+@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
+
+@HAVE_GEN4ASM_TRUE@clean-local:
+@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B)
+@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B_GEN5)
+# 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 -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+       and.z (1) null mv1<1,1,1>W 1W {align1};       
+       (f0) jmpi L1;
+       and.z (1) null mv2<1,1,1>W 1W {align1};       
+       (f0) jmpi L2;
+       include(`read_field_x1y1_uv.g4i')
+       jmpi L5;
+L2:
+       include(`read_field_x1y0_uv.g4i')
+       jmpi L5;
+L1:
+       and.z (1) null mv2<1,1,1>W 1W {align1};       
+       (f0) jmpi L4;
+       include(`read_field_x0y1_uv.g4i')
+       jmpi L5;
+L4:
+       include(`read_field_x0y0_uv.g4i')
+L5:
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_field_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+	and.z (1) null mv1<1,1,1>W 1UW {align1};	
+	(f0) jmpi L1;
+	and.z (1) null mv2<1,1,1>W 1UW {align1};	
+	(f0) jmpi L2;
+	include(`read_field_x1y1_y.g4i')
+	jmpi L5;
+L2:
+	include(`read_field_x1y0_y.g4i')
+	jmpi L5;
+L1:
+	and.z (1) null mv2<1,1,1>W 1UW {align1};	
+	(f0) jmpi L4;
+	include(`read_field_x0y1_y.g4i')
+	jmpi L5;
+L4:
+	include(`read_field_x0y0_y.g4i')
+L5:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ */  
+
+	and.z (1) null mv1<1,1,1>UW 2UD {align1};	
+	(f0) jmpi LL1;
+	and.z (1) null mv2<1,1,1>UW 2UD {align1};	
+	(f0) jmpi LL2;
+	include(`read_frame_x1y1_uv.g4i')
+	jmpi LL5;
+LL2:
+	include(`read_frame_x1y0_uv.g4i')
+	jmpi LL5;
+LL1:
+	and.z (1) null mv2<1,1,1>UW 2UD {align1};	
+	(f0) jmpi LL4;
+	include(`read_frame_x0y1_uv.g4i')
+	jmpi LL5;
+LL4:
+	include(`read_frame_x0y0_uv.g4i')
+LL5:
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/motion_frame_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ */  
+ 
+/* if (motion_vect.x & 1) {
+ *   if (motion_vect.y & 1)
+ *	 half_pixel in x and y;
+ *   else
+ *	 half_pixel in x;
+ * } else {
+ *	if (motion_vect.y & 1) 
+ *	  half_pixel y;
+ *	else
+ *	  full_pixel_read;	
+ * }	 
+ */
+
+	and.z (1) null mv1<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL1;
+	and.z (1) null mv2<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL2;
+	include(`read_frame_x1y1_y.g4i') 
+	jmpi LL5;
+LL2: 
+	include(`read_frame_x1y0_y.g4i') 
+	jmpi LL5;
+LL1: 
+	and.z (1) null mv2<1,1,1>UW 1UD {align1};	
+	(f0) jmpi LL4;
+	include(`read_frame_x0y1_y.g4i')
+	jmpi LL5;
+LL4:
+	include(`read_frame_x0y0_y.g4i')
+LL5:
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+
+mov (1) g115.8<1>UD 0x7000FUD {align1}; // 8*16/32=4
+send (16) 0 g40.0<1>UW g115<16,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g45.0<1>UW g115<16,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+
+mov (16) g32.0<1>UW g40.0<16,8,1>UB {align1};
+mov (16) g33.0<1>UW g41.0<16,8,1>UB {align1};
+mov (16) g34.0<1>UW g42.0<16,8,1>UB {align1};
+mov (16) g35.0<1>UW g43.0<16,8,1>UB {align1};
+mov (16) g36.0<1>UW g45.0<16,8,1>UB {align1};
+mov (16) g37.0<1>UW g46.0<16,8,1>UB {align1};
+mov (16) g38.0<1>UW g47.0<16,8,1>UB {align1};
+mov (16) g39.0<1>UW g48.0<16,8,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g42.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g46.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+
+mov (16) g32.0<1>UW g40.0<16,16,1>UB {align1};
+mov (16) g33.0<1>UW g42.0<16,16,1>UB {align1};
+mov (16) g34.0<1>UW g44.0<16,16,1>UB {align1};
+mov (16) g35.0<1>UW g46.0<16,16,1>UB {align1};
+mov (16) g36.0<1>UW g48.0<16,16,1>UB {align1};
+mov (16) g37.0<1>UW g50.0<16,16,1>UB {align1};
+mov (16) g38.0<1>UW g52.0<16,16,1>UB {align1};
+mov (16) g39.0<1>UW g54.0<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,28 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+
+mov (1) g115.8<1>UD 0x07000FUD {align1}; // 8*16/32=4
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g45.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+mov (1) g115.8<1>UD 0xFUD {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 1 {align1};//U
+send (16) 0 g49.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 1 {align1};//V
+
+avg (16) g32.0<1>UW g40.0<16,8,1>UB g41.0<16,8,1>UB {align1};
+avg (16) g33.0<1>UW g41.0<16,8,1>UB g42.0<16,8,1>UB {align1};
+avg (16) g34.0<1>UW g42.0<16,8,1>UB g43.0<16,8,1>UB {align1};
+avg (16) g35.0<1>UW g43.0<16,8,1>UB g44.0<16,8,1>UB {align1};
+
+avg (16) g36.0<1>UW g45.0<16,8,1>UB g46.0<16,8,1>UB {align1};
+avg (16) g37.0<1>UW g46.0<16,8,1>UB g47.0<16,8,1>UB {align1};
+avg (16) g38.0<1>UW g47.0<16,8,1>UB g48.0<16,8,1>UB {align1};
+avg (16) g39.0<1>UW g48.0<16,8,1>UB g49.0<16,8,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x0y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g42.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g46.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g56.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+
+avg.sat (16) g32.0<1>UW g40.0<16,16,1>UB g42.0<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g42.0<16,16,1>UB g44.0<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g44.0<16,16,1>UB g46.0<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g46.0<16,16,1>UB g48.0<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g48.0<16,16,1>UB g50.0<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g50.0<16,16,1>UB g52.0<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g52.0<16,16,1>UB g54.0<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g54.0<16,16,1>UB g56.0<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,24 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+
+mov (1) g115.8<1>UD 0x07000FUD {align1}; // 8*16/32=4
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+
+avg (16) g32.0<1>UW g40.0<16,8,1>UB g40.1<16,8,1>UB {align1};
+avg (16) g33.0<1>UW g41.0<16,8,1>UB g41.1<16,8,1>UB {align1};
+avg (16) g34.0<1>UW g42.0<16,8,1>UB g42.1<16,8,1>UB {align1};
+avg (16) g35.0<1>UW g43.0<16,8,1>UB g43.1<16,8,1>UB {align1};
+
+avg (16) g36.0<1>UW g44.0<16,8,1>UB g44.1<16,8,1>UB {align1};
+avg (16) g37.0<1>UW g45.0<16,8,1>UB g45.1<16,8,1>UB {align1};
+avg (16) g38.0<1>UW g46.0<16,8,1>UB g46.1<16,8,1>UB {align1};
+avg (16) g39.0<1>UW g47.0<16,8,1>UB g47.1<16,8,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g42.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g46.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+
+avg.sat (16) g32.0<1>UW g40.0<16,16,1>UB g40.1<16,16,1>UB {align1};
+avg.sat (16) g33.0<1>UW g42.0<16,16,1>UB g42.1<16,16,1>UB {align1};
+avg.sat (16) g34.0<1>UW g44.0<16,16,1>UB g44.1<16,16,1>UB {align1};
+avg.sat (16) g35.0<1>UW g46.0<16,16,1>UB g46.1<16,16,1>UB {align1};
+avg.sat (16) g36.0<1>UW g48.0<16,16,1>UB g48.1<16,16,1>UB {align1};
+avg.sat (16) g37.0<1>UW g50.0<16,16,1>UB g50.1<16,16,1>UB {align1};
+avg.sat (16) g38.0<1>UW g52.0<16,16,1>UB g52.1<16,16,1>UB {align1};
+avg.sat (16) g39.0<1>UW g54.0<16,16,1>UB g54.1<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,53 @@
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (1) g115.8<1>UD 0x07000FUD {align1};
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U
+send (16) 0 g45.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V
+mov (1) g115.8<1>UD 0x01000FUD {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 1 {align1};//U
+send (16) 0 g49.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 1 {align1};//V
+//U
+add (16) g32.0<1>UW g40.0<16,8,1>UB g41.0<16,8,1>UB {align1};
+add (16) g33.0<1>UW g41.0<16,8,1>UB g42.0<16,8,1>UB {align1};
+add (16) g34.0<1>UW g42.0<16,8,1>UB g43.0<16,8,1>UB {align1};
+add (16) g35.0<1>UW g43.0<16,8,1>UB g44.0<16,8,1>UB {align1};
+
+add (16) g32.0<1>UW g32.0<16,8,1>UW g40.1<16,8,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,8,1>UW g41.1<16,8,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,8,1>UW g42.1<16,8,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,8,1>UW g43.1<16,8,1>UB {align1};
+
+add (16) g32.0<1>UW g32.0<16,8,1>UW g41.1<16,8,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,8,1>UW g42.1<16,8,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,8,1>UW g43.1<16,8,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,8,1>UW g44.1<16,8,1>UB {align1};
+//V
+add (16) g36.0<1>UW g45.0<16,8,1>UB g46.0<16,8,1>UB {align1};
+add (16) g37.0<1>UW g46.0<16,8,1>UB g47.0<16,8,1>UB {align1};
+add (16) g38.0<1>UW g47.0<16,8,1>UB g48.0<16,8,1>UB {align1};
+add (16) g39.0<1>UW g48.0<16,8,1>UB g49.0<16,8,1>UB {align1};
+
+add (16) g36.0<1>UW g36.0<16,8,1>UW g45.1<16,8,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,8,1>UW g46.1<16,8,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,8,1>UW g47.1<16,8,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,8,1>UW g48.1<16,8,1>UB {align1};
+
+add (16) g36.0<1>UW g36.0<16,8,1>UW g46.1<16,8,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,8,1>UW g47.1<16,8,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,8,1>UW g48.1<16,8,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,8,1>UW g49.1<16,8,1>UB {align1};
+
+shr (32) g32.0<1>UW g32.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g34.0<1>UW g34.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g36.0<1>UW g36.0<16,16,1>UW 2UW {align1 compr};
+shr (32) g38.0<1>UW g38.0<16,16,1>UW 2UW {align1 compr};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_field_x1y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data
+   g115:   message descriptor for reading reference data   */
+mov (1) g115.8<1>UD 0x01FUD {align1};
+send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g42.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+send (16) 0 g46.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 2UD {align1};
+mov (1) g115.8<1>UD 0x07001FUD {align1};
+send (16) 0 g48.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 8 {align1};
+add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1};
+mov (1) g115.8<1>UD 0x1FUD {align1};
+send (16) 0 g56.0<1>UW g115<8,8,1>UW read(surface,2,0,2) mlen 1 rlen 1 {align1};
+
+add (16) g32.0<1>UW g40.0<16,16,1>UB g42.0<16,16,1>UB {align1};
+add (16) g33.0<1>UW g42.0<16,16,1>UB g44.0<16,16,1>UB {align1};
+add (16) g34.0<1>UW g44.0<16,16,1>UB g46.0<16,16,1>UB {align1};
+add (16) g35.0<1>UW g46.0<16,16,1>UB g48.0<16,16,1>UB {align1};
+add (16) g36.0<1>UW g48.0<16,16,1>UB g50.0<16,16,1>UB {align1};
+add (16) g37.0<1>UW g50.0<16,16,1>UB g52.0<16,16,1>UB {align1};
+add (16) g38.0<1>UW g52.0<16,16,1>UB g54.0<16,16,1>UB {align1};
+add (16) g39.0<1>UW g54.0<16,16,1>UB g56.0<16,16,1>UB {align1};
+
+add (16) g32.0<1>UW g32.0<16,16,1>UW g40.1<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g42.1<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g44.1<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g46.1<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g48.1<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g50.1<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g52.1<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g54.1<16,16,1>UB {align1};
+
+add (16) g32.0<1>UW g32.0<16,16,1>UW g42.1<16,16,1>UB {align1};
+add (16) g33.0<1>UW g33.0<16,16,1>UW g44.1<16,16,1>UB {align1};
+add (16) g34.0<1>UW g34.0<16,16,1>UW g46.1<16,16,1>UB {align1};
+add (16) g35.0<1>UW g35.0<16,16,1>UW g48.1<16,16,1>UB {align1};
+add (16) g36.0<1>UW g36.0<16,16,1>UW g50.1<16,16,1>UB {align1};
+add (16) g37.0<1>UW g37.0<16,16,1>UW g52.1<16,16,1>UB {align1};
+add (16) g38.0<1>UW g38.0<16,16,1>UW g54.1<16,16,1>UB {align1};
+add (16) g39.0<1>UW g39.0<16,16,1>UW g56.1<16,16,1>UB {align1};
+
+shr (16) g32.0<1>UW g32.0<16,16,1>UW 2UW {align1};
+shr (16) g33.0<1>UW g33.0<16,16,1>UW 2UW {align1};
+shr (16) g34.0<1>UW g34.0<16,16,1>UW 2UW {align1};
+shr (16) g35.0<1>UW g35.0<16,16,1>UW 2UW {align1};
+shr (16) g36.0<1>UW g36.0<16,16,1>UW 2UW {align1};
+shr (16) g37.0<1>UW g37.0<16,16,1>UW 2UW {align1};
+shr (16) g38.0<1>UW g38.0<16,16,1>UW 2UW {align1};
+shr (16) g39.0<1>UW g39.0<16,16,1>UW 2UW {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (1) g32.8<1>UD 0x007000fUD  {align1};
+send (16) 0 g36.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g40.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+
+mov (16) g74.0<1>UW g36.0<16,8,1>UB {align1};
+mov (16) g75.0<1>UW g37.0<16,8,1>UB {align1};
+mov (16) g76.0<1>UW g38.0<16,8,1>UB {align1};
+mov (16) g77.0<1>UW g39.0<16,8,1>UB {align1};
+mov (16) g78.0<1>UW g40.0<16,8,1>UB {align1};
+mov (16) g79.0<1>UW g41.0<16,8,1>UB {align1};
+mov (16) g80.0<1>UW g42.0<16,8,1>UB {align1};
+mov (16) g81.0<1>UW g43.0<16,8,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+mov (16) g58.0<1>UW g38.0<16,16,1>UB {align1};
+mov (16) g59.0<1>UW g39.0<16,16,1>UB {align1};
+mov (16) g60.0<1>UW g40.0<16,16,1>UB {align1};
+mov (16) g61.0<1>UW g41.0<16,16,1>UB {align1};
+mov (16) g62.0<1>UW g42.0<16,16,1>UB {align1};
+mov (16) g63.0<1>UW g43.0<16,16,1>UB {align1};
+mov (16) g64.0<1>UW g44.0<16,16,1>UB {align1};
+mov (16) g65.0<1>UW g45.0<16,16,1>UB {align1};
+mov (16) g66.0<1>UW g46.0<16,16,1>UB {align1};
+mov (16) g67.0<1>UW g47.0<16,16,1>UB {align1};
+mov (16) g68.0<1>UW g48.0<16,16,1>UB {align1};
+mov (16) g69.0<1>UW g49.0<16,16,1>UB {align1};
+mov (16) g70.0<1>UW g50.0<16,16,1>UB {align1};
+mov (16) g71.0<1>UW g51.0<16,16,1>UB {align1};
+mov (16) g72.0<1>UW g52.0<16,16,1>UB {align1};
+mov (16) g73.0<1>UW g53.0<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDINg BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINgEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIgHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAgES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINg FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINgS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+send (16) 0 g34.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 8 {align1}; //U
+send (16) 0 g44.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 8 {align1}; //V
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g42.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1}; //U
+send (16) 0 g52.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1}; //V
+
+//U
+avg (8) g74.0<1>UW  g34.0<8,8,1>UB g35.0<8,8,1>UB {align1};
+avg (8) g74.16<1>UW g35.0<8,8,1>UB g36.0<8,8,1>UB {align1};
+avg (8) g75.0<1>UW  g36.0<8,8,1>UB g37.0<8,8,1>UB {align1};
+avg (8) g75.16<1>UW g37.0<8,8,1>UB g38.0<8,8,1>UB {align1};
+avg (8) g76.0<1>UW  g38.0<8,8,1>UB g39.0<8,8,1>UB {align1};
+avg (8) g76.16<1>UW g39.0<8,8,1>UB g40.0<8,8,1>UB {align1};
+avg (8) g77.0<1>UW  g40.0<8,8,1>UB g41.0<8,8,1>UB {align1};
+avg (8) g77.16<1>UW g41.0<8,8,1>UB g42.0<8,8,1>UB {align1};
+
+//V
+avg (8) g78.0<1>UW  g44.0<8,8,1>UB g45.0<8,8,1>UB {align1};
+avg (8) g78.16<1>UW g45.0<8,8,1>UB g46.0<8,8,1>UB {align1};
+avg (8) g79.0<1>UW  g46.0<8,8,1>UB g47.0<8,8,1>UB {align1};
+avg (8) g79.16<1>UW g47.0<8,8,1>UB g48.0<8,8,1>UB {align1};
+avg (8) g80.0<1>UW  g48.0<8,8,1>UB g49.0<8,8,1>UB {align1};
+avg (8) g80.16<1>UW g49.0<8,8,1>UB g50.0<8,8,1>UB {align1};
+avg (8) g81.0<1>UW  g50.0<8,8,1>UB g51.0<8,8,1>UB {align1};
+avg (8) g81.16<1>UW g51.0<8,8,1>UB g52.0<8,8,1>UB {align1};
+
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x0y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g54.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 1 {align1};
+
+avg.sat (16) g58.0<1>UW g38.0<16,16,1>UB g39.0<16,16,1>UB {align1};
+avg.sat (16) g59.0<1>UW g39.0<16,16,1>UB g40.0<16,16,1>UB {align1};
+avg.sat (16) g60.0<1>UW g40.0<16,16,1>UB g41.0<16,16,1>UB {align1};
+avg.sat (16) g61.0<1>UW g41.0<16,16,1>UB g42.0<16,16,1>UB {align1};
+avg.sat (16) g62.0<1>UW g42.0<16,16,1>UB g43.0<16,16,1>UB {align1};
+avg.sat (16) g63.0<1>UW g43.0<16,16,1>UB g44.0<16,16,1>UB {align1};
+avg.sat (16) g64.0<1>UW g44.0<16,16,1>UB g45.0<16,16,1>UB {align1};
+avg.sat (16) g65.0<1>UW g45.0<16,16,1>UB g46.0<16,16,1>UB {align1};
+avg.sat (16) g66.0<1>UW g46.0<16,16,1>UB g47.0<16,16,1>UB {align1};
+avg.sat (16) g67.0<1>UW g47.0<16,16,1>UB g48.0<16,16,1>UB {align1};
+avg.sat (16) g68.0<1>UW g48.0<16,16,1>UB g49.0<16,16,1>UB {align1};
+avg.sat (16) g69.0<1>UW g49.0<16,16,1>UB g50.0<16,16,1>UB {align1};
+avg.sat (16) g70.0<1>UW g50.0<16,16,1>UB g51.0<16,16,1>UB {align1};
+avg.sat (16) g71.0<1>UW g51.0<16,16,1>UB g52.0<16,16,1>UB {align1};
+avg.sat (16) g72.0<1>UW g52.0<16,16,1>UB g53.0<16,16,1>UB {align1};
+avg.sat (16) g73.0<1>UW g53.0<16,16,1>UB g54.0<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Zhang Hua jun <huajun.zhang@intel.com>
+ *    Xing Dong sheng <dongsheng.xing@intel.com>
+ *
+ */
+
+mov (1) g32.8<1>UD 0x007000fUD  {align1};
+send (16) 0 g34.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1};
+send (16) 0 g44.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1};
+
+avg (16) g74.0<1>UW g34.0<16,8,1>UB g34.1<16,8,1>UB{align1};
+avg (16) g75.0<1>UW g35.0<16,8,1>UB g35.1<16,8,1>UB{align1};
+avg (16) g76.0<1>UW g36.0<16,8,1>UB g36.1<16,8,1>UB{align1};
+avg (16) g77.0<1>UW g37.0<16,8,1>UB g37.1<16,8,1>UB{align1};
+
+avg (16) g78.0<1>UW g44.0<16,8,1>UB g44.1<16,8,1>UB{align1};
+avg (16) g79.0<1>UW g45.0<16,8,1>UB g45.1<16,8,1>UB{align1};
+avg (16) g80.0<1>UW g46.0<16,8,1>UB g46.1<16,8,1>UB{align1};
+avg (16) g81.0<1>UW g47.0<16,8,1>UB g47.1<16,8,1>UB{align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y0_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+
+avg.sat (16) g58.0<1>UW g38.0<16,16,1>UB g38.1<16,16,1>UB {align1};
+avg.sat (16) g59.0<1>UW g39.0<16,16,1>UB g39.1<16,16,1>UB {align1};
+avg.sat (16) g60.0<1>UW g40.0<16,16,1>UB g40.1<16,16,1>UB {align1};
+avg.sat (16) g61.0<1>UW g41.0<16,16,1>UB g41.1<16,16,1>UB {align1};
+avg.sat (16) g62.0<1>UW g42.0<16,16,1>UB g42.1<16,16,1>UB {align1};
+avg.sat (16) g63.0<1>UW g43.0<16,16,1>UB g43.1<16,16,1>UB {align1};
+avg.sat (16) g64.0<1>UW g44.0<16,16,1>UB g44.1<16,16,1>UB {align1};
+avg.sat (16) g65.0<1>UW g45.0<16,16,1>UB g45.1<16,16,1>UB {align1};
+avg.sat (16) g66.0<1>UW g46.0<16,16,1>UB g46.1<16,16,1>UB {align1};
+avg.sat (16) g67.0<1>UW g47.0<16,16,1>UB g47.1<16,16,1>UB {align1};
+avg.sat (16) g68.0<1>UW g48.0<16,16,1>UB g48.1<16,16,1>UB {align1};
+avg.sat (16) g69.0<1>UW g49.0<16,16,1>UB g49.1<16,16,1>UB {align1};
+avg.sat (16) g70.0<1>UW g50.0<16,16,1>UB g50.1<16,16,1>UB {align1};
+avg.sat (16) g71.0<1>UW g51.0<16,16,1>UB g51.1<16,16,1>UB {align1};
+avg.sat (16) g72.0<1>UW g52.0<16,16,1>UB g52.1<16,16,1>UB {align1};
+avg.sat (16) g73.0<1>UW g53.0<16,16,1>UB g53.1<16,16,1>UB {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_uv.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_uv.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_uv.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_uv.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,74 @@
+/*
+ */
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+send (16) 0 g34.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 8 {align1}; //U
+send (16) 0 g44.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 8 {align1}; //V
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g42.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1}; //U
+send (16) 0 g52.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1}; //V
+
+//U
+add (8) g74.0<1>UW  g34.0<8,8,1>UB g34.1<8,8,1>UB {align1};
+add (8) g74.16<1>UW g35.0<8,8,1>UB g35.1<8,8,1>UB {align1};
+add (8) g75.0<1>UW  g36.0<8,8,1>UB g36.1<8,8,1>UB {align1};
+add (8) g75.16<1>UW g37.0<8,8,1>UB g37.1<8,8,1>UB {align1};
+add (8) g76.0<1>UW  g38.0<8,8,1>UB g38.1<8,8,1>UB {align1};
+add (8) g76.16<1>UW g39.0<8,8,1>UB g39.1<8,8,1>UB {align1};
+add (8) g77.0<1>UW  g40.0<8,8,1>UB g40.1<8,8,1>UB {align1};
+add (8) g77.16<1>UW g41.0<8,8,1>UB g41.1<8,8,1>UB {align1};
+
+add (8) g74.0<1>UW  g74.0<8,8,1>UW  g35.0<8,8,1>UB {align1};
+add (8) g74.16<1>UW g74.16<8,8,1>UW g36.0<8,8,1>UB {align1};
+add (8) g75.0<1>UW  g75.0<8,8,1>UW  g37.0<8,8,1>UB {align1};
+add (8) g75.16<1>UW g75.16<8,8,1>UW g38.0<8,8,1>UB {align1};
+add (8) g76.0<1>UW  g76.0<8,8,1>UW  g39.0<8,8,1>UB {align1};
+add (8) g76.16<1>UW g76.16<8,8,1>UW g40.0<8,8,1>UB {align1};
+add (8) g77.0<1>UW  g77.0<8,8,1>UW  g41.0<8,8,1>UB {align1};
+add (8) g77.16<1>UW g77.16<8,8,1>UW g42.0<8,8,1>UB {align1};
+
+add (8) g74.0<1>UW  g74.0<8,8,1>UW  g35.1<8,8,1>UB {align1};
+add (8) g74.16<1>UW g74.16<8,8,1>UW g36.1<8,8,1>UB {align1};
+add (8) g75.0<1>UW  g75.0<8,8,1>UW  g37.1<8,8,1>UB {align1};
+add (8) g75.16<1>UW g75.16<8,8,1>UW g38.1<8,8,1>UB {align1};
+add (8) g76.0<1>UW  g76.0<8,8,1>UW  g39.1<8,8,1>UB {align1};
+add (8) g76.16<1>UW g76.16<8,8,1>UW g40.1<8,8,1>UB {align1};
+add (8) g77.0<1>UW  g77.0<8,8,1>UW  g41.1<8,8,1>UB {align1};
+add (8) g77.16<1>UW g77.16<8,8,1>UW g42.1<8,8,1>UB {align1};
+
+//V
+add (8) g78.0<1>UW  g44.0<8,8,1>UB g44.1<8,8,1>UB {align1};
+add (8) g78.16<1>UW g45.0<8,8,1>UB g45.1<8,8,1>UB {align1};
+add (8) g79.0<1>UW  g46.0<8,8,1>UB g46.1<8,8,1>UB {align1};
+add (8) g79.16<1>UW g47.0<8,8,1>UB g47.1<8,8,1>UB {align1};
+add (8) g80.0<1>UW  g48.0<8,8,1>UB g48.1<8,8,1>UB {align1};
+add (8) g80.16<1>UW g49.0<8,8,1>UB g49.1<8,8,1>UB {align1};
+add (8) g81.0<1>UW  g50.0<8,8,1>UB g50.1<8,8,1>UB {align1};
+add (8) g81.16<1>UW g51.0<8,8,1>UB g51.1<8,8,1>UB {align1};
+
+add (8) g78.0<1>UW  g78.0<8,8,1>UW  g45.0<8,8,1>UB {align1};
+add (8) g78.16<1>UW g78.16<8,8,1>UW g46.0<8,8,1>UB {align1};
+add (8) g79.0<1>UW  g79.0<8,8,1>UW  g47.0<8,8,1>UB {align1};
+add (8) g79.16<1>UW g79.16<8,8,1>UW g48.0<8,8,1>UB {align1};
+add (8) g80.0<1>UW  g80.0<8,8,1>UW  g49.0<8,8,1>UB {align1};
+add (8) g80.16<1>UW g80.16<8,8,1>UW g50.0<8,8,1>UB {align1};
+add (8) g81.0<1>UW  g81.0<8,8,1>UW  g51.0<8,8,1>UB {align1};
+add (8) g81.16<1>UW g81.16<8,8,1>UW g52.0<8,8,1>UB {align1};
+
+add (8) g78.0<1>UW  g78.0<8,8,1>UW  g45.1<8,8,1>UB {align1};
+add (8) g78.16<1>UW g78.16<8,8,1>UW g46.1<8,8,1>UB {align1};
+add (8) g79.0<1>UW  g79.0<8,8,1>UW  g47.1<8,8,1>UB {align1};
+add (8) g79.16<1>UW g79.16<8,8,1>UW g48.1<8,8,1>UB {align1};
+add (8) g80.0<1>UW  g80.0<8,8,1>UW  g49.1<8,8,1>UB {align1};
+add (8) g80.16<1>UW g80.16<8,8,1>UW g50.1<8,8,1>UB {align1};
+add (8) g81.0<1>UW  g81.0<8,8,1>UW  g51.1<8,8,1>UB {align1};
+add (8) g81.16<1>UW g81.16<8,8,1>UW g52.1<8,8,1>UB {align1};
+
+shr (16) g74.0<1>UW g74.0<16,16,1>UW 2UW {align1};
+shr (16) g75.0<1>UW g75.0<16,16,1>UW 2UW {align1};
+shr (16) g76.0<1>UW g76.0<16,16,1>UW 2UW {align1};
+shr (16) g77.0<1>UW g77.0<16,16,1>UW 2UW {align1};
+shr (16) g78.0<1>UW g78.0<16,16,1>UW 2UW {align1};
+shr (16) g79.0<1>UW g79.0<16,16,1>UW 2UW {align1};
+shr (16) g80.0<1>UW g80.0<16,16,1>UW 2UW {align1};
+shr (16) g81.0<1>UW g81.0<16,16,1>UW 2UW {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_y.g4i new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_y.g4i
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_y.g4i	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/shader/vld/read_frame_x1y1_y.g4i	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ *    Yan Li <li.l.yan@intel.com>
+ *    Liu Xi bin<xibin.liu@intel.com>
+ */
+/* GRF allocation:
+   g1~g30: constant buffer
+           g1~g2:intra IQ matrix
+           g3~g4:non intra IQ matrix
+           g5~g20:IDCT table
+   g31:    thread payload 
+   g32:    message descriptor for reading reference data
+   g58~g81:reference data
+   g82:    thread payload backup
+   g83~g106:IDCT data                           */
+mov (1) g32.8<1>UD 0x007001FUD {align1};
+send (16) 0 g38.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+send (16) 0 g46.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 8 {align1};
+add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1};
+mov (1) g32.8<1>UD 0x1FUD {align1};
+send (16) 0 g54.0<1>UW g32<8,8,1>UW read(input_surface, 2, 0, 2) mlen 1 rlen 1 {align1};
+
+add (16) g58.0<1>UW g38.0<16,16,1>UB g38.1<16,16,1>UB {align1};
+add (16) g59.0<1>UW g39.0<16,16,1>UB g39.1<16,16,1>UB {align1};
+add (16) g60.0<1>UW g40.0<16,16,1>UB g40.1<16,16,1>UB {align1};
+add (16) g61.0<1>UW g41.0<16,16,1>UB g41.1<16,16,1>UB {align1};
+add (16) g62.0<1>UW g42.0<16,16,1>UB g42.1<16,16,1>UB {align1};
+add (16) g63.0<1>UW g43.0<16,16,1>UB g43.1<16,16,1>UB {align1};
+add (16) g64.0<1>UW g44.0<16,16,1>UB g44.1<16,16,1>UB {align1};
+add (16) g65.0<1>UW g45.0<16,16,1>UB g45.1<16,16,1>UB {align1};
+add (16) g66.0<1>UW g46.0<16,16,1>UB g46.1<16,16,1>UB {align1};
+add (16) g67.0<1>UW g47.0<16,16,1>UB g47.1<16,16,1>UB {align1};
+add (16) g68.0<1>UW g48.0<16,16,1>UB g48.1<16,16,1>UB {align1};
+add (16) g69.0<1>UW g49.0<16,16,1>UB g49.1<16,16,1>UB {align1};
+add (16) g70.0<1>UW g50.0<16,16,1>UB g50.1<16,16,1>UB {align1};
+add (16) g71.0<1>UW g51.0<16,16,1>UB g51.1<16,16,1>UB {align1};
+add (16) g72.0<1>UW g52.0<16,16,1>UB g52.1<16,16,1>UB {align1};
+add (16) g73.0<1>UW g53.0<16,16,1>UB g53.1<16,16,1>UB {align1};
+
+add (16) g58.0<1>UW g58.0<16,16,1>UW g39.0<16,16,1>UB {align1};
+add (16) g59.0<1>UW g59.0<16,16,1>UW g40.0<16,16,1>UB {align1};
+add (16) g60.0<1>UW g60.0<16,16,1>UW g41.0<16,16,1>UB {align1};
+add (16) g61.0<1>UW g61.0<16,16,1>UW g42.0<16,16,1>UB {align1};
+add (16) g62.0<1>UW g62.0<16,16,1>UW g43.0<16,16,1>UB {align1};
+add (16) g63.0<1>UW g63.0<16,16,1>UW g44.0<16,16,1>UB {align1};
+add (16) g64.0<1>UW g64.0<16,16,1>UW g45.0<16,16,1>UB {align1};
+add (16) g65.0<1>UW g65.0<16,16,1>UW g46.0<16,16,1>UB {align1};
+add (16) g66.0<1>UW g66.0<16,16,1>UW g47.0<16,16,1>UB {align1};
+add (16) g67.0<1>UW g67.0<16,16,1>UW g48.0<16,16,1>UB {align1};
+add (16) g68.0<1>UW g68.0<16,16,1>UW g49.0<16,16,1>UB {align1};
+add (16) g69.0<1>UW g69.0<16,16,1>UW g50.0<16,16,1>UB {align1};
+add (16) g70.0<1>UW g70.0<16,16,1>UW g51.0<16,16,1>UB {align1};
+add (16) g71.0<1>UW g71.0<16,16,1>UW g52.0<16,16,1>UB {align1};
+add (16) g72.0<1>UW g72.0<16,16,1>UW g53.0<16,16,1>UB {align1};
+add (16) g73.0<1>UW g73.0<16,16,1>UW g54.0<16,16,1>UB {align1};
+
+add (16) g58.0<1>UW g58.0<16,16,1>UW g39.1<16,16,1>UB {align1};
+add (16) g59.0<1>UW g59.0<16,16,1>UW g40.1<16,16,1>UB {align1};
+add (16) g60.0<1>UW g60.0<16,16,1>UW g41.1<16,16,1>UB {align1};
+add (16) g61.0<1>UW g61.0<16,16,1>UW g42.1<16,16,1>UB {align1};
+add (16) g62.0<1>UW g62.0<16,16,1>UW g43.1<16,16,1>UB {align1};
+add (16) g63.0<1>UW g63.0<16,16,1>UW g44.1<16,16,1>UB {align1};
+add (16) g64.0<1>UW g64.0<16,16,1>UW g45.1<16,16,1>UB {align1};
+add (16) g65.0<1>UW g65.0<16,16,1>UW g46.1<16,16,1>UB {align1};
+add (16) g66.0<1>UW g66.0<16,16,1>UW g47.1<16,16,1>UB {align1};
+add (16) g67.0<1>UW g67.0<16,16,1>UW g48.1<16,16,1>UB {align1};
+add (16) g68.0<1>UW g68.0<16,16,1>UW g49.1<16,16,1>UB {align1};
+add (16) g69.0<1>UW g69.0<16,16,1>UW g50.1<16,16,1>UB {align1};
+add (16) g70.0<1>UW g70.0<16,16,1>UW g51.1<16,16,1>UB {align1};
+add (16) g71.0<1>UW g71.0<16,16,1>UW g52.1<16,16,1>UB {align1};
+add (16) g72.0<1>UW g72.0<16,16,1>UW g53.1<16,16,1>UB {align1};
+add (16) g73.0<1>UW g73.0<16,16,1>UW g54.1<16,16,1>UB {align1};
+
+shr.sat (16) g58.0<1>UW g58.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g59.0<1>UW g59.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g60.0<1>UW g60.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g61.0<1>UW g61.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g62.0<1>UW g62.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g63.0<1>UW g63.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g64.0<1>UW g64.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g65.0<1>UW g65.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g66.0<1>UW g66.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g67.0<1>UW g67.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g68.0<1>UW g68.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g69.0<1>UW g69.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g70.0<1>UW g70.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g71.0<1>UW g71.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g72.0<1>UW g72.0<16,16,1>UW 2UW {align1};
+shr.sat (16) g73.0<1>UW g73.0<16,16,1>UW 2UW {align1};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/xvmc_vld.c new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/xvmc_vld.c
--- old/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/xvmc_vld.c	1970-01-01 01:00:00.000000000 +0100
+++ new/xsrc/external/mit/xf86-video-intel/dist/src/xvmc/xvmc_vld.c	2011-02-08 11:14:00.000000000 +0100
@@ -0,0 +1,1225 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author:
+ *    Zou Nan hai <nanhai.zou@intel.com>
+ */
+#include "intel_xvmc.h"
+#include "i830_hwmc.h"
+#include "i810_reg.h"
+#include "brw_defines.h"
+#include "brw_structs.h"
+
+#ifndef ALIGN
+#define ALIGN(m,n) (((m) + (n) - 1) & ~((n) - 1))
+#endif
+
+#define BATCH_STRUCT(x) intelBatchbufferData(&x, sizeof(x), 0)
+#define VLD_MAX_SLICE_SIZE (32 * 1024)
+#define CS_SIZE 	30
+#define URB_SIZE 	384
+/* idct table */
+#define C0 23170
+#define C1 22725
+#define C2 21407
+#define C3 19266
+#define C4 16383
+#define C5 12873
+#define C6 8867
+#define C7 4520
+const uint32_t idct_table[] = {
+	C4, C1, C2, C3, C4, C5, C6, C7,	//g5
+	C4, C1, C2, C3, C4, C5, C6, C7,
+	C4, C3, C6, -C7, -C4, -C1, -C2, -C5,
+	C4, C3, C6, -C7, -C4, -C1, -C2, -C5,
+	C4, C5, -C6, -C1, -C4, C7, C2, C3,
+	C4, C5, -C6, -C1, -C4, C7, C2, C3,
+	C4, C7, -C2, -C5, C4, C3, -C6, -C1,
+	C4, C7, -C2, -C5, C4, C3, -C6, -C1,
+	C4, -C7, -C2, C5, C4, -C3, -C6, C1,
+	C4, -C7, -C2, C5, C4, -C3, -C6, C1,
+	C4, -C5, -C6, C1, -C4, -C7, C2, -C3,
+	C4, -C5, -C6, C1, -C4, -C7, C2, -C3,
+	C4, -C3, C6, C7, -C4, C1, -C2, C5,
+	C4, -C3, C6, C7, -C4, C1, -C2, C5,
+	C4, -C1, C2, -C3, C4, -C5, C6, -C7,
+	C4, -C1, C2, -C3, C4, -C5, C6, -C7	//g20
+};
+
+#undef C0
+#undef C1
+#undef C2
+#undef C3
+#undef C4
+#undef C5
+#undef C6
+#undef C7
+
+#define INTERFACE_NUM	8
+enum interface {
+	FRAME_INTRA = 0,
+	FRAME_FRAME_PRED_FORWARD,
+	FRAME_FRAME_PRED_BACKWARD,
+	FRAME_FRAME_PRED_BIDIRECT,
+	FRAME_FIELD_PRED_FORWARD,
+	FRAME_FIELD_PRED_BACKWARD,
+	FRAME_FIELD_PRED_BIDIRECT,
+	LIB_INTERFACE
+};
+
+/*kernels for vld mode*/
+static uint32_t lib_kernel[][4] = {
+#include "shader/vld/lib.g4b"
+};
+
+static uint32_t ipicture_kernel[][4] = {
+#include "shader/vld/ipicture.g4b"
+};
+
+static uint32_t frame_forward_kernel[][4] = {
+#include "shader/vld/frame_forward.g4b"
+};
+
+static uint32_t frame_backward_kernel[][4] = {
+#include "shader/vld/frame_backward.g4b"
+};
+
+static uint32_t frame_f_b_kernel[][4] = {
+#include "shader/vld/frame_f_b.g4b"
+};
+
+static uint32_t field_forward_kernel[][4] = {
+#include "shader/vld/field_forward.g4b"
+};
+
+static uint32_t field_backward_kernel[][4] = {
+#include "shader/vld/field_backward.g4b"
+};
+
+static uint32_t field_f_b_kernel[][4] = {
+#include "shader/vld/field_f_b.g4b"
+};
+
+/* on IGDNG */
+static uint32_t lib_kernel_gen5[][4] = {
+#include "shader/vld/lib.g4b.gen5"
+};
+
+static uint32_t ipicture_kernel_gen5[][4] = {
+#include "shader/vld/ipicture.g4b.gen5"
+};
+
+static uint32_t frame_forward_kernel_gen5[][4] = {
+#include "shader/vld/frame_forward.g4b.gen5"
+};
+
+static uint32_t frame_backward_kernel_gen5[][4] = {
+#include "shader/vld/frame_backward.g4b.gen5"
+};
+
+static uint32_t frame_f_b_kernel_gen5[][4] = {
+#include "shader/vld/frame_f_b.g4b.gen5"
+};
+
+static uint32_t field_forward_kernel_gen5[][4] = {
+#include "shader/vld/field_forward.g4b.gen5"
+};
+
+static uint32_t field_backward_kernel_gen5[][4] = {
+#include "shader/vld/field_backward.g4b.gen5"
+};
+
+static uint32_t field_f_b_kernel_gen5[][4] = {
+#include "shader/vld/field_f_b.g4b.gen5"
+};
+
+/*kernels for mc mode*/
+static uint32_t lib_kernel_idct[][4] = {
+#include "shader/mc/lib_igd.g4b"
+};
+
+static uint32_t ipicture_kernel_idct[][4] = {
+#include "shader/mc/ipicture_igd.g4b"
+};
+
+static uint32_t frame_forward_kernel_idct[][4] = {
+#include "shader/mc/frame_forward_igd.g4b"
+};
+
+static uint32_t frame_backward_kernel_idct[][4] = {
+#include "shader/mc/frame_backward_igd.g4b"
+};
+
+static uint32_t frame_f_b_kernel_idct[][4] = {
+#include "shader/mc/frame_f_b_igd.g4b"
+};
+
+static uint32_t field_forward_kernel_idct[][4] = {
+#include "shader/mc/field_forward_igd.g4b"
+};
+
+static uint32_t field_backward_kernel_idct[][4] = {
+#include "shader/mc/field_backward_igd.g4b"
+};
+
+static uint32_t field_f_b_kernel_idct[][4] = {
+#include "shader/mc/field_f_b_igd.g4b"
+};
+
+/* on IGDNG */
+static uint32_t lib_kernel_idct_gen5[][4] = {
+#include "shader/mc/lib_igd.g4b.gen5"
+};
+
+static uint32_t ipicture_kernel_idct_gen5[][4] = {
+#include "shader/mc/ipicture_igd.g4b.gen5"
+};
+
+static uint32_t frame_forward_kernel_idct_gen5[][4] = {
+#include "shader/mc/frame_forward_igd.g4b.gen5"
+};
+
+static uint32_t frame_backward_kernel_idct_gen5[][4] = {
+#include "shader/mc/frame_backward_igd.g4b.gen5"
+};
+
+static uint32_t frame_f_b_kernel_idct_gen5[][4] = {
+#include "shader/mc/frame_f_b_igd.g4b.gen5"
+};
+
+static uint32_t field_forward_kernel_idct_gen5[][4] = {
+#include "shader/mc/field_forward_igd.g4b.gen5"
+};
+
+static uint32_t field_backward_kernel_idct_gen5[][4] = {
+#include "shader/mc/field_backward_igd.g4b.gen5"
+};
+
+static uint32_t field_f_b_kernel_idct_gen5[][4] = {
+#include "shader/mc/field_f_b_igd.g4b.gen5"
+};
+
+struct media_kernel {
+	uint32_t(*bin)[4];
+	int size;
+};
+static struct media_kernel media_kernels[] = {
+	/*kernels for vld mode */
+	{ipicture_kernel, sizeof(ipicture_kernel)}
+	,
+	{frame_forward_kernel, sizeof(frame_forward_kernel)}
+	,
+	{frame_backward_kernel, sizeof(frame_backward_kernel)}
+	,
+	{frame_f_b_kernel, sizeof(frame_f_b_kernel)}
+	,
+	{field_forward_kernel, sizeof(field_forward_kernel)}
+	,
+	{field_backward_kernel, sizeof(field_backward_kernel)}
+	,
+	{field_f_b_kernel, sizeof(field_f_b_kernel)}
+	,
+	{lib_kernel, sizeof(lib_kernel)}
+	,
+	/*kernels for mc mode */
+	{ipicture_kernel_idct, sizeof(ipicture_kernel_idct)}
+	,
+	{frame_forward_kernel_idct, sizeof(frame_forward_kernel_idct)}
+	,
+	{frame_backward_kernel_idct, sizeof(frame_backward_kernel_idct)}
+	,
+	{frame_f_b_kernel_idct, sizeof(frame_f_b_kernel_idct)}
+	,
+	{field_forward_kernel_idct, sizeof(field_forward_kernel_idct)}
+	,
+	{field_backward_kernel_idct, sizeof(field_backward_kernel_idct)}
+	,
+	{field_f_b_kernel_idct, sizeof(field_f_b_kernel_idct)}
+	,
+	{lib_kernel_idct, sizeof(lib_kernel_idct)}
+};
+
+static struct media_kernel media_gen5_kernels[] = {
+	/*kernels for vld mode */
+	{ipicture_kernel_gen5, sizeof(ipicture_kernel_gen5)}
+	,
+	{frame_forward_kernel_gen5, sizeof(frame_forward_kernel_gen5)}
+	,
+	{frame_backward_kernel_gen5, sizeof(frame_backward_kernel_gen5)}
+	,
+	{frame_f_b_kernel_gen5, sizeof(frame_f_b_kernel_gen5)}
+	,
+	{field_forward_kernel_gen5, sizeof(field_forward_kernel_gen5)}
+	,
+	{field_backward_kernel_gen5, sizeof(field_backward_kernel_gen5)}
+	,
+	{field_f_b_kernel_gen5, sizeof(field_f_b_kernel_gen5)}
+	,
+	{lib_kernel_gen5, sizeof(lib_kernel_gen5)}
+	,
+	/*kernels for mc mode */
+	{ipicture_kernel_idct_gen5, sizeof(ipicture_kernel_idct_gen5)}
+	,
+	{frame_forward_kernel_idct_gen5, sizeof(frame_forward_kernel_idct_gen5)}
+	,
+	{frame_backward_kernel_idct_gen5,
+	 sizeof(frame_backward_kernel_idct_gen5)}
+	,
+	{frame_f_b_kernel_idct_gen5, sizeof(frame_f_b_kernel_idct_gen5)}
+	,
+	{field_forward_kernel_idct_gen5, sizeof(field_forward_kernel_idct_gen5)}
+	,
+	{field_backward_kernel_idct_gen5,
+	 sizeof(field_backward_kernel_idct_gen5)}
+	,
+	{field_f_b_kernel_idct_gen5, sizeof(field_f_b_kernel_idct_gen5)}
+	,
+	{lib_kernel_idct_gen5, sizeof(lib_kernel_idct_gen5)}
+};
+
+#define MEDIA_KERNEL_NUM (sizeof(media_kernels)/sizeof(media_kernels[0]))
+
+struct media_kernel_obj {
+	dri_bo *bo;
+};
+
+struct interface_descriptor_obj {
+	dri_bo *bo;
+	struct media_kernel_obj kernels[MEDIA_KERNEL_NUM];
+};
+
+struct vfe_state_obj {
+	dri_bo *bo;
+	struct interface_descriptor_obj interface;
+};
+
+struct vld_state_obj {
+	dri_bo *bo;
+};
+
+struct surface_obj {
+	dri_bo *bo;
+};
+
+struct surface_state_obj {
+	struct surface_obj surface;
+	dri_bo *bo;
+};
+
+#define MAX_SURFACES 12
+struct binding_table_obj {
+	dri_bo *bo;
+	struct surface_state_obj surface_states[MAX_SURFACES];
+};
+
+struct slice_data_obj {
+	dri_bo *bo;
+};
+
+struct mb_data_obj {
+	dri_bo *bo;
+};
+
+struct cs_state_obj {
+	dri_bo *bo;
+};
+
+static struct media_state {
+	struct vfe_state_obj vfe_state;
+	struct vld_state_obj vld_state;
+	struct binding_table_obj binding_table;
+	struct cs_state_obj cs_object;
+	struct slice_data_obj slice_data;
+	struct mb_data_obj mb_data;
+} media_state;
+
+/* XvMCQMatrix * 2 + idct_table + 8 * kernel offset pointer */
+#define CS_OBJECT_SIZE (32*20 + sizeof(unsigned int) * 8)
+static void free_object(struct media_state *s)
+{
+	int i;
+#define FREE_ONE_BO(bo) \
+    if (bo) \
+        drm_intel_bo_unreference(bo)
+	FREE_ONE_BO(s->vfe_state.bo);
+	FREE_ONE_BO(s->vfe_state.interface.bo);
+	for (i = 0; i < MEDIA_KERNEL_NUM; i++)
+		FREE_ONE_BO(s->vfe_state.interface.kernels[i].bo);
+	FREE_ONE_BO(s->binding_table.bo);
+	for (i = 0; i < MAX_SURFACES; i++)
+		FREE_ONE_BO(s->binding_table.surface_states[i].bo);
+	FREE_ONE_BO(s->slice_data.bo);
+	FREE_ONE_BO(s->mb_data.bo);
+	FREE_ONE_BO(s->cs_object.bo);
+	FREE_ONE_BO(s->vld_state.bo);
+}
+
+static int alloc_object(struct media_state *s)
+{
+	int i;
+
+	for (i = 0; i < MAX_SURFACES; i++) {
+		s->binding_table.surface_states[i].bo =
+		    drm_intel_bo_alloc(xvmc_driver->bufmgr, "surface_state",
+				       sizeof(struct brw_surface_state),
+				       0x1000);
+		if (!s->binding_table.surface_states[i].bo)
+			goto out;
+	}
+	return 0;
+out:
+	free_object(s);
+	return BadAlloc;
+}
+
+static void flush()
+{
+#define FLUSH_STATE_CACHE  	1
+	struct brw_mi_flush f;
+	memset(&f, 0, sizeof(f));
+	f.opcode = CMD_MI_FLUSH;
+	f.flags = (1 << FLUSH_STATE_CACHE);
+	BATCH_STRUCT(f);
+}
+
+static Status vfe_state(int vfe_mode)
+{
+	struct brw_vfe_state tmp, *vfe_state = &tmp;
+	memset(vfe_state, 0, sizeof(*vfe_state));
+	if (vfe_mode == VFE_VLD_MODE) {
+		vfe_state->vfe0.extend_vfe_state_present = 1;
+	} else {
+		vfe_state->vfe0.extend_vfe_state_present = 0;
+	}
+	vfe_state->vfe1.vfe_mode = vfe_mode;
+	vfe_state->vfe1.num_urb_entries = 1;
+	vfe_state->vfe1.children_present = 0;
+	vfe_state->vfe1.urb_entry_alloc_size = 2;
+	vfe_state->vfe1.max_threads = 31;
+	vfe_state->vfe2.interface_descriptor_base =
+	    media_state.vfe_state.interface.bo->offset >> 4;
+
+	if (media_state.vfe_state.bo)
+		drm_intel_bo_unreference(media_state.vfe_state.bo);
+
+	media_state.vfe_state.bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+						      "vfe state",
+						      sizeof(struct
+							     brw_vfe_state),
+						      0x1000);
+	if (!media_state.vfe_state.bo)
+		return BadAlloc;
+
+	drm_intel_bo_subdata(media_state.vfe_state.bo, 0, sizeof(tmp), &tmp);
+
+	drm_intel_bo_emit_reloc(media_state.vfe_state.bo,
+				offsetof(struct brw_vfe_state, vfe2),
+				media_state.vfe_state.interface.bo, 0,
+				I915_GEM_DOMAIN_INSTRUCTION, 0);
+	return Success;
+}
+
+static Status interface_descriptor()
+{
+	int i;
+	struct brw_interface_descriptor tmp, *desc = &tmp;
+
+	if (media_state.vfe_state.interface.bo)
+		drm_intel_bo_unreference(media_state.vfe_state.interface.bo);
+
+	media_state.vfe_state.interface.bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "interfaces",
+			       MEDIA_KERNEL_NUM *
+			       sizeof(struct brw_interface_descriptor), 0x1000);
+	if (!media_state.vfe_state.interface.bo)
+		return BadAlloc;
+
+	for (i = 0; i < MEDIA_KERNEL_NUM; i++) {
+		memset(desc, 0, sizeof(*desc));
+		desc->desc0.grf_reg_blocks = 15;
+		desc->desc0.kernel_start_pointer =
+		    media_state.vfe_state.interface.kernels[i].bo->offset >> 6;
+
+		desc->desc1.const_urb_entry_read_offset = 0;
+		desc->desc1.const_urb_entry_read_len = 30;
+
+		desc->desc3.binding_table_entry_count = MAX_SURFACES - 1;
+		desc->desc3.binding_table_pointer =
+		    media_state.binding_table.bo->offset >> 5;
+
+		drm_intel_bo_subdata(media_state.vfe_state.interface.bo,
+				     i * sizeof(tmp), sizeof(tmp), desc);
+
+		drm_intel_bo_emit_reloc(media_state.vfe_state.interface.bo,
+					i * sizeof(*desc) + offsetof(struct
+								     brw_interface_descriptor,
+								     desc0),
+					media_state.vfe_state.
+					interface.kernels[i].bo,
+					desc->desc0.grf_reg_blocks,
+					I915_GEM_DOMAIN_INSTRUCTION, 0);
+
+		drm_intel_bo_emit_reloc(media_state.vfe_state.interface.bo,
+					i * sizeof(*desc) + offsetof(struct
+								     brw_interface_descriptor,
+								     desc3),
+					media_state.binding_table.bo,
+					desc->desc3.binding_table_entry_count,
+					I915_GEM_DOMAIN_INSTRUCTION, 0);
+	}
+	return Success;
+}
+
+static int setup_media_kernels(struct intel_xvmc_hw_context *ctx)
+{
+	int i;
+
+	assert(MEDIA_KERNEL_NUM ==
+	       sizeof(media_gen5_kernels) / sizeof(media_gen5_kernels[0]));
+
+	for (i = 0; i < MEDIA_KERNEL_NUM; i++) {
+		if (ctx->i965.is_igdng)
+			media_state.vfe_state.interface.kernels[i].bo =
+			    drm_intel_bo_alloc(xvmc_driver->bufmgr, "kernel",
+					       media_gen5_kernels[i].size,
+					       0x1000);
+		else
+			media_state.vfe_state.interface.kernels[i].bo =
+			    drm_intel_bo_alloc(xvmc_driver->bufmgr, "kernels",
+					       media_kernels[i].size, 0x1000);
+
+		if (!media_state.vfe_state.interface.kernels[i].bo)
+			goto out;
+	}
+
+	for (i = 0; i < MEDIA_KERNEL_NUM; i++) {
+		dri_bo *bo = media_state.vfe_state.interface.kernels[i].bo;
+
+		if (ctx->i965.is_igdng)
+			drm_intel_bo_subdata(bo, 0, media_gen5_kernels[i].size,
+					     media_gen5_kernels[i].bin);
+		else
+			drm_intel_bo_subdata(bo, 0, media_kernels[i].size,
+					     media_kernels[i].bin);
+	}
+	return 0;
+out:
+	free_object(&media_state);
+	return BadAlloc;
+}
+
+static Status binding_tables()
+{
+	unsigned int table[MAX_SURFACES];
+	int i;
+
+	if (media_state.binding_table.bo)
+		drm_intel_bo_unreference(media_state.binding_table.bo);
+	media_state.binding_table.bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "binding_table",
+			       MAX_SURFACES * 4, 0x1000);
+	if (!media_state.binding_table.bo)
+		return BadAlloc;
+
+	for (i = 0; i < MAX_SURFACES; i++) {
+		table[i] =
+		    media_state.binding_table.surface_states[i].bo->offset;
+		drm_intel_bo_emit_reloc(media_state.binding_table.bo,
+					i * sizeof(unsigned int),
+					media_state.
+					binding_table.surface_states[i].bo, 0,
+					I915_GEM_DOMAIN_INSTRUCTION, 0);
+	}
+
+	drm_intel_bo_subdata(media_state.binding_table.bo, 0, sizeof(table),
+			     table);
+	return Success;
+}
+
+static Status cs_init(int interface_offset)
+{
+	char buf[CS_OBJECT_SIZE];
+	unsigned int *lib_reloc;
+	int i;
+
+	if (media_state.cs_object.bo)
+		drm_intel_bo_unreference(media_state.cs_object.bo);
+
+	media_state.cs_object.bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "cs object", CS_OBJECT_SIZE,
+			       64);
+	if (!media_state.cs_object.bo)
+		return BadAlloc;
+
+	memcpy(buf + 32 * 4, idct_table, sizeof(idct_table));
+	/* idct lib reloction */
+	lib_reloc = (unsigned int *)(buf + 32 * 20);
+	for (i = 0; i < 8; i++)
+		lib_reloc[i] =
+		    media_state.vfe_state.interface.kernels[LIB_INTERFACE +
+							    interface_offset].bo->
+		    offset;
+	drm_intel_bo_subdata(media_state.cs_object.bo, 32 * 4,
+			     32 * 16 + 8 * sizeof(unsigned int), buf + 32 * 4);
+
+	for (i = 0; i < 8; i++)
+		drm_intel_bo_emit_reloc(media_state.cs_object.bo,
+					32 * 20 + sizeof(unsigned int) * i,
+					media_state.vfe_state.
+					interface.kernels[LIB_INTERFACE +
+							  interface_offset].bo,
+					0, I915_GEM_DOMAIN_INSTRUCTION, 0);
+
+	return Success;
+}
+
+#define STRIDE(w)               (w)
+#define SIZE_YUV420(w, h)       (h * (STRIDE(w) + STRIDE(w >> 1)))
+static Status create_context(Display * display, XvMCContext * context,
+			     int priv_count, CARD32 * priv_data)
+{
+	struct intel_xvmc_context *intel_ctx;
+	struct intel_xvmc_hw_context *hw_ctx;
+	hw_ctx = (struct intel_xvmc_hw_context *)priv_data;
+
+	intel_ctx = calloc(1, sizeof(struct intel_xvmc_context));
+	if (!intel_ctx)
+		return BadAlloc;
+	intel_ctx->hw = hw_ctx;
+	context->privData = intel_ctx;
+	intel_ctx->surface_bo_size
+		= SIZE_YUV420(context->width, context->height);
+
+	if (alloc_object(&media_state))
+		return BadAlloc;
+
+	if (setup_media_kernels(hw_ctx))
+		return BadAlloc;
+	return Success;
+}
+
+static Status destroy_context(Display * display, XvMCContext * context)
+{
+	struct intel_xvmc_context *intel_ctx;
+	intel_ctx = context->privData;
+	Xfree(intel_ctx->hw);
+	free(intel_ctx);
+	return Success;
+}
+
+static Status load_qmatrix(Display * display, XvMCContext * context,
+			   const XvMCQMatrix * qmx)
+{
+	Status ret;
+	ret = cs_init(0);
+	if (ret != Success)
+		return ret;
+	drm_intel_bo_subdata(media_state.cs_object.bo, 0, 64,
+			     qmx->intra_quantiser_matrix);
+	drm_intel_bo_subdata(media_state.cs_object.bo, 64, 64,
+			     qmx->non_intra_quantiser_matrix);
+
+	return Success;
+}
+
+static Status vld_state(const XvMCMpegControl * control)
+{
+	struct brw_vld_state tmp, *vld = &tmp;
+
+	if (media_state.vld_state.bo)
+		drm_intel_bo_unreference(media_state.vld_state.bo);
+	media_state.vld_state.bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+						      "vld state",
+						      sizeof(struct
+							     brw_vld_state),
+						      64);
+	if (!media_state.vld_state.bo)
+		return BadAlloc;
+
+	memset(vld, 0, sizeof(*vld));
+	vld->vld0.f_code_0_0 = control->FHMV_range + 1;
+	vld->vld0.f_code_0_1 = control->FVMV_range + 1;
+	vld->vld0.f_code_1_0 = control->BHMV_range + 1;
+	vld->vld0.f_code_1_1 = control->BVMV_range + 1;
+	vld->vld0.intra_dc_precision = control->intra_dc_precision;
+	vld->vld0.picture_structure = control->picture_structure;
+	vld->vld0.top_field_first = !!(control->flags & XVMC_TOP_FIELD_FIRST);
+	vld->vld0.frame_predict_frame_dct =
+	    !!(control->flags & XVMC_PRED_DCT_FRAME);
+	vld->vld0.concealment_motion_vector =
+	    !!(control->flags & XVMC_CONCEALMENT_MOTION_VECTORS);
+	vld->vld0.quantizer_scale_type = !!(control->flags & XVMC_Q_SCALE_TYPE);
+	vld->vld0.intra_vlc_format = !!(control->flags & XVMC_INTRA_VLC_FORMAT);
+	vld->vld0.scan_order = !!(control->flags & XVMC_ALTERNATE_SCAN);
+
+	vld->vld1.picture_coding_type = control->picture_coding_type;
+
+	vld->desc_remap_table0.index_0 = FRAME_INTRA;
+	vld->desc_remap_table0.index_1 = FRAME_FRAME_PRED_FORWARD;
+	vld->desc_remap_table0.index_2 = FRAME_FIELD_PRED_FORWARD;
+	vld->desc_remap_table0.index_3 = FRAME_FIELD_PRED_BIDIRECT;	/* dual prime */
+	vld->desc_remap_table0.index_4 = FRAME_FRAME_PRED_BACKWARD;
+	vld->desc_remap_table0.index_5 = FRAME_FIELD_PRED_BACKWARD;
+	vld->desc_remap_table0.index_6 = FRAME_FRAME_PRED_BIDIRECT;
+	vld->desc_remap_table0.index_7 = FRAME_FIELD_PRED_BIDIRECT;
+
+	vld->desc_remap_table1.index_8 = FRAME_INTRA;
+	vld->desc_remap_table1.index_9 = FRAME_FRAME_PRED_FORWARD;
+	vld->desc_remap_table1.index_10 = FRAME_FIELD_PRED_FORWARD;
+	vld->desc_remap_table1.index_11 = FRAME_FIELD_PRED_BIDIRECT;
+	vld->desc_remap_table1.index_12 = FRAME_FRAME_PRED_BACKWARD;
+	vld->desc_remap_table1.index_13 = FRAME_FIELD_PRED_BACKWARD;
+	vld->desc_remap_table1.index_14 = FRAME_FRAME_PRED_BIDIRECT;
+	vld->desc_remap_table1.index_15 = FRAME_FIELD_PRED_BIDIRECT;
+
+	drm_intel_bo_subdata(media_state.vld_state.bo, 0, sizeof(tmp), vld);
+	return Success;
+}
+
+static Status setup_media_surface(int index, dri_bo * bo,
+				  unsigned long offset, int w, int h,
+				  Bool write)
+{
+	struct brw_surface_state tmp, *ss = &tmp;
+	memset(ss, 0, sizeof(*ss));
+	ss->ss0.surface_type = BRW_SURFACE_2D;
+	ss->ss0.surface_format = BRW_SURFACEFORMAT_R8_SINT;
+	ss->ss1.base_addr = offset + bo->offset;
+	ss->ss2.width = w - 1;
+	ss->ss2.height = h - 1;
+	ss->ss3.pitch = w - 1;
+
+	if (media_state.binding_table.surface_states[index].bo)
+		drm_intel_bo_unreference(media_state.
+					 binding_table.surface_states[index].
+					 bo);
+
+	media_state.binding_table.surface_states[index].bo =
+	    drm_intel_bo_alloc(xvmc_driver->bufmgr, "surface_state",
+			       sizeof(struct brw_surface_state), 0x1000);
+	if (!media_state.binding_table.surface_states[index].bo)
+		return BadAlloc;
+
+	drm_intel_bo_subdata(media_state.binding_table.surface_states[index].bo,
+			     0, sizeof(*ss), ss);
+	drm_intel_bo_emit_reloc(media_state.binding_table.
+				surface_states[index].bo,
+				offsetof(struct brw_surface_state, ss1), bo,
+				offset, I915_GEM_DOMAIN_RENDER,
+				write ? I915_GEM_DOMAIN_RENDER : 0);
+	return Success;
+}
+
+static Status setup_surface(struct intel_xvmc_surface *target,
+			    struct intel_xvmc_surface *past,
+			    struct intel_xvmc_surface *future, int w, int h)
+{
+	Status ret;
+	ret = setup_media_surface(0, target->bo, 0, w, h, TRUE);
+	if (ret != Success)
+		return ret;
+	ret = setup_media_surface(1, target->bo, w * h, w / 2, h / 2, TRUE);
+	if (ret != Success)
+		return ret;
+	ret =
+	    setup_media_surface(2, target->bo, w * h + w * h / 4, w / 2, h / 2,
+				TRUE);
+	if (ret != Success)
+		return ret;
+	if (past) {
+		ret = setup_media_surface(4, past->bo, 0, w, h, FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(5, past->bo, w * h, w / 2, h / 2,
+					FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(6, past->bo, w * h + w * h / 4, w / 2,
+					h / 2, FALSE);
+		if (ret != Success)
+			return ret;
+	}
+	if (future) {
+		ret = setup_media_surface(7, future->bo, 0, w, h, FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(8, future->bo, w * h, w / 2, h / 2,
+					FALSE);
+		if (ret != Success)
+			return ret;
+		ret =
+		    setup_media_surface(9, future->bo, w * h + w * h / 4, w / 2,
+					h / 2, FALSE);
+		if (ret != Success)
+			return ret;
+	}
+	return Success;
+}
+
+static Status begin_surface(Display * display, XvMCContext * context,
+			    XvMCSurface * target,
+			    XvMCSurface * past,
+			    XvMCSurface * future,
+			    const XvMCMpegControl * control)
+{
+	struct i965_xvmc_contex *i965_ctx;
+	struct intel_xvmc_surface *priv_target, *priv_past, *priv_future;
+	intel_xvmc_context_ptr intel_ctx = context->privData;
+	Status ret;
+
+	priv_target = target->privData;
+	priv_past = past ? past->privData : NULL;
+	priv_future = future ? future->privData : NULL;
+
+	ret = vld_state(control);
+	if (ret != Success)
+		return ret;
+	ret = setup_surface(priv_target, priv_past, priv_future,
+			    context->width, context->height);
+	if (ret != Success)
+		return ret;
+	ret = binding_tables();
+	if (ret != Success)
+		return ret;
+	ret = interface_descriptor();
+	if (ret != Success)
+		return ret;
+	ret = vfe_state(VFE_VLD_MODE);
+	if (ret != Success)
+		return ret;
+
+	LOCK_HARDWARE(intel_ctx->hw_context);
+	flush();
+	UNLOCK_HARDWARE(intel_ctx->hw_context);
+	return Success;
+}
+
+static Status put_slice(Display * display, XvMCContext * context,
+			unsigned char *slice, int nbytes)
+{
+	return Success;
+}
+
+static void state_base_address(struct intel_xvmc_hw_context *ctx)
+{
+	BATCH_LOCALS;
+
+	if (ctx->i965.is_igdng) {
+		BEGIN_BATCH(8);
+		OUT_BATCH(BRW_STATE_BASE_ADDRESS | 6);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		ADVANCE_BATCH();
+	} else {
+		BEGIN_BATCH(6);
+		OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
+		ADVANCE_BATCH();
+	}
+}
+
+static void pipeline_select()
+{
+	BATCH_LOCALS;
+	BEGIN_BATCH(1);
+	OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
+	ADVANCE_BATCH();
+}
+
+static void media_state_pointers(int vfe_mode)
+{
+	BATCH_LOCALS;
+	BEGIN_BATCH(3);
+	OUT_BATCH(BRW_MEDIA_STATE_POINTERS | 1);
+	if (vfe_mode == VFE_VLD_MODE)
+		OUT_RELOC(media_state.vld_state.bo, I915_GEM_DOMAIN_INSTRUCTION,
+			  0, 1);
+	else
+		OUT_BATCH(0);
+	OUT_RELOC(media_state.vfe_state.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	ADVANCE_BATCH();
+}
+
+static void align_urb_fence()
+{
+	BATCH_LOCALS;
+	int i, offset_to_next_cacheline;
+	unsigned long batch_offset;
+	BEGIN_BATCH(3);
+	batch_offset = (void *)batch_ptr - xvmc_driver->alloc.ptr;
+	offset_to_next_cacheline = ALIGN(batch_offset, 64) - batch_offset;
+	if (offset_to_next_cacheline <= 12 && offset_to_next_cacheline != 0) {
+		for (i = 0; i < offset_to_next_cacheline / 4; i++)
+			OUT_BATCH(0);
+		ADVANCE_BATCH();
+	}
+}
+
+static void urb_layout()
+{
+	BATCH_LOCALS;
+	align_urb_fence();
+	BEGIN_BATCH(3);
+	OUT_BATCH(BRW_URB_FENCE |
+		  UF0_VFE_REALLOC |
+		  UF0_CS_REALLOC |
+		  UF0_SF_REALLOC |
+		  UF0_CLIP_REALLOC | UF0_GS_REALLOC | UF0_VS_REALLOC | 1);
+
+	OUT_BATCH((0 << UF1_CLIP_FENCE_SHIFT) |
+		  (0 << UF1_GS_FENCE_SHIFT) | (0 << UF1_VS_FENCE_SHIFT));
+
+	OUT_BATCH((0 << UF2_CS_FENCE_SHIFT) | (0 << UF2_SF_FENCE_SHIFT) | ((URB_SIZE - CS_SIZE - 1) << UF2_VFE_FENCE_SHIFT) |	/* VFE_SIZE */
+		  ((URB_SIZE) << UF2_CS_FENCE_SHIFT));	/* CS_SIZE */
+	ADVANCE_BATCH();
+}
+
+static void cs_urb_layout()
+{
+	BATCH_LOCALS;
+	BEGIN_BATCH(2);
+	OUT_BATCH(BRW_CS_URB_STATE | 0);
+	OUT_BATCH((CS_SIZE << 4) |	/* URB Entry Allocation Size */
+		  (1 << 0));	/* Number of URB Entries */
+	ADVANCE_BATCH();
+}
+
+static void cs_buffer()
+{
+	BATCH_LOCALS;
+	BEGIN_BATCH(2);
+	OUT_BATCH(BRW_CONSTANT_BUFFER | 0 | (1 << 8));
+	OUT_RELOC(media_state.cs_object.bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
+		  CS_SIZE);
+	ADVANCE_BATCH();
+}
+
+/* kick media object to gpu in idct mode*/
+static void send_media_object(XvMCMacroBlock * mb, dri_bo * bo,
+			      uint32_t offset, enum interface interface)
+{
+	BATCH_LOCALS;
+	BEGIN_BATCH(13);
+	OUT_BATCH(BRW_MEDIA_OBJECT | 11);
+	OUT_BATCH(interface);
+	OUT_BATCH(6 * 128);
+	OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, 0, offset);
+
+	OUT_BATCH(mb->x << 4);
+	OUT_BATCH(mb->y << 4);
+	OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, 0, offset);
+	OUT_BATCH_SHORT(mb->coded_block_pattern);
+	OUT_BATCH_SHORT(mb->PMV[0][0][0]);
+	OUT_BATCH_SHORT(mb->PMV[0][0][1]);
+	OUT_BATCH_SHORT(mb->PMV[0][1][0]);
+	OUT_BATCH_SHORT(mb->PMV[0][1][1]);
+
+	OUT_BATCH_SHORT(mb->PMV[1][0][0]);
+	OUT_BATCH_SHORT(mb->PMV[1][0][1]);
+	OUT_BATCH_SHORT(mb->PMV[1][1][0]);
+	OUT_BATCH_SHORT(mb->PMV[1][1][1]);
+	OUT_BATCH_CHAR(mb->dct_type);
+	OUT_BATCH_CHAR(mb->motion_vertical_field_select);
+
+	OUT_BATCH(0xffffffff);
+	ADVANCE_BATCH();
+}
+
+/* kick media object to gpu in vld mode*/
+static void vld_send_media_object(dri_bo * bo,
+				  int slice_len, int mb_h_pos, int mb_v_pos,
+				  int mb_bit_offset, int mb_count,
+				  int q_scale_code)
+{
+	BATCH_LOCALS;
+	BEGIN_BATCH(6);
+	OUT_BATCH(BRW_MEDIA_OBJECT | 4);
+	OUT_BATCH(0);
+	OUT_BATCH(slice_len);
+	OUT_RELOC(bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+	OUT_BATCH((mb_h_pos << 24) | (mb_v_pos << 16) | (mb_count << 8) |
+		  (mb_bit_offset));
+	OUT_BATCH(q_scale_code << 24);
+	ADVANCE_BATCH();
+}
+
+static Status put_slice2(Display * display, XvMCContext * context,
+			 unsigned char *slice, int nbytes, int sliceCode)
+{
+	unsigned int bit_buf;
+	intel_xvmc_context_ptr intel_ctx = context->privData;
+	struct intel_xvmc_hw_context *hw_ctx = intel_ctx->hw;
+	int q_scale_code, mb_row;
+
+	mb_row = *(slice - 1) - 1;
+	bit_buf =
+	    (slice[0] << 24) | (slice[1] << 16) | (slice[2] << 8) | (slice[3]);
+
+	q_scale_code = bit_buf >> 27;
+
+	if (media_state.slice_data.bo) {
+		drm_intel_gem_bo_unmap_gtt(media_state.slice_data.bo);
+
+		drm_intel_bo_unreference(media_state.slice_data.bo);
+	}
+	media_state.slice_data.bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+						       "slice data",
+						       VLD_MAX_SLICE_SIZE, 64);
+	if (!media_state.slice_data.bo)
+		return BadAlloc;
+	drm_intel_gem_bo_map_gtt(media_state.slice_data.bo);
+
+	memcpy(media_state.slice_data.bo->virtual, slice, nbytes);
+
+	LOCK_HARDWARE(intel_ctx->hw_context);
+	state_base_address(hw_ctx);
+	pipeline_select();
+	media_state_pointers(VFE_VLD_MODE);
+	urb_layout();
+	cs_urb_layout();
+	cs_buffer();
+	vld_send_media_object(media_state.slice_data.bo,
+			      nbytes, 0, mb_row, 6, 127, q_scale_code);
+	intelFlushBatch(TRUE);
+	UNLOCK_HARDWARE(intel_ctx->hw_context);
+
+	return Success;
+}
+
+static Status render_surface(Display * display,
+			     XvMCContext * context,
+			     unsigned int picture_structure,
+			     XvMCSurface * target_surface,
+			     XvMCSurface * past_surface,
+			     XvMCSurface * future_surface,
+			     unsigned int flags,
+			     unsigned int num_macroblocks,
+			     unsigned int first_macroblock,
+			     XvMCMacroBlockArray * macroblock_array,
+			     XvMCBlockArray * blocks)
+{
+	struct intel_xvmc_surface *priv_target, *priv_past, *priv_future;
+	intel_xvmc_context_ptr intel_ctx;
+	XvMCMacroBlock *mb;
+	Status ret;
+	unsigned short *block_ptr;
+	int i, j;
+	int block_offset = 0;
+	struct intel_xvmc_hw_context *hw_ctx;
+
+	intel_ctx = context->privData;
+
+	hw_ctx = (struct intel_xvmc_hw_context *)context->privData;
+	priv_target = target_surface->privData;
+	priv_past = past_surface ? past_surface->privData : NULL;
+	priv_future = future_surface ? future_surface->privData : NULL;
+
+	ret = setup_surface(priv_target, priv_past, priv_future,
+			    context->width, context->height);
+	if (ret != Success)
+		return ret;
+	ret = binding_tables();
+	if (ret != Success)
+		return ret;
+	ret = interface_descriptor();
+	if (ret != Success)
+		return ret;
+	ret = cs_init(INTERFACE_NUM);
+	if (ret != Success)
+		return ret;
+	ret = vfe_state(VFE_GENERIC_MODE);
+	if (ret != Success)
+		return ret;
+
+	if (media_state.mb_data.bo) {
+		drm_intel_gem_bo_unmap_gtt(media_state.mb_data.bo);
+
+		drm_intel_bo_unreference(media_state.mb_data.bo);
+	}
+	unsigned int block_num =
+	    (((context->width + 15) >> 4) * ((context->height + 15) >> 4));
+	unsigned int surface_size = (64 * sizeof(short) * 6 * block_num);
+	media_state.mb_data.bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
+						    "macroblock data",
+						    surface_size, 64);
+	if (!media_state.mb_data.bo)
+		return BadAlloc;
+	drm_intel_gem_bo_map_gtt(media_state.mb_data.bo);
+
+	block_ptr = media_state.mb_data.bo->virtual;
+	unsigned short *mb_block_ptr;
+	for (i = first_macroblock; i < num_macroblocks + first_macroblock; i++) {
+		mb = &macroblock_array->macro_blocks[i];
+		mb_block_ptr = &blocks->blocks[(mb->index << 6)];
+
+		if (mb->coded_block_pattern & 0x20) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j, mb_block_ptr + 8 * j,
+				       16);
+			mb_block_ptr += 64;
+		}
+		if (mb->coded_block_pattern & 0x10) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j + 8,
+				       mb_block_ptr + 8 * j, 16);
+			mb_block_ptr += 64;
+		}
+
+		block_ptr += 2 * 64;
+		if (mb->coded_block_pattern & 0x08) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j, mb_block_ptr + 8 * j,
+				       16);
+			mb_block_ptr += 64;
+		}
+		if (mb->coded_block_pattern & 0x04) {
+			for (j = 0; j < 8; j++)
+				memcpy(block_ptr + 16 * j + 8,
+				       mb_block_ptr + 8 * j, 16);
+			mb_block_ptr += 64;
+		}
+
+		block_ptr += 2 * 64;
+		if (mb->coded_block_pattern & 0x2) {
+			memcpy(block_ptr, mb_block_ptr, 128);
+			mb_block_ptr += 64;
+		}
+
+		block_ptr += 64;
+		if (mb->coded_block_pattern & 0x1)
+			memcpy(block_ptr, mb_block_ptr, 128);
+		block_ptr += 64;
+	}
+
+	LOCK_HARDWARE(intel_ctx->hw_context);
+	state_base_address(hw_ctx);
+	flush();
+	pipeline_select();
+	urb_layout();
+	media_state_pointers(VFE_GENERIC_MODE);
+	cs_urb_layout();
+	cs_buffer();
+	for (i = first_macroblock;
+	     i < num_macroblocks + first_macroblock;
+	     i++, block_offset += 128 * 6) {
+		mb = &macroblock_array->macro_blocks[i];
+
+		if (mb->macroblock_type & XVMC_MB_TYPE_INTRA) {
+			send_media_object(mb, media_state.mb_data.bo,
+					  block_offset,
+					  FRAME_INTRA + INTERFACE_NUM);
+		} else {
+			if (((mb->motion_type & 3) == XVMC_PREDICTION_FRAME)) {
+				if ((mb->macroblock_type &
+				     XVMC_MB_TYPE_MOTION_FORWARD)) {
+					if ((mb->macroblock_type &
+					     XVMC_MB_TYPE_MOTION_BACKWARD)) {
+						send_media_object(mb,
+								  media_state.mb_data.
+								  bo,
+								  block_offset,
+								  FRAME_FRAME_PRED_BIDIRECT
+								  +
+								  INTERFACE_NUM);
+					} else {
+						send_media_object(mb,
+								  media_state.mb_data.
+								  bo,
+								  block_offset,
+								  FRAME_FRAME_PRED_FORWARD
+								  +
+								  INTERFACE_NUM);
+					}
+				} else
+				    if ((mb->macroblock_type &
+					 XVMC_MB_TYPE_MOTION_BACKWARD)) {
+					send_media_object(mb,
+							  media_state.
+							  mb_data.bo,
+							  block_offset,
+							  FRAME_FRAME_PRED_BACKWARD
+							  + INTERFACE_NUM);
+				}
+			} else if ((mb->motion_type & 3) ==
+				   XVMC_PREDICTION_FIELD) {
+				if ((mb->macroblock_type &
+				     XVMC_MB_TYPE_MOTION_FORWARD)) {
+					if (((mb->macroblock_type &
+					      XVMC_MB_TYPE_MOTION_BACKWARD))) {
+						send_media_object(mb,
+								  media_state.mb_data.
+								  bo,
+								  block_offset,
+								  FRAME_FIELD_PRED_BIDIRECT
+								  +
+								  INTERFACE_NUM);
+					} else {
+						send_media_object(mb,
+								  media_state.mb_data.
+								  bo,
+								  block_offset,
+								  FRAME_FIELD_PRED_FORWARD
+								  +
+								  INTERFACE_NUM);
+					}
+				} else
+				    if ((mb->macroblock_type &
+					 XVMC_MB_TYPE_MOTION_BACKWARD)) {
+					send_media_object(mb,
+							  media_state.
+							  mb_data.bo,
+							  block_offset,
+							  FRAME_FIELD_PRED_BACKWARD
+							  + INTERFACE_NUM);
+				}
+			} else {
+				send_media_object(mb, media_state.mb_data.bo, block_offset, FRAME_FIELD_PRED_BIDIRECT + INTERFACE_NUM);	/*dual prime */
+			}
+		}
+	}
+	intelFlushBatch(TRUE);
+	UNLOCK_HARDWARE(intel_ctx->hw_context);
+	return Success;
+}
+
+struct _intel_xvmc_driver xvmc_vld_driver = {
+	.type = XVMC_I965_MPEG2_VLD,
+	.create_context = create_context,
+	.destroy_context = destroy_context,
+	.load_qmatrix = load_qmatrix,
+	.begin_surface = begin_surface,
+	.render_surface = render_surface,
+	.put_slice = put_slice,
+	.put_slice2 = put_slice2
+};
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.am new/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.am
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.am	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.am	2011-02-08 11:14:00.000000000 +0100
@@ -4,10 +4,7 @@ noinst_LTLIBRARIES = libuxa.la
 # built (in hw/xfree86/os-support/solaris) until after UXA is built
 SOLARIS_ASM_CFLAGS=""
 
-INCLUDES = \
-	$(XORG_INCS)
-
-AM_CFLAGS = $(WARN_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
 
 libuxa_la_SOURCES = \
 	uxa.c \
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.in new/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.in
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.in	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.in	2011-02-08 11:14:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +39,10 @@ host_triplet = @host@
 subdir = uxa
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -47,15 +50,17 @@ libuxa_la_LIBADD =
 am_libuxa_la_OBJECTS = uxa.lo uxa-accel.lo uxa-glyphs.lo uxa-render.lo \
 	uxa-unaccel.lo
 libuxa_la_OBJECTS = $(am_libuxa_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libuxa_la_SOURCES)
 DIST_SOURCES = $(libuxa_la_SOURCES)
 ETAGS = etags
@@ -64,7 +69,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -72,41 +80,58 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
+BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
+BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
+BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRIVER_NAME = @DRIVER_NAME@
 DRI_CFLAGS = @DRI_CFLAGS@
+DRI_FALSE = @DRI_FALSE@
 DRI_LIBS = @DRI_LIBS@
+DRI_TRUE = @DRI_TRUE@
 DRM_CFLAGS = @DRM_CFLAGS@
 DRM_LIBS = @DRM_LIBS@
-DRM_MODE_CFLAGS = @DRM_MODE_CFLAGS@
-DRM_MODE_LIBS = @DRM_MODE_LIBS@
 DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
 GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
+HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
+HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
+HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
+KMS_ONLY_FALSE = @KMS_ONLY_FALSE@
+KMS_ONLY_TRUE = @KMS_ONLY_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -114,12 +139,11 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -127,13 +151,8 @@ MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
 NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -147,26 +166,27 @@ PKG_CONFIG = @PKG_CONFIG@
 PS2PDF = @PS2PDF@
 RANLIB = @RANLIB@
 SED = @SED@
-SERVER_1_5_CFLAGS = @SERVER_1_5_CFLAGS@
-SERVER_1_5_LIBS = @SERVER_1_5_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
+VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
+VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
 XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
-XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 XVMCLIB_CFLAGS = @XVMCLIB_CFLAGS@
 XVMCLIB_LIBS = @XVMCLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+XVMC_FALSE = @XVMC_FALSE@
+XVMC_TRUE = @XVMC_TRUE@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -178,13 +198,11 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-gen4asm = @gen4asm@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -198,7 +216,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
@@ -209,21 +226,14 @@ program_transform_name = @program_transf
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libuxa.la
 
 # Override these since UXA doesn't need them and the needed files aren't
 # built (in hw/xfree86/os-support/solaris) until after UXA is built
 SOLARIS_ASM_CFLAGS = ""
-INCLUDES = \
-	$(XORG_INCS)
-
-AM_CFLAGS = $(WARN_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
 libuxa_la_SOURCES = \
 	uxa.c \
 	uxa.h \
@@ -241,8 +251,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -276,7 +286,7 @@ clean-noinstLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libuxa.la: $(libuxa_la_OBJECTS) $(libuxa_la_DEPENDENCIES) 
-	$(LINK)  $(libuxa_la_OBJECTS) $(libuxa_la_LIBADD) $(LIBS)
+	$(LINK)  $(libuxa_la_LDFLAGS) $(libuxa_la_OBJECTS) $(libuxa_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -291,22 +301,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uxa.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -317,13 +327,17 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -335,8 +349,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -346,12 +360,13 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -365,21 +380,22 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -427,7 +443,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -441,20 +457,12 @@ info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -475,22 +483,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-accel.c new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-accel.c
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-accel.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-accel.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,7 +1,7 @@
 /*
- * Copyright © 2001 Keith Packard
+ * Copyright ® 2001 Keith Packard
  *
- * Partly based on code that is Copyright © The XFree86 Project Inc.
+ * Partly based on code that is Copyright ® The XFree86 Project Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -23,7 +23,7 @@
  *
  * Authors:
  *    Eric Anholt <eric@anholt.net>
- *    Michel Dänzer <michel@tungstengraphics.com>
+ *    Michel Dänzer <michel@tungstengraphics.com>
  *
  */
 
@@ -34,500 +34,667 @@
 #include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "uxa.h"
+#include "mipict.h"
+
+static CARD32
+format_for_depth(int depth)
+{
+	switch (depth) {
+	case 1: return PICT_a1;
+	case 4: return PICT_a4;
+	case 8: return PICT_a8;
+	case 15: return PICT_x1r5g5b5;
+	case 16: return PICT_r5g6b5;
+	default:
+	case 24: return PICT_x8r8g8b8;
+#if 0
+	case 30: return PICT_x2r10g10b10;
+#endif
+	case 32: return PICT_a8r8g8b8;
+	}
+}
 
 static void
 uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
 	       DDXPointPtr ppt, int *pwidth, int fSorted)
 {
-    ScreenPtr	    pScreen = pDrawable->pScreen;
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    RegionPtr	    pClip = fbGetCompositeClip(pGC);
-    PixmapPtr	    pPixmap = uxa_get_drawable_pixmap (pDrawable);
-    BoxPtr	    pextent, pbox;
-    int		    nbox;
-    int		    extentX1, extentX2, extentY1, extentY2;
-    int		    fullX1, fullX2, fullY1;
-    int		    partX1, partX2;
-    int		    off_x, off_y;
-
-    if (uxa_screen->swappedOut || pGC->fillStyle != FillSolid ||
-	!(pPixmap = uxa_get_offscreen_pixmap (pDrawable, &off_x, &off_y)) ||
-	!(*uxa_screen->info->prepare_solid) (pPixmap,
-					     pGC->alu,
-					     pGC->planemask,
-					     pGC->fgPixel))
-    {
-	uxa_check_fill_spans (pDrawable, pGC, n, ppt, pwidth, fSorted);
-	return;
-    }
-
-    pextent = REGION_EXTENTS(pGC->pScreen, pClip);
-    extentX1 = pextent->x1;
-    extentY1 = pextent->y1;
-    extentX2 = pextent->x2;
-    extentY2 = pextent->y2;
-    while (n--)
-    {
-	fullX1 = ppt->x;
-	fullY1 = ppt->y;
-	fullX2 = fullX1 + (int) *pwidth;
-	ppt++;
-	pwidth++;
-
-	if (fullY1 < extentY1 || extentY2 <= fullY1)
-	    continue;
-
-	if (fullX1 < extentX1)
-	    fullX1 = extentX1;
-
-	if (fullX2 > extentX2)
-	    fullX2 = extentX2;
-
-	if (fullX1 >= fullX2)
-	    continue;
-
-	nbox = REGION_NUM_RECTS (pClip);
-	if (nbox == 1)
-	{
-	    (*uxa_screen->info->solid) (pPixmap,
-					fullX1 + off_x, fullY1 + off_y,
-					fullX2 + off_x, fullY1 + 1 + off_y);
-	}
-	else
-	{
-	    pbox = REGION_RECTS(pClip);
-	    while(nbox--)
-	    {
-		if (pbox->y1 <= fullY1 && fullY1 < pbox->y2)
-		{
-		    partX1 = pbox->x1;
-		    if (partX1 < fullX1)
-			partX1 = fullX1;
-		    partX2 = pbox->x2;
-		    if (partX2 > fullX2)
-			partX2 = fullX2;
-		    if (partX2 > partX1) {
-			(*uxa_screen->info->solid) (pPixmap,
-						    partX1 + off_x, fullY1 + off_y,
-						    partX2 + off_x, fullY1 + 1 + off_y);
-		    }
+	ScreenPtr screen = pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	RegionPtr pClip = fbGetCompositeClip(pGC);
+	PixmapPtr dst_pixmap, src_pixmap = NULL;
+	BoxPtr pextent, pbox;
+	int nbox;
+	int extentX1, extentX2, extentY1, extentY2;
+	int fullX1, fullX2, fullY1;
+	int partX1, partX2;
+	int off_x, off_y;
+	xRenderColor color;
+	PictFormatPtr format;
+	PicturePtr dst, src;
+	int error;
+
+	if (uxa_screen->swappedOut)
+		goto fallback;
+
+	if (pGC->fillStyle != FillSolid)
+		goto fallback;
+
+	dst_pixmap = uxa_get_offscreen_pixmap(pDrawable, &off_x, &off_y);
+	if (!dst_pixmap)
+		goto fallback;
+
+	if (pGC->alu != GXcopy || pGC->planemask != FB_ALLONES)
+		goto solid;
+
+	format = PictureMatchFormat(screen,
+				    dst_pixmap->drawable.depth,
+				    format_for_depth(dst_pixmap->drawable.depth));
+	dst = CreatePicture(0, &dst_pixmap->drawable, format, 0, 0, serverClient, &error);
+	if (!dst)
+		goto solid;
+
+	ValidatePicture(dst);
+
+	uxa_get_rgba_from_pixel(pGC->fgPixel,
+				&color.red,
+				&color.green,
+				&color.blue,
+				&color.alpha,
+				format_for_depth(dst_pixmap->drawable.depth));
+	src = CreateSolidPicture(0, &color, &error);
+	if (!src) {
+		FreePicture(dst, 0);
+		goto solid;
+	}
+
+	if (!uxa_screen->info->check_composite(PictOpSrc, src, NULL, dst, 0, 0)) {
+		FreePicture(src, 0);
+		FreePicture(dst, 0);
+		goto solid;
+	}
+
+	if (!uxa_screen->info->check_composite_texture ||
+	    !uxa_screen->info->check_composite_texture(screen, src)) {
+		PicturePtr solid;
+		int src_off_x, src_off_y;
+
+		solid = uxa_acquire_solid(screen, src->pSourcePict);
+		FreePicture(src, 0);
+
+		src = solid;
+		src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
+						      &src_off_x, &src_off_y);
+		if (!src_pixmap) {
+			FreePicture(src, 0);
+			FreePicture(dst, 0);
+			goto solid;
 		}
-		pbox++;
-	    }
 	}
-    }
-    (*uxa_screen->info->done_solid) (pPixmap);
-}
 
-static Bool
-uxa_do_put_image (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
-		  int w, int h, int format, char *bits, int src_stride)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDrawable->pScreen);
-    PixmapPtr pPix = uxa_get_drawable_pixmap (pDrawable);
-    RegionPtr pClip;
-    BoxPtr pbox;
-    int nbox;
-    int xoff, yoff;
-    int bpp = pDrawable->bitsPerPixel;
-    Bool access_prepared = FALSE;
-
-    /* Don't bother with under 8bpp, XYPixmaps. */
-    if (format != ZPixmap || bpp < 8)
-	return FALSE;
-
-    /* Only accelerate copies: no rop or planemask. */
-    if (!UXA_PM_IS_SOLID(pDrawable, pGC->planemask) || pGC->alu != GXcopy)
-	return FALSE;
-
-    if (uxa_screen->swappedOut)
-	return FALSE;
-
-    pPix = uxa_get_offscreen_pixmap (pDrawable, &xoff, &yoff);
-
-    if (!pPix || !uxa_screen->info->put_image)
-	return FALSE;
-
-    x += pDrawable->x;
-    y += pDrawable->y;
-
-    pClip = fbGetCompositeClip(pGC);
-    for (nbox = REGION_NUM_RECTS(pClip),
-	 pbox = REGION_RECTS(pClip);
-	 nbox--;
-	 pbox++)
-    {
-	int x1 = x;
-	int y1 = y;
-	int x2 = x + w;
-	int y2 = y + h;
-	char *src;
-	Bool ok;
-
-	if (x1 < pbox->x1)
-	    x1 = pbox->x1;
-	if (y1 < pbox->y1)
-	    y1 = pbox->y1;
-	if (x2 > pbox->x2)
-	    x2 = pbox->x2;
-	if (y2 > pbox->y2)
-	    y2 = pbox->y2;
-	if (x1 >= x2 || y1 >= y2)
-	    continue;
-
-	src = bits + (y1 - y) * src_stride + (x1 - x) * (bpp / 8);
-	ok = uxa_screen->info->put_image(pPix, x1 + xoff, y1 + yoff,
-					 x2 - x1, y2 - y1, src, src_stride);
-	/* If we fail to accelerate the upload, fall back to using unaccelerated
-	 * fb calls.
-	 */
-	if (!ok) {
-	    FbStip *dst;
-	    FbStride dst_stride;
-	    int	dstBpp;
-	    int	dstXoff, dstYoff;
-
-	    if (!access_prepared) {
-		if (!uxa_prepare_access(pDrawable, UXA_ACCESS_RW))
-		    return FALSE;
-		access_prepared = TRUE;
-	    }
+	if (!uxa_screen->info->prepare_composite(PictOpSrc, src, NULL, dst, src_pixmap, NULL, dst_pixmap)) {
+		FreePicture(src, 0);
+		FreePicture(dst, 0);
+		goto solid;
+	}
+
+	pextent = REGION_EXTENTS(pGC->screen, pClip);
+	extentX1 = pextent->x1;
+	extentY1 = pextent->y1;
+	extentX2 = pextent->x2;
+	extentY2 = pextent->y2;
+	while (n--) {
+		fullX1 = ppt->x;
+		fullY1 = ppt->y;
+		fullX2 = fullX1 + (int)*pwidth;
+		ppt++;
+		pwidth++;
+
+		if (fullY1 < extentY1 || extentY2 <= fullY1)
+			continue;
+
+		if (fullX1 < extentX1)
+			fullX1 = extentX1;
+
+		if (fullX2 > extentX2)
+			fullX2 = extentX2;
+
+		if (fullX1 >= fullX2)
+			continue;
+
+		nbox = REGION_NUM_RECTS(pClip);
+		if (nbox == 1) {
+			uxa_screen->info->composite(dst_pixmap,
+						    0, 0, 0, 0,
+						    fullX1 + off_x,
+						    fullY1 + off_y,
+						    fullX2 - fullX1, 1);
+		} else {
+			pbox = REGION_RECTS(pClip);
+			while (nbox--) {
+				if (pbox->y1 > fullY1)
+					break;
+
+				if (pbox->y1 <= fullY1) {
+					partX1 = pbox->x1;
+					if (partX1 < fullX1)
+						partX1 = fullX1;
+
+					partX2 = pbox->x2;
+					if (partX2 > fullX2)
+						partX2 = fullX2;
+
+					if (partX2 > partX1) {
+						uxa_screen->info->composite(dst_pixmap,
+									    0, 0, 0, 0,
+									    partX1 + off_x,
+									    fullY1 + off_y,
+									    partX2 - partX1, 1);
+					}
+				}
+				pbox++;
+			}
+		}
+	}
 
-	    fbGetStipDrawable(pDrawable, dst, dst_stride, dstBpp,
-			      dstXoff, dstYoff);
+	uxa_screen->info->done_composite(dst_pixmap);
+	FreePicture(src, 0);
+	FreePicture(dst, 0);
+	return;
 
-	    fbBltStip((FbStip *)bits + (y1 - y) * (src_stride / sizeof(FbStip)),
-		      src_stride / sizeof(FbStip),
-		      (x1 - x) * dstBpp,
-		      dst + (y1 + dstYoff) * dst_stride,
-		      dst_stride,
-		      (x1 + dstXoff) * dstBpp,
-		      (x2 - x1) * dstBpp,
-		      y2 - y1,
-		      GXcopy, FB_ALLONES, dstBpp);
+solid:
+	if (uxa_screen->info->check_solid &&
+	    !uxa_screen->info->check_solid(pDrawable, pGC->alu, pGC->planemask))
+		goto fallback;
+
+	if (!(*uxa_screen->info->prepare_solid) (dst_pixmap,
+						 pGC->alu,
+						 pGC->planemask,
+						 pGC->fgPixel))
+		goto fallback;
+
+	pextent = REGION_EXTENTS(pGC->screen, pClip);
+	extentX1 = pextent->x1;
+	extentY1 = pextent->y1;
+	extentX2 = pextent->x2;
+	extentY2 = pextent->y2;
+	while (n--) {
+		fullX1 = ppt->x;
+		fullY1 = ppt->y;
+		fullX2 = fullX1 + (int)*pwidth;
+		ppt++;
+		pwidth++;
+
+		if (fullY1 < extentY1 || extentY2 <= fullY1)
+			continue;
+
+		if (fullX1 < extentX1)
+			fullX1 = extentX1;
+
+		if (fullX2 > extentX2)
+			fullX2 = extentX2;
+
+		if (fullX1 >= fullX2)
+			continue;
+
+		nbox = REGION_NUM_RECTS(pClip);
+		if (nbox == 1) {
+			(*uxa_screen->info->solid) (dst_pixmap,
+						    fullX1 + off_x,
+						    fullY1 + off_y,
+						    fullX2 + off_x,
+						    fullY1 + 1 + off_y);
+		} else {
+			pbox = REGION_RECTS(pClip);
+			while (nbox--) {
+				if (pbox->y1 <= fullY1 && fullY1 < pbox->y2) {
+					partX1 = pbox->x1;
+					if (partX1 < fullX1)
+						partX1 = fullX1;
+					partX2 = pbox->x2;
+					if (partX2 > fullX2)
+						partX2 = fullX2;
+					if (partX2 > partX1) {
+						(*uxa_screen->info->
+						 solid) (dst_pixmap,
+							 partX1 + off_x,
+							 fullY1 + off_y,
+							 partX2 + off_x,
+							 fullY1 + 1 + off_y);
+					}
+				}
+				pbox++;
+			}
+		}
 	}
-    }
+	(*uxa_screen->info->done_solid) (dst_pixmap);
 
-    if (access_prepared)
-	uxa_finish_access(pDrawable);
+	return;
 
-    return TRUE;
+fallback:
+	uxa_check_fill_spans(pDrawable, pGC, n, ppt, pwidth, fSorted);
 }
 
-#ifdef MITSHM
-
 static Bool
-uxa_do_shm_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth,
-		 unsigned int format, int w, int h, int sx, int sy, int sw,
-		 int sh, int dx, int dy, char *data)
+uxa_do_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
+		 int w, int h, int format, char *bits, int src_stride)
 {
-    int src_stride = PixmapBytePad(w, depth);
-
-    if (uxa_do_put_image(pDrawable, pGC, depth, dx, dy, sw, sh, format, data +
-			 sy * src_stride + sx * BitsPerPixel(depth) / 8,
-			 src_stride))
-	return TRUE;
-
-    if (format == ZPixmap)
-    {
-	PixmapPtr pPixmap;
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDrawable->pScreen);
+	PixmapPtr pPix = uxa_get_drawable_pixmap(pDrawable);
+	RegionPtr pClip;
+	BoxPtr pbox;
+	int nbox;
+	int xoff, yoff;
+	int bpp = pDrawable->bitsPerPixel;
 
-	pPixmap = GetScratchPixmapHeader(pDrawable->pScreen, w, h, depth,
-					 BitsPerPixel(depth), PixmapBytePad(w, depth),
-					 (pointer)data);
-	if (!pPixmap)
-	    return FALSE;
+	/* Don't bother with under 8bpp, XYPixmaps. */
+	if (format != ZPixmap || bpp < 8)
+		return FALSE;
+
+	/* Only accelerate copies: no rop or planemask. */
+	if (!UXA_PM_IS_SOLID(pDrawable, pGC->planemask) || pGC->alu != GXcopy)
+		return FALSE;
+
+	if (uxa_screen->swappedOut)
+		return FALSE;
+
+	pPix = uxa_get_offscreen_pixmap(pDrawable, &xoff, &yoff);
+
+	if (!pPix || !uxa_screen->info->put_image)
+		return FALSE;
+
+	x += pDrawable->x;
+	y += pDrawable->y;
+
+	pClip = fbGetCompositeClip(pGC);
+	for (nbox = REGION_NUM_RECTS(pClip),
+	     pbox = REGION_RECTS(pClip); nbox--; pbox++) {
+		int x1 = x;
+		int y1 = y;
+		int x2 = x + w;
+		int y2 = y + h;
+		char *src;
+		Bool ok;
+
+		if (x1 < pbox->x1)
+			x1 = pbox->x1;
+		if (y1 < pbox->y1)
+			y1 = pbox->y1;
+		if (x2 > pbox->x2)
+			x2 = pbox->x2;
+		if (y2 > pbox->y2)
+			y2 = pbox->y2;
+		if (x1 >= x2 || y1 >= y2)
+			continue;
+
+		src = bits + (y1 - y) * src_stride + (x1 - x) * (bpp / 8);
+		ok = uxa_screen->info->put_image(pPix, x1 + xoff, y1 + yoff,
+						 x2 - x1, y2 - y1, src,
+						 src_stride);
+		/* If we fail to accelerate the upload, fall back to using
+		 * unaccelerated fb calls.
+		 */
+		if (!ok) {
+			FbStip *dst;
+			FbStride dst_stride;
+			int dstBpp;
+			int dstXoff, dstYoff;
+
+			if (!uxa_prepare_access(pDrawable, UXA_ACCESS_RW))
+				return FALSE;
+
+			fbGetStipDrawable(pDrawable, dst, dst_stride, dstBpp,
+					  dstXoff, dstYoff);
+
+			fbBltStip((FbStip *) bits +
+				  (y1 - y) * (src_stride / sizeof(FbStip)),
+				  src_stride / sizeof(FbStip),
+				  (x1 - x) * dstBpp,
+				  dst + (y1 + dstYoff) * dst_stride, dst_stride,
+				  (x1 + dstXoff) * dstBpp, (x2 - x1) * dstBpp,
+				  y2 - y1, GXcopy, FB_ALLONES, dstBpp);
 
-        if (!uxa_prepare_access (pDrawable, UXA_ACCESS_RW))
-	    return FALSE;
-	fbCopyArea((DrawablePtr)pPixmap, pDrawable, pGC, sx, sy, sw, sh, dx, dy);
-	uxa_finish_access(pDrawable);
+			uxa_finish_access(pDrawable);
+		}
+	}
 
-	FreeScratchPixmapHeader(pPixmap);
 
 	return TRUE;
-    }
-
-    return FALSE;
 }
 
-/* The actual ShmPutImage isn't wrapped by the damage layer, so we need to
- * inform any interested parties of the damage incurred to the drawable.
- *
- * We also need to set the pending damage to ensure correct migration in all
- * cases.
- */
-void
-uxa_shm_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth, unsigned int format,
-		  int w, int h, int sx, int sy, int sw, int sh, int dx, int dy,
-		  char *data)
-{
-    if (!uxa_do_shm_put_image(pDrawable, pGC, depth, format, w, h, sx, sy, sw, sh,
-			      dx, dy, data)) {
-	if (!uxa_prepare_access (pDrawable, UXA_ACCESS_RW))
-	    return;
-	fbShmPutImage(pDrawable, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy,
-		      data);
-	uxa_finish_access(pDrawable);
-    }
-}
-
-ShmFuncs uxa_shm_funcs = { NULL, uxa_shm_put_image };
-
-#endif
-
 static void
-uxa_put_image (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
-	     int w, int h, int leftPad, int format, char *bits)
+uxa_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
+	      int w, int h, int leftPad, int format, char *bits)
 {
-#ifdef MITSHM
-    if (!uxa_do_shm_put_image(pDrawable, pGC, depth, format, w, h, 0, 0, w, h, x, y,
-			  bits))
-#else
-    if (!uxa_do_put_image(pDrawable, pGC, depth, x, y, w, h, format, bits,
-		       PixmapBytePad(w, pDrawable->depth)))
-#endif
-	uxa_check_put_image(pDrawable, pGC, depth, x, y, w, h, leftPad, format,
-			 bits);
+	if (!uxa_do_put_image(pDrawable, pGC, depth, x, y, w, h, format, bits,
+			      PixmapBytePad(w, pDrawable->depth)))
+		uxa_check_put_image(pDrawable, pGC, depth, x, y, w, h, leftPad,
+				    format, bits);
 }
 
 static Bool inline
-uxa_copy_n_to_n_two_dir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
-		   GCPtr pGC, BoxPtr pbox, int nbox, int dx, int dy)
+uxa_copy_n_to_n_two_dir(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+			GCPtr pGC, BoxPtr pbox, int nbox, int dx, int dy)
 {
-    uxa_screen_t *uxa_screen = uxa_get_screen(pDstDrawable->pScreen);
-    PixmapPtr pSrcPixmap, pDstPixmap;
-    int src_off_x, src_off_y, dst_off_x, dst_off_y;
-    int dirsetup;
-
-    /* Need to get both pixmaps to call the driver routines */
-    pSrcPixmap = uxa_get_offscreen_pixmap (pSrcDrawable, &src_off_x, &src_off_y);
-    pDstPixmap = uxa_get_offscreen_pixmap (pDstDrawable, &dst_off_x, &dst_off_y);
-    if (!pSrcPixmap || !pDstPixmap)
-	return FALSE;
-
-    /*
-     * Now the case of a chip that only supports xdir = ydir = 1 or
-     * xdir = ydir = -1, but we have xdir != ydir.
-     */
-    dirsetup = 0;	/* No direction set up yet. */
-    for (; nbox; pbox++, nbox--) {
-	if (dx >= 0 && (src_off_y + pbox->y1 + dy) != pbox->y1) {
-	    /* Do a xdir = ydir = -1 blit instead. */
-	    if (dirsetup != -1) {
-		if (dirsetup != 0)
-		    uxa_screen->info->done_copy(pDstPixmap);
-		dirsetup = -1;
-		if (!(*uxa_screen->info->prepare_copy)(pSrcPixmap,
-						   pDstPixmap,
-						   -1, -1,
-						   pGC ? pGC->alu : GXcopy,
-						   pGC ? pGC->planemask :
-							 FB_ALLONES))
-		    return FALSE;
-	    }
-	    (*uxa_screen->info->copy)(pDstPixmap,
-				   src_off_x + pbox->x1 + dx,
-				   src_off_y + pbox->y1 + dy,
-				   dst_off_x + pbox->x1,
-				   dst_off_y + pbox->y1,
-				   pbox->x2 - pbox->x1,
-				   pbox->y2 - pbox->y1);
-	} else if (dx < 0 && (src_off_y + pbox->y1 + dy) != pbox->y1) {
-	    /* Do a xdir = ydir = 1 blit instead. */
-	    if (dirsetup != 1) {
-		if (dirsetup != 0)
-		    uxa_screen->info->done_copy(pDstPixmap);
-		dirsetup = 1;
-		if (!(*uxa_screen->info->prepare_copy)(pSrcPixmap,
-						   pDstPixmap,
-						   1, 1,
-						   pGC ? pGC->alu : GXcopy,
-						   pGC ? pGC->planemask :
-							 FB_ALLONES))
-		    return FALSE;
-	    }
-	    (*uxa_screen->info->copy)(pDstPixmap,
-				   src_off_x + pbox->x1 + dx,
-				   src_off_y + pbox->y1 + dy,
-				   dst_off_x + pbox->x1,
-				   dst_off_y + pbox->y1,
-				   pbox->x2 - pbox->x1,
-				   pbox->y2 - pbox->y1);
-	} else if (dx >= 0) {
-	    /*
-	     * xdir = 1, ydir = -1.
-	     * Perform line-by-line xdir = ydir = 1 blits, going up.
-	     */
-	    int i;
-	    if (dirsetup != 1) {
-		if (dirsetup != 0)
-		    uxa_screen->info->done_copy(pDstPixmap);
-		dirsetup = 1;
-		if (!(*uxa_screen->info->prepare_copy)(pSrcPixmap,
-						   pDstPixmap,
-						   1, 1,
-						   pGC ? pGC->alu : GXcopy,
-						   pGC ? pGC->planemask :
-							 FB_ALLONES))
-		    return FALSE;
-	    }
-	    for (i = pbox->y2 - pbox->y1 - 1; i >= 0; i--)
-		(*uxa_screen->info->copy)(pDstPixmap,
-				       src_off_x + pbox->x1 + dx,
-				       src_off_y + pbox->y1 + dy + i,
-				       dst_off_x + pbox->x1,
-				       dst_off_y + pbox->y1 + i,
-				       pbox->x2 - pbox->x1, 1);
-	} else {
-	    /*
-	     * xdir = -1, ydir = 1.
-	     * Perform line-by-line xdir = ydir = -1 blits, going down.
-	     */
-	    int i;
-	    if (dirsetup != -1) {
-		if (dirsetup != 0)
-		    uxa_screen->info->done_copy(pDstPixmap);
-		dirsetup = -1;
-		if (!(*uxa_screen->info->prepare_copy)(pSrcPixmap,
-						   pDstPixmap,
-						   -1, -1,
-						   pGC ? pGC->alu : GXcopy,
-						   pGC ? pGC->planemask :
-							 FB_ALLONES))
-		    return FALSE;
-	    }
-	    for (i = 0; i < pbox->y2 - pbox->y1; i++)
-		(*uxa_screen->info->copy)(pDstPixmap,
-				       src_off_x + pbox->x1 + dx,
-				       src_off_y + pbox->y1 + dy + i,
-				       dst_off_x + pbox->x1,
-				       dst_off_y + pbox->y1 + i,
-				       pbox->x2 - pbox->x1, 1);
-	}
-    }
-    if (dirsetup != 0)
-	uxa_screen->info->done_copy(pDstPixmap);
-    return TRUE;
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDstDrawable->pScreen);
+	PixmapPtr pSrcPixmap, pDstPixmap;
+	int src_off_x, src_off_y, dst_off_x, dst_off_y;
+	int dirsetup;
+
+	/* Need to get both pixmaps to call the driver routines */
+	pSrcPixmap =
+	    uxa_get_offscreen_pixmap(pSrcDrawable, &src_off_x, &src_off_y);
+	pDstPixmap =
+	    uxa_get_offscreen_pixmap(pDstDrawable, &dst_off_x, &dst_off_y);
+	if (!pSrcPixmap || !pDstPixmap)
+		return FALSE;
+
+	/*
+	 * Now the case of a chip that only supports xdir = ydir = 1 or
+	 * xdir = ydir = -1, but we have xdir != ydir.
+	 */
+	dirsetup = 0;		/* No direction set up yet. */
+	for (; nbox; pbox++, nbox--) {
+		if (dx >= 0 && (src_off_y + pbox->y1 + dy) != pbox->y1) {
+			/* Do a xdir = ydir = -1 blit instead. */
+			if (dirsetup != -1) {
+				if (dirsetup != 0)
+					uxa_screen->info->done_copy(pDstPixmap);
+				dirsetup = -1;
+				if (!(*uxa_screen->info->prepare_copy)
+				    (pSrcPixmap, pDstPixmap, -1, -1,
+				     pGC ? pGC->alu : GXcopy,
+				     pGC ? pGC->planemask : FB_ALLONES))
+					return FALSE;
+			}
+			(*uxa_screen->info->copy) (pDstPixmap,
+						   src_off_x + pbox->x1 + dx,
+						   src_off_y + pbox->y1 + dy,
+						   dst_off_x + pbox->x1,
+						   dst_off_y + pbox->y1,
+						   pbox->x2 - pbox->x1,
+						   pbox->y2 - pbox->y1);
+		} else if (dx < 0 && (src_off_y + pbox->y1 + dy) != pbox->y1) {
+			/* Do a xdir = ydir = 1 blit instead. */
+			if (dirsetup != 1) {
+				if (dirsetup != 0)
+					uxa_screen->info->done_copy(pDstPixmap);
+				dirsetup = 1;
+				if (!(*uxa_screen->info->prepare_copy)
+				    (pSrcPixmap, pDstPixmap, 1, 1,
+				     pGC ? pGC->alu : GXcopy,
+				     pGC ? pGC->planemask : FB_ALLONES))
+					return FALSE;
+			}
+			(*uxa_screen->info->copy) (pDstPixmap,
+						   src_off_x + pbox->x1 + dx,
+						   src_off_y + pbox->y1 + dy,
+						   dst_off_x + pbox->x1,
+						   dst_off_y + pbox->y1,
+						   pbox->x2 - pbox->x1,
+						   pbox->y2 - pbox->y1);
+		} else if (dx >= 0) {
+			/*
+			 * xdir = 1, ydir = -1.
+			 * Perform line-by-line xdir = ydir = 1 blits, going up.
+			 */
+			int i;
+			if (dirsetup != 1) {
+				if (dirsetup != 0)
+					uxa_screen->info->done_copy(pDstPixmap);
+				dirsetup = 1;
+				if (!(*uxa_screen->info->prepare_copy)
+				    (pSrcPixmap, pDstPixmap, 1, 1,
+				     pGC ? pGC->alu : GXcopy,
+				     pGC ? pGC->planemask : FB_ALLONES))
+					return FALSE;
+			}
+			for (i = pbox->y2 - pbox->y1 - 1; i >= 0; i--)
+				(*uxa_screen->info->copy) (pDstPixmap,
+							   src_off_x +
+							   pbox->x1 + dx,
+							   src_off_y +
+							   pbox->y1 + dy + i,
+							   dst_off_x + pbox->x1,
+							   dst_off_y +
+							   pbox->y1 + i,
+							   pbox->x2 - pbox->x1,
+							   1);
+		} else {
+			/*
+			 * xdir = -1, ydir = 1.
+			 * Perform line-by-line xdir = ydir = -1 blits,
+			 * going down.
+			 */
+			int i;
+			if (dirsetup != -1) {
+				if (dirsetup != 0)
+					uxa_screen->info->done_copy(pDstPixmap);
+				dirsetup = -1;
+				if (!(*uxa_screen->info->prepare_copy)
+				    (pSrcPixmap, pDstPixmap, -1, -1,
+				     pGC ? pGC->alu : GXcopy,
+				     pGC ? pGC->planemask : FB_ALLONES))
+					return FALSE;
+			}
+			for (i = 0; i < pbox->y2 - pbox->y1; i++)
+				(*uxa_screen->info->copy) (pDstPixmap,
+							   src_off_x +
+							   pbox->x1 + dx,
+							   src_off_y +
+							   pbox->y1 + dy + i,
+							   dst_off_x + pbox->x1,
+							   dst_off_y +
+							   pbox->y1 + i,
+							   pbox->x2 - pbox->x1,
+							   1);
+		}
+	}
+	if (dirsetup != 0)
+		uxa_screen->info->done_copy(pDstPixmap);
+	return TRUE;
 }
 
 void
-uxa_copy_n_to_n (DrawablePtr    pSrcDrawable,
-		 DrawablePtr    pDstDrawable,
-		 GCPtr		pGC,
-		 BoxPtr		pbox,
-		 int		nbox,
-		 int		dx,
-		 int		dy,
-		 Bool		reverse,
-		 Bool		upsidedown,
-		 Pixel		bitplane,
-		 void		*closure)
+uxa_copy_n_to_n(DrawablePtr pSrcDrawable,
+		DrawablePtr pDstDrawable,
+		GCPtr pGC,
+		BoxPtr pbox,
+		int nbox,
+		int dx,
+		int dy,
+		Bool reverse, Bool upsidedown, Pixel bitplane, void *closure)
 {
-    ScreenPtr       screen = pDstDrawable->pScreen;
-    uxa_screen_t    *uxa_screen = uxa_get_screen(screen);
-    int		    src_off_x, src_off_y;
-    int		    dst_off_x, dst_off_y;
-    PixmapPtr	    pSrcPixmap, pDstPixmap;
-
-    pSrcPixmap = uxa_get_drawable_pixmap (pSrcDrawable);
-    pDstPixmap = uxa_get_drawable_pixmap (pDstDrawable);
-
-    uxa_get_drawable_deltas (pSrcDrawable, pSrcPixmap, &src_off_x, &src_off_y);
-    uxa_get_drawable_deltas (pDstDrawable, pDstPixmap, &dst_off_x, &dst_off_y);
-
-    /* Mixed directions must be handled specially if the card is lame */
-    if ((uxa_screen->info->flags & UXA_TWO_BITBLT_DIRECTIONS) &&
-	reverse != upsidedown) {
-	if (uxa_copy_n_to_n_two_dir(pSrcDrawable, pDstDrawable, pGC, pbox, nbox,
-			       dx, dy))
-	    return;
-	goto fallback;
-    }
-
-    if (!uxa_pixmap_is_offscreen(pSrcPixmap) ||
-	!uxa_pixmap_is_offscreen(pDstPixmap) ||
-	!(*uxa_screen->info->prepare_copy) (pSrcPixmap, pDstPixmap, reverse ? -1 : 1,
-					   upsidedown ? -1 : 1,
-					   pGC ? pGC->alu : GXcopy,
-					   pGC ? pGC->planemask : FB_ALLONES)) {
-	goto fallback;
-    }
-
-    while (nbox--)
-    {
-	(*uxa_screen->info->copy) (pDstPixmap,
-				   pbox->x1 + dx + src_off_x,
-				   pbox->y1 + dy + src_off_y,
-				   pbox->x1 + dst_off_x, pbox->y1 + dst_off_y,
-				   pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);
-	pbox++;
-    }
+	ScreenPtr screen = pDstDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	int src_off_x, src_off_y;
+	int dst_off_x, dst_off_y;
+	PixmapPtr pSrcPixmap, pDstPixmap;
+
+	pSrcPixmap = uxa_get_drawable_pixmap(pSrcDrawable);
+	pDstPixmap = uxa_get_drawable_pixmap(pDstDrawable);
+	if (!pSrcPixmap || !pDstPixmap)
+		goto fallback;
+
+	if (uxa_screen->info->check_copy &&
+	    !uxa_screen->info->check_copy(pSrcPixmap, pDstPixmap,
+					  pGC ? pGC->alu : GXcopy,
+					  pGC ? pGC->planemask : FB_ALLONES))
+		goto fallback;
+
+	uxa_get_drawable_deltas(pSrcDrawable, pSrcPixmap, &src_off_x,
+				&src_off_y);
+	uxa_get_drawable_deltas(pDstDrawable, pDstPixmap, &dst_off_x,
+				&dst_off_y);
+
+	/* Mixed directions must be handled specially if the card is lame */
+	if ((uxa_screen->info->flags & UXA_TWO_BITBLT_DIRECTIONS) &&
+	    reverse != upsidedown) {
+		if (uxa_copy_n_to_n_two_dir
+		    (pSrcDrawable, pDstDrawable, pGC, pbox, nbox, dx, dy))
+			return;
+		goto fallback;
+	}
+
+	if (!uxa_pixmap_is_offscreen(pDstPixmap)) {
+		int stride, bpp;
+		char *dst;
+
+		if (!uxa_pixmap_is_offscreen(pSrcPixmap))
+			goto fallback;
+
+		if (!uxa_screen->info->get_image)
+			goto fallback;
+
+		/* Don't bother with under 8bpp, XYPixmaps. */
+		bpp = pSrcPixmap->drawable.bitsPerPixel;
+		if (bpp != pDstDrawable->bitsPerPixel || bpp < 8)
+			goto fallback;
+
+		/* Only accelerate copies: no rop or planemask. */
+		if (pGC && (!UXA_PM_IS_SOLID(pSrcDrawable, pGC->planemask) || pGC->alu != GXcopy))
+			goto fallback;
+
+		dst = pDstPixmap->devPrivate.ptr;
+		stride = pDstPixmap->devKind;
+		bpp /= 8;
+		while (nbox--) {
+			if (!uxa_screen->info->get_image(pSrcPixmap,
+							 pbox->x1 + dx + src_off_x,
+							 pbox->y1 + dy + src_off_y,
+							 pbox->x2 - pbox->x1,
+							 pbox->y2 - pbox->y1,
+							 (char *) dst +
+							 (pbox->y1 + dst_off_y) * stride +
+							 (pbox->x1 + dst_off_x) * bpp,
+							 stride))
+				goto fallback;
+
+			pbox++;
+		}
 
-    (*uxa_screen->info->done_copy) (pDstPixmap);
+		return;
+	}
 
-    return;
+	if (uxa_pixmap_is_offscreen(pSrcPixmap)) {
+	    if (!(*uxa_screen->info->prepare_copy) (pSrcPixmap, pDstPixmap,
+						reverse ? -1 : 1,
+						upsidedown ? -1 : 1,
+						pGC ? pGC->alu : GXcopy,
+						pGC ? pGC->
+						planemask : FB_ALLONES))
+		goto fallback;
+
+	    while (nbox--) {
+		(*uxa_screen->info->copy) (pDstPixmap,
+					   pbox->x1 + dx + src_off_x,
+					   pbox->y1 + dy + src_off_y,
+					   pbox->x1 + dst_off_x,
+					   pbox->y1 + dst_off_y,
+					   pbox->x2 - pbox->x1,
+					   pbox->y2 - pbox->y1);
+		pbox++;
+	    }
+
+	    (*uxa_screen->info->done_copy) (pDstPixmap);
+	} else {
+	    int stride, bpp;
+	    char *src;
+
+	    if (!uxa_screen->info->put_image)
+		goto fallback;
+
+	    /* Don't bother with under 8bpp, XYPixmaps. */
+	    bpp = pSrcPixmap->drawable.bitsPerPixel;
+	    if (bpp != pDstDrawable->bitsPerPixel || bpp < 8)
+		goto fallback;
+
+	    /* Only accelerate copies: no rop or planemask. */
+	    if (pGC && (!UXA_PM_IS_SOLID(pSrcDrawable, pGC->planemask) || pGC->alu != GXcopy))
+		goto fallback;
+
+	    src = pSrcPixmap->devPrivate.ptr;
+	    stride = pSrcPixmap->devKind;
+	    bpp /= 8;
+	    while (nbox--) {
+		if (!uxa_screen->info->put_image(pDstPixmap,
+						 pbox->x1 + dst_off_x,
+						 pbox->y1 + dst_off_y,
+						 pbox->x2 - pbox->x1,
+						 pbox->y2 - pbox->y1,
+						 (char *) src +
+						 (pbox->y1 + dy + src_off_y) * stride +
+						 (pbox->x1 + dx + src_off_x) * bpp,
+						 stride))
+		    goto fallback;
+
+		pbox++;
+	    }
+	}
+
+	return;
 
 fallback:
-    UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrcDrawable, pDstDrawable,
-		  uxa_drawable_location(pSrcDrawable),
-		  uxa_drawable_location(pDstDrawable)));
-    if (uxa_prepare_access (pDstDrawable, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access (pSrcDrawable, UXA_ACCESS_RO)) {
-	    fbCopyNtoN (pSrcDrawable, pDstDrawable, pGC, pbox, nbox, dx, dy,
-			reverse, upsidedown, bitplane, closure);
-	    uxa_finish_access (pSrcDrawable);
+	UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrcDrawable, pDstDrawable,
+		      uxa_drawable_location(pSrcDrawable),
+		      uxa_drawable_location(pDstDrawable)));
+	if (uxa_prepare_access(pDstDrawable, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access(pSrcDrawable, UXA_ACCESS_RO)) {
+			fbCopyNtoN(pSrcDrawable, pDstDrawable, pGC, pbox, nbox,
+				   dx, dy, reverse, upsidedown, bitplane,
+				   closure);
+			uxa_finish_access(pSrcDrawable);
+		}
+		uxa_finish_access(pDstDrawable);
 	}
-	uxa_finish_access (pDstDrawable);
-    }
 }
 
 RegionPtr
 uxa_copy_area(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
-	    int srcx, int srcy, int width, int height, int dstx, int dsty)
+	      int srcx, int srcy, int width, int height, int dstx, int dsty)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDstDrawable->pScreen);
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDstDrawable->pScreen);
+
+	if (uxa_screen->swappedOut) {
+		return uxa_check_copy_area(pSrcDrawable, pDstDrawable, pGC,
+					   srcx, srcy, width, height, dstx,
+					   dsty);
+	}
 
-    if (uxa_screen->swappedOut) {
-        return  uxa_check_copy_area(pSrcDrawable, pDstDrawable, pGC,
-                                 srcx, srcy, width, height, dstx, dsty);
-    }
-
-    return miDoCopy (pSrcDrawable, pDstDrawable, pGC,
-		     srcx, srcy, width, height,
-		     dstx, dsty, uxa_copy_n_to_n, 0, NULL);
+	return miDoCopy(pSrcDrawable, pDstDrawable, pGC,
+			srcx, srcy, width, height,
+			dstx, dsty, uxa_copy_n_to_n, 0, NULL);
 }
 
 static void
 uxa_poly_point(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
-	     DDXPointPtr ppt)
+	       DDXPointPtr ppt)
 {
-    int i;
-    xRectangle *prect;
+	int i;
+	xRectangle *prect;
 
-    /* If we can't reuse the current GC as is, don't bother accelerating the
-     * points.
-     */
-    if (pGC->fillStyle != FillSolid) {
-	uxa_check_poly_point(pDrawable, pGC, mode, npt, ppt);
-	return;
-    }
+	/* If we can't reuse the current GC as is, don't bother accelerating the
+	 * points.
+	 */
+	if (pGC->fillStyle != FillSolid) {
+		uxa_check_poly_point(pDrawable, pGC, mode, npt, ppt);
+		return;
+	}
 
-    prect = xalloc(sizeof(xRectangle) * npt);
-    if (!prect)
-	return;
-    for (i = 0; i < npt; i++) {
-	prect[i].x = ppt[i].x;
-	prect[i].y = ppt[i].y;
-	if (i > 0 && mode == CoordModePrevious) {
-	    prect[i].x += prect[i - 1].x;
-	    prect[i].y += prect[i - 1].y;
-	}
-	prect[i].width = 1;
-	prect[i].height = 1;
-    }
-    pGC->ops->PolyFillRect(pDrawable, pGC, npt, prect);
-    xfree(prect);
+	prect = malloc(sizeof(xRectangle) * npt);
+	if (!prect)
+		return;
+	for (i = 0; i < npt; i++) {
+		prect[i].x = ppt[i].x;
+		prect[i].y = ppt[i].y;
+		if (i > 0 && mode == CoordModePrevious) {
+			prect[i].x += prect[i - 1].x;
+			prect[i].y += prect[i - 1].y;
+		}
+		prect[i].width = 1;
+		prect[i].height = 1;
+	}
+	pGC->ops->PolyFillRect(pDrawable, pGC, npt, prect);
+	free(prect);
 }
 
 /**
@@ -539,58 +706,58 @@ static void
 uxa_poly_lines(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
 	       DDXPointPtr ppt)
 {
-    xRectangle *prect;
-    int x1, x2, y1, y2;
-    int i;
-
-    /* Don't try to do wide lines or non-solid fill style. */
-    if (pGC->lineWidth != 0 || pGC->lineStyle != LineSolid ||
-	pGC->fillStyle != FillSolid) {
-	uxa_check_poly_lines(pDrawable, pGC, mode, npt, ppt);
-	return;
-    }
-
-    prect = xalloc(sizeof(xRectangle) * (npt - 1));
-    if (!prect)
-	return;
-    x1 = ppt[0].x;
-    y1 = ppt[0].y;
-    /* If we have any non-horizontal/vertical, fall back. */
-    for (i = 0; i < npt - 1; i++) {
-	if (mode == CoordModePrevious) {
-	    x2 = x1 + ppt[i + 1].x;
-	    y2 = y1 + ppt[i + 1].y;
-	} else {
-	    x2 = ppt[i + 1].x;
-	    y2 = ppt[i + 1].y;
+	xRectangle *prect;
+	int x1, x2, y1, y2;
+	int i;
+
+	/* Don't try to do wide lines or non-solid fill style. */
+	if (pGC->lineWidth != 0 || pGC->lineStyle != LineSolid ||
+	    pGC->fillStyle != FillSolid) {
+		uxa_check_poly_lines(pDrawable, pGC, mode, npt, ppt);
+		return;
 	}
 
-	if (x1 != x2 && y1 != y2) {
-	    xfree(prect);
-	    uxa_check_poly_lines(pDrawable, pGC, mode, npt, ppt);
-	    return;
-	}
+	prect = malloc(sizeof(xRectangle) * (npt - 1));
+	if (!prect)
+		return;
+	x1 = ppt[0].x;
+	y1 = ppt[0].y;
+	/* If we have any non-horizontal/vertical, fall back. */
+	for (i = 0; i < npt - 1; i++) {
+		if (mode == CoordModePrevious) {
+			x2 = x1 + ppt[i + 1].x;
+			y2 = y1 + ppt[i + 1].y;
+		} else {
+			x2 = ppt[i + 1].x;
+			y2 = ppt[i + 1].y;
+		}
 
-	if (x1 < x2) {
-	    prect[i].x = x1;
-	    prect[i].width = x2 - x1 + 1;
-	} else {
-	    prect[i].x = x2;
-	    prect[i].width = x1 - x2 + 1;
-	}
-	if (y1 < y2) {
-	    prect[i].y = y1;
-	    prect[i].height = y2 - y1 + 1;
-	} else {
-	    prect[i].y = y2;
-	    prect[i].height = y1 - y2 + 1;
-	}
+		if (x1 != x2 && y1 != y2) {
+			free(prect);
+			uxa_check_poly_lines(pDrawable, pGC, mode, npt, ppt);
+			return;
+		}
+
+		if (x1 < x2) {
+			prect[i].x = x1;
+			prect[i].width = x2 - x1 + 1;
+		} else {
+			prect[i].x = x2;
+			prect[i].width = x1 - x2 + 1;
+		}
+		if (y1 < y2) {
+			prect[i].y = y1;
+			prect[i].height = y2 - y1 + 1;
+		} else {
+			prect[i].y = y2;
+			prect[i].height = y1 - y2 + 1;
+		}
 
-	x1 = x2;
-	y1 = y2;
-    }
-    pGC->ops->PolyFillRect(pDrawable, pGC, npt - 1, prect);
-    xfree(prect);
+		x1 = x2;
+		y1 = y2;
+	}
+	pGC->ops->PolyFillRect(pDrawable, pGC, npt - 1, prect);
+	free(prect);
 }
 
 /**
@@ -599,446 +766,471 @@ uxa_poly_lines(DrawablePtr pDrawable, GC
  * acceleration if so.
  */
 static void
-uxa_poly_segment (DrawablePtr pDrawable, GCPtr pGC, int nseg,
-		xSegment *pSeg)
+uxa_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSeg)
 {
-    xRectangle *prect;
-    int i;
+	xRectangle *prect;
+	int i;
 
-    /* Don't try to do wide lines or non-solid fill style. */
-    if (pGC->lineWidth != 0 || pGC->lineStyle != LineSolid ||
-	pGC->fillStyle != FillSolid)
-    {
-	uxa_check_poly_segment(pDrawable, pGC, nseg, pSeg);
-	return;
-    }
-
-    /* If we have any non-horizontal/vertical, fall back. */
-    for (i = 0; i < nseg; i++) {
-	if (pSeg[i].x1 != pSeg[i].x2 && pSeg[i].y1 != pSeg[i].y2) {
-	    uxa_check_poly_segment(pDrawable, pGC, nseg, pSeg);
-	    return;
+	/* Don't try to do wide lines or non-solid fill style. */
+	if (pGC->lineWidth != 0 || pGC->lineStyle != LineSolid ||
+	    pGC->fillStyle != FillSolid) {
+		uxa_check_poly_segment(pDrawable, pGC, nseg, pSeg);
+		return;
 	}
-    }
 
-    prect = xalloc(sizeof(xRectangle) * nseg);
-    if (!prect)
-	return;
-    for (i = 0; i < nseg; i++) {
-	if (pSeg[i].x1 < pSeg[i].x2) {
-	    prect[i].x = pSeg[i].x1;
-	    prect[i].width = pSeg[i].x2 - pSeg[i].x1 + 1;
-	} else {
-	    prect[i].x = pSeg[i].x2;
-	    prect[i].width = pSeg[i].x1 - pSeg[i].x2 + 1;
-	}
-	if (pSeg[i].y1 < pSeg[i].y2) {
-	    prect[i].y = pSeg[i].y1;
-	    prect[i].height = pSeg[i].y2 - pSeg[i].y1 + 1;
-	} else {
-	    prect[i].y = pSeg[i].y2;
-	    prect[i].height = pSeg[i].y1 - pSeg[i].y2 + 1;
+	/* If we have any non-horizontal/vertical, fall back. */
+	for (i = 0; i < nseg; i++) {
+		if (pSeg[i].x1 != pSeg[i].x2 && pSeg[i].y1 != pSeg[i].y2) {
+			uxa_check_poly_segment(pDrawable, pGC, nseg, pSeg);
+			return;
+		}
 	}
 
-	/* don't paint last pixel */
-	if (pGC->capStyle == CapNotLast) {
-	    if (prect[i].width == 1)
-		prect[i].height--;
-	    else
-		prect[i].width--;
-	}
-    }
-    pGC->ops->PolyFillRect(pDrawable, pGC, nseg, prect);
-    xfree(prect);
+	prect = malloc(sizeof(xRectangle) * nseg);
+	if (!prect)
+		return;
+	for (i = 0; i < nseg; i++) {
+		if (pSeg[i].x1 < pSeg[i].x2) {
+			prect[i].x = pSeg[i].x1;
+			prect[i].width = pSeg[i].x2 - pSeg[i].x1 + 1;
+		} else {
+			prect[i].x = pSeg[i].x2;
+			prect[i].width = pSeg[i].x1 - pSeg[i].x2 + 1;
+		}
+		if (pSeg[i].y1 < pSeg[i].y2) {
+			prect[i].y = pSeg[i].y1;
+			prect[i].height = pSeg[i].y2 - pSeg[i].y1 + 1;
+		} else {
+			prect[i].y = pSeg[i].y2;
+			prect[i].height = pSeg[i].y1 - pSeg[i].y2 + 1;
+		}
+
+		/* don't paint last pixel */
+		if (pGC->capStyle == CapNotLast) {
+			if (prect[i].width == 1)
+				prect[i].height--;
+			else
+				prect[i].width--;
+		}
+	}
+	pGC->ops->PolyFillRect(pDrawable, pGC, nseg, prect);
+	free(prect);
 }
 
-static Bool uxa_fill_region_solid (DrawablePtr pDrawable, RegionPtr pRegion,
-				Pixel pixel, CARD32 planemask, CARD32 alu);
+static Bool uxa_fill_region_solid(DrawablePtr pDrawable, RegionPtr pRegion,
+				  Pixel pixel, CARD32 planemask, CARD32 alu);
 
 static void
 uxa_poly_fill_rect(DrawablePtr pDrawable,
-		GCPtr	    pGC,
-		int	    nrect,
-		xRectangle  *prect)
+		   GCPtr pGC, int nrect, xRectangle * prect)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDrawable->pScreen);
-    RegionPtr	    pClip = fbGetCompositeClip(pGC);
-    PixmapPtr	    pPixmap = uxa_get_drawable_pixmap(pDrawable);
-    register BoxPtr pbox;
-    BoxPtr	    pextent;
-    int		    extentX1, extentX2, extentY1, extentY2;
-    int		    fullX1, fullX2, fullY1, fullY2;
-    int		    partX1, partX2, partY1, partY2;
-    int		    xoff, yoff;
-    int		    xorg, yorg;
-    int		    n;
-    RegionPtr pReg = RECTS_TO_REGION(pScreen, nrect, prect, CT_UNSORTED);
-
-    /* Compute intersection of rects and clip region */
-    REGION_TRANSLATE(pScreen, pReg, pDrawable->x, pDrawable->y);
-    REGION_INTERSECT(pScreen, pReg, pClip, pReg);
-
-    if (!REGION_NUM_RECTS(pReg))
-	goto out;
-
-    uxa_get_drawable_deltas(pDrawable, pPixmap, &xoff, &yoff);
-
-    if (uxa_screen->swappedOut)
-	goto fallback;
-
-    /* For ROPs where overlaps don't matter, convert rectangles to region and
-     * call uxa_fill_region_{solid,tiled}.
-     */
-    if ((pGC->fillStyle == FillSolid || pGC->fillStyle == FillTiled) &&
-	(nrect == 1 || pGC->alu == GXcopy || pGC->alu == GXclear ||
-	 pGC->alu == GXnoop || pGC->alu == GXcopyInverted ||
-	 pGC->alu == GXset)) {
-	if (((pGC->fillStyle == FillSolid || pGC->tileIsPixel) &&
-	     uxa_fill_region_solid(pDrawable, pReg, pGC->fillStyle == FillSolid ?
-				pGC->fgPixel : pGC->tile.pixel,	pGC->planemask,
-				pGC->alu)) ||
-	    (pGC->fillStyle == FillTiled && !pGC->tileIsPixel &&
-	     uxa_fill_region_tiled(pDrawable, pReg, pGC->tile.pixmap, &pGC->patOrg,
-				pGC->planemask, pGC->alu))) {
-	    goto out;
-	}
-    }
-
-    if (pGC->fillStyle != FillSolid &&
-	!(pGC->tileIsPixel && pGC->fillStyle == FillTiled))
-    {
-	goto fallback;
-    }
-
-    if (!uxa_pixmap_is_offscreen (pPixmap) ||
-	!(*uxa_screen->info->prepare_solid) (pPixmap,
-					 pGC->alu,
-					 pGC->planemask,
-					 pGC->fgPixel))
-    {
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDrawable->pScreen);
+	RegionPtr pClip = fbGetCompositeClip(pGC);
+	PixmapPtr pPixmap;
+	register BoxPtr pbox;
+	BoxPtr pextent;
+	int extentX1, extentX2, extentY1, extentY2;
+	int fullX1, fullX2, fullY1, fullY2;
+	int partX1, partX2, partY1, partY2;
+	int xoff, yoff;
+	int xorg, yorg;
+	int n;
+	RegionPtr pReg = RECTS_TO_REGION(pScreen, nrect, prect, CT_UNSORTED);
+
+	/* Compute intersection of rects and clip region */
+	REGION_TRANSLATE(pScreen, pReg, pDrawable->x, pDrawable->y);
+	REGION_INTERSECT(pScreen, pReg, pClip, pReg);
+
+	if (!REGION_NUM_RECTS(pReg))
+		goto out;
+
+	if (uxa_screen->swappedOut)
+		goto fallback;
+
+	pPixmap = uxa_get_offscreen_pixmap (pDrawable, &xoff, &yoff);
+	if (!pPixmap)
+		goto fallback;
+
+	/* For ROPs where overlaps don't matter, convert rectangles to region
+	 * and call uxa_fill_region_{solid,tiled}.
+	 */
+	if ((pGC->fillStyle == FillSolid || pGC->fillStyle == FillTiled) &&
+	    (nrect == 1 || pGC->alu == GXcopy || pGC->alu == GXclear ||
+	     pGC->alu == GXnoop || pGC->alu == GXcopyInverted ||
+	     pGC->alu == GXset)) {
+		if (((pGC->fillStyle == FillSolid || pGC->tileIsPixel) &&
+		     uxa_fill_region_solid(pDrawable, pReg,
+					   pGC->fillStyle ==
+					   FillSolid ? pGC->fgPixel : pGC->tile.
+					   pixel, pGC->planemask, pGC->alu))
+		    || (pGC->fillStyle == FillTiled && !pGC->tileIsPixel
+			&& uxa_fill_region_tiled(pDrawable, pReg,
+						 pGC->tile.pixmap, &pGC->patOrg,
+						 pGC->planemask, pGC->alu))) {
+			goto out;
+		}
+	}
+
+	if (pGC->fillStyle != FillSolid &&
+	    !(pGC->tileIsPixel && pGC->fillStyle == FillTiled)) {
+		goto fallback;
+	}
+
+	if (uxa_screen->info->check_solid &&
+	    !uxa_screen->info->check_solid(pDrawable, pGC->alu, pGC->planemask)) {
+		goto fallback;
+	}
+
+	if (!(*uxa_screen->info->prepare_solid) (pPixmap,
+						 pGC->alu,
+						 pGC->planemask,
+						 pGC->fgPixel)) {
 fallback:
-	uxa_check_poly_fill_rect (pDrawable, pGC, nrect, prect);
-	goto out;
-    }
-
-    xorg = pDrawable->x;
-    yorg = pDrawable->y;
-
-    pextent = REGION_EXTENTS(pGC->pScreen, pClip);
-    extentX1 = pextent->x1;
-    extentY1 = pextent->y1;
-    extentX2 = pextent->x2;
-    extentY2 = pextent->y2;
-    while (nrect--)
-    {
-	fullX1 = prect->x + xorg;
-	fullY1 = prect->y + yorg;
-	fullX2 = fullX1 + (int) prect->width;
-	fullY2 = fullY1 + (int) prect->height;
-	prect++;
-
-	if (fullX1 < extentX1)
-	    fullX1 = extentX1;
-
-	if (fullY1 < extentY1)
-	    fullY1 = extentY1;
-
-	if (fullX2 > extentX2)
-	    fullX2 = extentX2;
-
-	if (fullY2 > extentY2)
-	    fullY2 = extentY2;
-
-	if ((fullX1 >= fullX2) || (fullY1 >= fullY2))
-	    continue;
-	n = REGION_NUM_RECTS (pClip);
-	if (n == 1)
-	{
-	    (*uxa_screen->info->solid) (pPixmap,
-				     fullX1 + xoff, fullY1 + yoff,
-				     fullX2 + xoff, fullY2 + yoff);
-	}
-	else
-	{
-	    pbox = REGION_RECTS(pClip);
-	    /*
-	     * clip the rectangle to each box in the clip region
-	     * this is logically equivalent to calling Intersect(),
-	     * but rectangles may overlap each other here.
-	     */
-	    while(n--)
-	    {
-		partX1 = pbox->x1;
-		if (partX1 < fullX1)
-		    partX1 = fullX1;
-		partY1 = pbox->y1;
-		if (partY1 < fullY1)
-		    partY1 = fullY1;
-		partX2 = pbox->x2;
-		if (partX2 > fullX2)
-		    partX2 = fullX2;
-		partY2 = pbox->y2;
-		if (partY2 > fullY2)
-		    partY2 = fullY2;
+		uxa_check_poly_fill_rect(pDrawable, pGC, nrect, prect);
+		goto out;
+	}
 
-		pbox++;
+	xorg = pDrawable->x;
+	yorg = pDrawable->y;
 
-		if (partX1 < partX2 && partY1 < partY2) {
-		    (*uxa_screen->info->solid) (pPixmap,
-					     partX1 + xoff, partY1 + yoff,
-					     partX2 + xoff, partY2 + yoff);
+	pextent = REGION_EXTENTS(pGC->pScreen, pClip);
+	extentX1 = pextent->x1;
+	extentY1 = pextent->y1;
+	extentX2 = pextent->x2;
+	extentY2 = pextent->y2;
+	while (nrect--) {
+		fullX1 = prect->x + xorg;
+		fullY1 = prect->y + yorg;
+		fullX2 = fullX1 + (int)prect->width;
+		fullY2 = fullY1 + (int)prect->height;
+		prect++;
+
+		if (fullX1 < extentX1)
+			fullX1 = extentX1;
+
+		if (fullY1 < extentY1)
+			fullY1 = extentY1;
+
+		if (fullX2 > extentX2)
+			fullX2 = extentX2;
+
+		if (fullY2 > extentY2)
+			fullY2 = extentY2;
+
+		if ((fullX1 >= fullX2) || (fullY1 >= fullY2))
+			continue;
+		n = REGION_NUM_RECTS(pClip);
+		if (n == 1) {
+			(*uxa_screen->info->solid) (pPixmap,
+						    fullX1 + xoff,
+						    fullY1 + yoff,
+						    fullX2 + xoff,
+						    fullY2 + yoff);
+		} else {
+			pbox = REGION_RECTS(pClip);
+			/*
+			 * clip the rectangle to each box in the clip region
+			 * this is logically equivalent to calling Intersect(),
+			 * but rectangles may overlap each other here.
+			 */
+			while (n--) {
+				partX1 = pbox->x1;
+				if (partX1 < fullX1)
+					partX1 = fullX1;
+				partY1 = pbox->y1;
+				if (partY1 < fullY1)
+					partY1 = fullY1;
+				partX2 = pbox->x2;
+				if (partX2 > fullX2)
+					partX2 = fullX2;
+				partY2 = pbox->y2;
+				if (partY2 > fullY2)
+					partY2 = fullY2;
+
+				pbox++;
+
+				if (partX1 < partX2 && partY1 < partY2) {
+					(*uxa_screen->info->solid) (pPixmap,
+								    partX1 +
+								    xoff,
+								    partY1 +
+								    yoff,
+								    partX2 +
+								    xoff,
+								    partY2 +
+								    yoff);
+				}
+			}
 		}
-	    }
 	}
-    }
-    (*uxa_screen->info->done_solid) (pPixmap);
+	(*uxa_screen->info->done_solid) (pPixmap);
 
 out:
-    REGION_UNINIT(pScreen, pReg);
-    REGION_DESTROY(pScreen, pReg);
+	REGION_UNINIT(pScreen, pReg);
+	REGION_DESTROY(pScreen, pReg);
 }
 
 const GCOps uxa_ops = {
-    uxa_fill_spans,
-    uxa_check_set_spans,
-    uxa_put_image,
-    uxa_copy_area,
-    uxa_check_copy_plane,
-    uxa_poly_point,
-    uxa_poly_lines,
-    uxa_poly_segment,
-    miPolyRectangle,
-    uxa_check_poly_arc,
-    miFillPolygon,
-    uxa_poly_fill_rect,
-    miPolyFillArc,
-    miPolyText8,
-    miPolyText16,
-    miImageText8,
-    miImageText16,
-    uxa_check_image_glyph_blt,
-    uxa_check_poly_glyph_blt,
-    uxa_check_push_pixels,
+	uxa_fill_spans,
+	uxa_check_set_spans,
+	uxa_put_image,
+	uxa_copy_area,
+	uxa_check_copy_plane,
+	uxa_poly_point,
+	uxa_poly_lines,
+	uxa_poly_segment,
+	miPolyRectangle,
+	uxa_check_poly_arc,
+	miFillPolygon,
+	uxa_poly_fill_rect,
+	miPolyFillArc,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	uxa_check_image_glyph_blt,
+	uxa_check_poly_glyph_blt,
+	uxa_check_push_pixels,
 };
 
-void
-uxa_copy_window(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+void uxa_copy_window(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
-    RegionRec	rgnDst;
-    int		dx, dy;
-    PixmapPtr	pPixmap = (*pWin->drawable.pScreen->GetWindowPixmap) (pWin);
-
-    dx = ptOldOrg.x - pWin->drawable.x;
-    dy = ptOldOrg.y - pWin->drawable.y;
-    REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
+	RegionRec rgnDst;
+	int dx, dy;
+	PixmapPtr pPixmap = (*pWin->drawable.pScreen->GetWindowPixmap) (pWin);
+
+	dx = ptOldOrg.x - pWin->drawable.x;
+	dy = ptOldOrg.y - pWin->drawable.y;
+	REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
 
-    REGION_INIT (pWin->drawable.pScreen, &rgnDst, NullBox, 0);
+	REGION_INIT(pWin->drawable.pScreen, &rgnDst, NullBox, 0);
 
-    REGION_INTERSECT(pWin->drawable.pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
+	REGION_INTERSECT(pWin->drawable.pScreen, &rgnDst, &pWin->borderClip,
+			 prgnSrc);
 #ifdef COMPOSITE
-    if (pPixmap->screen_x || pPixmap->screen_y)
-	REGION_TRANSLATE (pWin->drawable.pScreen, &rgnDst,
-			  -pPixmap->screen_x, -pPixmap->screen_y);
+	if (pPixmap->screen_x || pPixmap->screen_y)
+		REGION_TRANSLATE(pWin->drawable.pScreen, &rgnDst,
+				 -pPixmap->screen_x, -pPixmap->screen_y);
 #endif
 
-    miCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
-		  NULL,
-		  &rgnDst, dx, dy, uxa_copy_n_to_n, 0, NULL);
+	miCopyRegion(&pPixmap->drawable, &pPixmap->drawable,
+		     NULL, &rgnDst, dx, dy, uxa_copy_n_to_n, 0, NULL);
 
-    REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
+	REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
 }
 
 static Bool
-uxa_fill_region_solid (DrawablePtr	pDrawable,
-		    RegionPtr	pRegion,
-		    Pixel	pixel,
-		    CARD32	planemask,
-		    CARD32	alu)
+uxa_fill_region_solid(DrawablePtr pDrawable,
+		      RegionPtr pRegion,
+		      Pixel pixel, CARD32 planemask, CARD32 alu)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDrawable->pScreen);
-    PixmapPtr	    pPixmap = uxa_get_drawable_pixmap (pDrawable);
-    int		    xoff, yoff;
-    Bool	    ret = FALSE;
-
-    uxa_get_drawable_deltas(pDrawable, pPixmap, &xoff, &yoff);
-    REGION_TRANSLATE(pScreen, pRegion, xoff, yoff);
-
-    if (uxa_pixmap_is_offscreen (pPixmap) &&
-	(*uxa_screen->info->prepare_solid) (pPixmap, alu, planemask, pixel))
-    {
+	ScreenPtr screen = pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PixmapPtr pixmap;
+	int xoff, yoff;
 	int nbox;
-	BoxPtr pBox;
+	BoxPtr pBox, extents;
+	Bool ret = FALSE;
 
-	nbox = REGION_NUM_RECTS (pRegion);
-	pBox = REGION_RECTS (pRegion);
+	pixmap = uxa_get_offscreen_pixmap(pDrawable, &xoff, &yoff);
+	if (!pixmap)
+		return FALSE;
+
+	REGION_TRANSLATE(screen, pRegion, xoff, yoff);
+
+	nbox = REGION_NUM_RECTS(pRegion);
+	pBox = REGION_RECTS(pRegion);
+	extents = REGION_EXTENTS(screen, pRegion);
+
+	/* Using GEM, the relocation costs outweigh the advantages of the blitter */
+	if (nbox == 1 || (alu != GXcopy && alu != GXclear) || planemask != FB_ALLONES) {
+try_solid:
+		if (uxa_screen->info->check_solid &&
+		    !uxa_screen->info->check_solid(&pixmap->drawable, alu, planemask))
+			goto err;
+
+		if (!uxa_screen->info->prepare_solid(pixmap, alu, planemask, pixel))
+			goto err;
+
+		while (nbox--) {
+			uxa_screen->info->solid(pixmap,
+						pBox->x1, pBox->y1,
+						pBox->x2, pBox->y2);
+			pBox++;
+		}
 
-	while (nbox--)
-	{
-	    (*uxa_screen->info->solid) (pPixmap, pBox->x1, pBox->y1, pBox->x2,
-				     pBox->y2);
-	    pBox++;
-	}
-	(*uxa_screen->info->done_solid) (pPixmap);
+		uxa_screen->info->done_solid(pixmap);
+	} else {
+		PicturePtr dst, src;
+		PixmapPtr src_pixmap = NULL;
+		xRenderColor color;
+		int error;
+
+		dst = CreatePicture(0, &pixmap->drawable,
+				    PictureMatchFormat(screen,
+						       pixmap->drawable.depth,
+						       format_for_depth(pixmap->drawable.depth)),
+				    0, 0, serverClient, &error);
+		if (!dst)
+			goto err;
+
+		ValidatePicture(dst);
+
+		uxa_get_rgba_from_pixel(pixel,
+					&color.red,
+					&color.green,
+					&color.blue,
+					&color.alpha,
+					format_for_depth(pixmap->drawable.depth));
+		src = CreateSolidPicture(0, &color, &error);
+		if (!src) {
+			FreePicture(dst, 0);
+			goto err;
+		}
 
-	ret = TRUE;
-    }
+		if (!uxa_screen->info->check_composite(PictOpSrc, src, NULL, dst,
+						       extents->x2 - extents->x1,
+						       extents->y2 - extents->y1)) {
+			FreePicture(src, 0);
+			FreePicture(dst, 0);
+			goto try_solid;
+		}
 
-    REGION_TRANSLATE(pScreen, pRegion, -xoff, -yoff);
+		if (!uxa_screen->info->check_composite_texture ||
+		    !uxa_screen->info->check_composite_texture(screen, src)) {
+			PicturePtr solid;
+			int src_off_x, src_off_y;
+
+			solid = uxa_acquire_solid(screen, src->pSourcePict);
+			FreePicture(src, 0);
+
+			src = solid;
+			src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
+							      &src_off_x, &src_off_y);
+			if (!src_pixmap) {
+				FreePicture(src, 0);
+				FreePicture(dst, 0);
+				goto err;
+			}
+		}
 
-    return ret;
-}
+		if (!uxa_screen->info->prepare_composite(PictOpSrc, src, NULL, dst, src_pixmap, NULL, pixmap)) {
+			FreePicture(src, 0);
+			FreePicture(dst, 0);
+			goto err;
+		}
 
-/* Try to do an accelerated tile of the pTile into pRegion of pDrawable.
- * Based on fbFillRegionTiled(), fbTile().
- */
-Bool
-uxa_fill_region_tiled (DrawablePtr	pDrawable,
-		       RegionPtr	pRegion,
-		       PixmapPtr	pTile,
-		       DDXPointPtr	pPatOrg,
-		       CARD32		planemask,
-		       CARD32		alu)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDrawable->pScreen);
-    PixmapPtr	    pPixmap;
-    int		    xoff, yoff;
-    int		    tileWidth, tileHeight;
-    int		    nbox = REGION_NUM_RECTS (pRegion);
-    BoxPtr	    pBox = REGION_RECTS (pRegion);
-    Bool	    ret = FALSE;
-
-    tileWidth = pTile->drawable.width;
-    tileHeight = pTile->drawable.height;
-
-    /* If we're filling with a solid color, grab it out and go to
-     * FillRegionsolid, saving numerous copies.
-     */
-    if (tileWidth == 1 && tileHeight == 1)
-	return uxa_fill_region_solid(pDrawable, pRegion,
-				     uxa_get_pixmap_first_pixel (pTile), planemask,
-				     alu);
-
-    pPixmap = uxa_get_drawable_pixmap (pDrawable);
-    uxa_get_drawable_deltas(pDrawable, pPixmap, &xoff, &yoff);
-    REGION_TRANSLATE(pScreen, pRegion, xoff, yoff);
-
-    pPixmap = uxa_get_offscreen_pixmap (pDrawable, &xoff, &yoff);
-
-    if (!pPixmap || !uxa_pixmap_is_offscreen(pTile))
-	goto out;
-
-    if ((*uxa_screen->info->prepare_copy) (pTile, pPixmap, 1, 1, alu, planemask))
-    {
-	while (nbox--)
-	{
-	    int height = pBox->y2 - pBox->y1;
-	    int dstY = pBox->y1;
-	    int tileY;
-
-	    modulus(dstY - yoff - pDrawable->y - pPatOrg->y, tileHeight, tileY);
-
-	    while (height > 0) {
-		int width = pBox->x2 - pBox->x1;
-		int dstX = pBox->x1;
-		int tileX;
-		int h = tileHeight - tileY;
-
-		if (h > height)
-		    h = height;
-		height -= h;
-
-		modulus(dstX - xoff - pDrawable->x - pPatOrg->x, tileWidth,
-			tileX);
-
-		while (width > 0) {
-		    int w = tileWidth - tileX;
-		    if (w > width)
-			w = width;
-		    width -= w;
-
-		    (*uxa_screen->info->copy) (pPixmap, tileX, tileY, dstX, dstY,
-					    w, h);
-		    dstX += w;
-		    tileX = 0;
+		while (nbox--) {
+			uxa_screen->info->composite(pixmap,
+						    0, 0, 0, 0,
+						    pBox->x1,
+						    pBox->y1,
+						    pBox->x2 - pBox->x1,
+						    pBox->y2 - pBox->y1);
+			pBox++;
 		}
-		dstY += h;
-		tileY = 0;
-	    }
-	    pBox++;
+
+		uxa_screen->info->done_composite(pixmap);
+		FreePicture(src, 0);
+		FreePicture(dst, 0);
 	}
-	(*uxa_screen->info->done_copy) (pPixmap);
 
 	ret = TRUE;
-    }
 
-out:
-    REGION_TRANSLATE(pScreen, pRegion, -xoff, -yoff);
-
-    return ret;
+err:
+	REGION_TRANSLATE(screen, pRegion, -xoff, -yoff);
+	return ret;
 }
 
-#ifndef SERVER_1_5
-void
-uxa_paint_window(WindowPtr pWin, RegionPtr pRegion, int what)
+/* Try to do an accelerated tile of the pTile into pRegion of pDrawable.
+ * Based on fbFillRegionTiled(), fbTile().
+ */
+Bool
+uxa_fill_region_tiled(DrawablePtr pDrawable,
+		      RegionPtr pRegion,
+		      PixmapPtr pTile,
+		      DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu)
 {
-    ScreenPtr       screen = pWin->drawable.pScreen;
-    uxa_screen_t    *uxa_screen = uxa_get_screen(screen);
-    DDXPointRec     zeros = { 0, 0 };
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDrawable->pScreen);
+	PixmapPtr pPixmap;
+	int xoff, yoff;
+	int tileWidth, tileHeight;
+	int nbox = REGION_NUM_RECTS(pRegion);
+	BoxPtr pBox = REGION_RECTS(pRegion);
+	Bool ret = FALSE;
 
-    if (REGION_NIL(pRegion))
-	return;
+	tileWidth = pTile->drawable.width;
+	tileHeight = pTile->drawable.height;
 
-    if (uxa_screen->swappedOut) {
-	uxa_check_paint_window(pWin, pRegion, what);
-	return;
-    }
+	/* If we're filling with a solid color, grab it out and go to
+	 * FillRegionsolid, saving numerous copies.
+	 */
+	if (tileWidth == 1 && tileHeight == 1)
+		return uxa_fill_region_solid(pDrawable, pRegion,
+					     uxa_get_pixmap_first_pixel(pTile),
+					     planemask, alu);
+
+	pPixmap = uxa_get_offscreen_pixmap(pDrawable, &xoff, &yoff);
+	if (!pPixmap || !uxa_pixmap_is_offscreen(pTile))
+		goto out;
+
+	if (uxa_screen->info->check_copy &&
+	    !uxa_screen->info->check_copy(pTile, pPixmap, alu, planemask))
+		return FALSE;
+
+	REGION_TRANSLATE(pScreen, pRegion, xoff, yoff);
+
+	if ((*uxa_screen->info->prepare_copy) (pTile, pPixmap, 1, 1, alu,
+					       planemask)) {
+		while (nbox--) {
+			int height = pBox->y2 - pBox->y1;
+			int dstY = pBox->y1;
+			int tileY;
+
+			modulus(dstY - yoff - pDrawable->y - pPatOrg->y,
+				tileHeight, tileY);
+
+			while (height > 0) {
+				int width = pBox->x2 - pBox->x1;
+				int dstX = pBox->x1;
+				int tileX;
+				int h = tileHeight - tileY;
+
+				if (h > height)
+					h = height;
+				height -= h;
+
+				modulus(dstX - xoff - pDrawable->x - pPatOrg->x,
+					tileWidth, tileX);
+
+				while (width > 0) {
+					int w = tileWidth - tileX;
+					if (w > width)
+						w = width;
+					width -= w;
+
+					(*uxa_screen->info->copy) (pPixmap,
+								   tileX, tileY,
+								   dstX, dstY,
+								   w, h);
+					dstX += w;
+					tileX = 0;
+				}
+				dstY += h;
+				tileY = 0;
+			}
+			pBox++;
+		}
+		(*uxa_screen->info->done_copy) (pPixmap);
 
-    switch (what) {
-    case PW_BACKGROUND:
-	switch (pWin->backgroundState) {
-	case None:
-	    return;
-	case ParentRelative:
-	    do {
-		pWin = pWin->parent;
-	    } while (pWin->backgroundState == ParentRelative);
-	    (*pWin->drawable.pScreen->PaintWindowBackground)(pWin, pRegion,
-							     what);
-	    return;
-	case BackgroundPixel:
-	    if (uxa_fill_region_solid(&pWin->drawable, pRegion,
-				      pWin->background.pixel,
-				      FB_ALLONES, GXcopy))
-		return;
-	    break;
-	case BackgroundPixmap:
-	    if (uxa_fill_region_tiled(&pWin->drawable, pRegion,
-				      pWin->background.pixmap,
-				      &zeros, FB_ALLONES, GXcopy))
-		return;
-	    break;
-	}
-	break;
-    case PW_BORDER:
-	if (pWin->borderIsPixel) {
-	    if (uxa_fill_region_solid(&pWin->drawable, pRegion,
-				      pWin->border.pixel,
-				      FB_ALLONES, GXcopy))
-		return;
-	    break;
-	} else {
-	    if (uxa_fill_region_tiled(&pWin->drawable, pRegion,
-				      pWin->border.pixmap,
-				      &zeros, FB_ALLONES, GXcopy))
-		return;
-	    break;
+		ret = TRUE;
 	}
-	break;
-    }
 
-    uxa_check_paint_window(pWin, pRegion, what);
+out:
+	REGION_TRANSLATE(pScreen, pRegion, -xoff, -yoff);
+
+	return ret;
 }
-#endif /* !SERVER_1_5 */
 
 /**
  * Accelerates GetImage for solid ZPixmap downloads from framebuffer memory.
@@ -1048,55 +1240,55 @@ uxa_paint_window(WindowPtr pWin, RegionP
  * the pixmap out of framebuffer.
  */
 void
-uxa_get_image (DrawablePtr pDrawable, int x, int y, int w, int h,
-	       unsigned int format, unsigned long planeMask, char *d)
+uxa_get_image(DrawablePtr pDrawable, int x, int y, int w, int h,
+	      unsigned int format, unsigned long planeMask, char *d)
 {
-    ScreenPtr       screen = pDrawable->pScreen;
-    uxa_screen_t    *uxa_screen = uxa_get_screen(screen);
-    BoxRec	    Box;
-    PixmapPtr	    pPix = uxa_get_drawable_pixmap (pDrawable);
-    int		    xoff, yoff;
-    Bool	    ok;
-
-    uxa_get_drawable_deltas (pDrawable, pPix, &xoff, &yoff);
-
-    Box.x1 = pDrawable->y + x + xoff;
-    Box.y1 = pDrawable->y + y + yoff;
-    Box.x2 = Box.x1 + w;
-    Box.y2 = Box.y1 + h;
-
-    if (uxa_screen->swappedOut)
-	goto fallback;
-
-    pPix = uxa_get_offscreen_pixmap (pDrawable, &xoff, &yoff);
-
-    if (pPix == NULL || uxa_screen->info->get_image == NULL)
-	goto fallback;
-
-    /* Only cover the ZPixmap, solid copy case. */
-    if (format != ZPixmap || !UXA_PM_IS_SOLID(pDrawable, planeMask))
-	goto fallback;
-
-    /* Only try to handle the 8bpp and up cases, since we don't want to think
-     * about <8bpp.
-     */
-    if (pDrawable->bitsPerPixel < 8)
-	goto fallback;
-
-    ok = uxa_screen->info->get_image(pPix, pDrawable->x + x + xoff,
-					   pDrawable->y + y + yoff, w, h, d,
-					   PixmapBytePad(w, pDrawable->depth));
-    if (ok)
-	return;
+	ScreenPtr screen = pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	BoxRec Box;
+	PixmapPtr pPix = uxa_get_drawable_pixmap(pDrawable);
+	int xoff, yoff;
+	Bool ok;
+
+	uxa_get_drawable_deltas(pDrawable, pPix, &xoff, &yoff);
+
+	Box.x1 = pDrawable->y + x + xoff;
+	Box.y1 = pDrawable->y + y + yoff;
+	Box.x2 = Box.x1 + w;
+	Box.y2 = Box.y1 + h;
+
+	if (uxa_screen->swappedOut)
+		goto fallback;
+
+	pPix = uxa_get_offscreen_pixmap(pDrawable, &xoff, &yoff);
+
+	if (pPix == NULL || uxa_screen->info->get_image == NULL)
+		goto fallback;
+
+	/* Only cover the ZPixmap, solid copy case. */
+	if (format != ZPixmap || !UXA_PM_IS_SOLID(pDrawable, planeMask))
+		goto fallback;
+
+	/* Only try to handle the 8bpp and up cases, since we don't want to
+	 * think about <8bpp.
+	 */
+	if (pDrawable->bitsPerPixel < 8)
+		goto fallback;
+
+	ok = uxa_screen->info->get_image(pPix, pDrawable->x + x + xoff,
+					 pDrawable->y + y + yoff, w, h, d,
+					 PixmapBytePad(w, pDrawable->depth));
+	if (ok)
+		return;
 
 fallback:
-    UXA_FALLBACK(("from %p (%c)\n", pDrawable,
-		  uxa_drawable_location(pDrawable)));
+	UXA_FALLBACK(("from %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
 
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RO)) {
-	fbGetImage (pDrawable, x, y, w, h, format, planeMask, d);
-	uxa_finish_access (pDrawable);
-    }
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RO)) {
+		fbGetImage(pDrawable, x, y, w, h, format, planeMask, d);
+		uxa_finish_access(pDrawable);
+	}
 
-   return;
+	return;
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c	2011-02-08 11:14:00.000000000 +0100
@@ -39,9 +39,10 @@
 #include "dixfontstr.h"
 #include "uxa.h"
 
+#if HAS_DEVPRIVATEKEYREC
+DevPrivateKeyRec uxa_screen_index;
+#else
 int uxa_screen_index;
-#ifndef SERVER_1_5
-static int uxa_generation;
 #endif
 
 /**
@@ -55,14 +56,14 @@ static int uxa_generation;
  * redirected window, and the translation coordinates are provided by calling
  * uxa_get_drawable_pixmap() on the drawable.
  */
-PixmapPtr
-uxa_get_drawable_pixmap(DrawablePtr pDrawable)
+PixmapPtr uxa_get_drawable_pixmap(DrawablePtr pDrawable)
 {
-     if (pDrawable->type == DRAWABLE_WINDOW)
-	return pDrawable->pScreen->GetWindowPixmap ((WindowPtr) pDrawable);
-     else
-	return (PixmapPtr) pDrawable;
-}	
+	if (pDrawable->type == DRAWABLE_WINDOW)
+		return pDrawable->pScreen->
+		    GetWindowPixmap((WindowPtr) pDrawable);
+	else
+		return (PixmapPtr) pDrawable;
+}
 
 /**
  * Sets the offsets to add to coordinates to make them address the same bits in
@@ -70,19 +71,19 @@ uxa_get_drawable_pixmap(DrawablePtr pDra
  * windows.
  */
 void
-uxa_get_drawable_deltas (DrawablePtr pDrawable, PixmapPtr pPixmap,
-			 int *xp, int *yp)
+uxa_get_drawable_deltas(DrawablePtr pDrawable, PixmapPtr pPixmap,
+			int *xp, int *yp)
 {
 #ifdef COMPOSITE
-    if (pDrawable->type == DRAWABLE_WINDOW) {
-	*xp = -pPixmap->screen_x;
-	*yp = -pPixmap->screen_y;
-	return;
-    }
+	if (pDrawable->type == DRAWABLE_WINDOW) {
+		*xp = -pPixmap->screen_x;
+		*yp = -pPixmap->screen_y;
+		return;
+	}
 #endif
 
-    *xp = 0;
-    *yp = 0;
+	*xp = 0;
+	*yp = 0;
 }
 
 /**
@@ -97,66 +98,61 @@ uxa_get_drawable_deltas (DrawablePtr pDr
  *
  * @return TRUE if the given drawable is in framebuffer memory.
  */
-Bool
-uxa_pixmap_is_offscreen(PixmapPtr p)
+Bool uxa_pixmap_is_offscreen(PixmapPtr p)
 {
-    ScreenPtr	    pScreen = p->drawable.pScreen;
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
+	ScreenPtr pScreen = p->drawable.pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
 
-    if (uxa_screen->info->pixmap_is_offscreen)
-	return uxa_screen->info->pixmap_is_offscreen(p);
+	if (uxa_screen->info->pixmap_is_offscreen)
+		return uxa_screen->info->pixmap_is_offscreen(p);
 
-    return FALSE;
+	return FALSE;
 }
 
 /**
- * uxa_drawable_is_offscreen() is a convenience wrapper for uxa_pixmap_is_offscreen().
+ * uxa_drawable_is_offscreen() is a convenience wrapper for
+ * uxa_pixmap_is_offscreen().
  */
-Bool
-uxa_drawable_is_offscreen (DrawablePtr pDrawable)
+Bool uxa_drawable_is_offscreen(DrawablePtr pDrawable)
 {
-    return uxa_pixmap_is_offscreen (uxa_get_drawable_pixmap (pDrawable));
+	return uxa_pixmap_is_offscreen(uxa_get_drawable_pixmap(pDrawable));
 }
 
 /**
   * Returns the pixmap which backs a drawable, and the offsets to add to
   * coordinates to make them address the same bits in the backing drawable.
   */
-PixmapPtr
-uxa_get_offscreen_pixmap (DrawablePtr drawable, int *xp, int *yp)
+PixmapPtr uxa_get_offscreen_pixmap(DrawablePtr drawable, int *xp, int *yp)
 {
-    PixmapPtr   pixmap = uxa_get_drawable_pixmap (drawable);
+	PixmapPtr pixmap = uxa_get_drawable_pixmap(drawable);
 
-    uxa_get_drawable_deltas (drawable, pixmap, xp, yp);
+	uxa_get_drawable_deltas(drawable, pixmap, xp, yp);
 
-    if (uxa_pixmap_is_offscreen (pixmap))
-	return pixmap;
-    else
-	return NULL;
+	if (uxa_pixmap_is_offscreen(pixmap))
+		return pixmap;
+	else
+		return NULL;
 }
 
-
-
 /**
  * uxa_prepare_access() is UXA's wrapper for the driver's PrepareAccess() handler.
  *
  * It deals with waiting for synchronization with the card, determining if
  * PrepareAccess() is necessary, and working around PrepareAccess() failure.
  */
-Bool
-uxa_prepare_access(DrawablePtr pDrawable, uxa_access_t access)
+Bool uxa_prepare_access(DrawablePtr pDrawable, uxa_access_t access)
 {
-    ScreenPtr	    pScreen = pDrawable->pScreen;
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    PixmapPtr	    pPixmap = uxa_get_drawable_pixmap (pDrawable);
-    Bool	    offscreen = uxa_pixmap_is_offscreen(pPixmap);
+	ScreenPtr pScreen = pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+	PixmapPtr pPixmap = uxa_get_drawable_pixmap(pDrawable);
+	Bool offscreen = uxa_pixmap_is_offscreen(pPixmap);
 
-    if (!offscreen)
-	return TRUE;
+	if (!offscreen)
+		return TRUE;
 
-    if (uxa_screen->info->prepare_access)
-	return (*uxa_screen->info->prepare_access) (pPixmap, access);
-    return TRUE;
+	if (uxa_screen->info->prepare_access)
+		return (*uxa_screen->info->prepare_access) (pPixmap, access);
+	return TRUE;
 }
 
 /**
@@ -164,20 +160,19 @@ uxa_prepare_access(DrawablePtr pDrawable
  *
  * It deals with calling the driver's finish_access() only if necessary.
  */
-void
-uxa_finish_access(DrawablePtr pDrawable)
+void uxa_finish_access(DrawablePtr pDrawable)
 {
-    ScreenPtr	    pScreen = pDrawable->pScreen;
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    PixmapPtr	    pPixmap = uxa_get_drawable_pixmap (pDrawable);
+	ScreenPtr pScreen = pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+	PixmapPtr pPixmap = uxa_get_drawable_pixmap(pDrawable);
 
-    if (uxa_screen->info->finish_access == NULL)
-	return;
+	if (uxa_screen->info->finish_access == NULL)
+		return;
 
-    if (!uxa_pixmap_is_offscreen (pPixmap))
-	return;
+	if (!uxa_pixmap_is_offscreen(pPixmap))
+		return;
 
-    (*uxa_screen->info->finish_access) (pPixmap);
+	(*uxa_screen->info->finish_access) (pPixmap);
 }
 
 /**
@@ -185,222 +180,231 @@ uxa_finish_access(DrawablePtr pDrawable)
  * accelerated or may sync the card and fall back to fb.
  */
 static void
-uxa_validate_gc (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
+uxa_validate_gc(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 {
-    /* fbValidateGC will do direct access to pixmaps if the tiling has changed.
-     * Preempt fbValidateGC by doing its work and masking the change out, so
-     * that we can do the Prepare/finish_access.
-     */
+	/* fbValidateGC will do direct access to pixmaps if the tiling has
+	 * changed.
+	 * Preempt fbValidateGC by doing its work and masking the change out, so
+	 * that we can do the Prepare/finish_access.
+	 */
 #ifdef FB_24_32BIT
-    if ((changes & GCTile) && fbGetRotatedPixmap(pGC)) {
-	(*pGC->pScreen->DestroyPixmap) (fbGetRotatedPixmap(pGC));
-	fbGetRotatedPixmap(pGC) = 0;
-    }
-	
-    if (pGC->fillStyle == FillTiled) {
-	PixmapPtr	pOldTile, pNewTile;
+	if ((changes & GCTile) && fbGetRotatedPixmap(pGC)) {
+		(*pGC->pScreen->DestroyPixmap) (fbGetRotatedPixmap(pGC));
+		fbGetRotatedPixmap(pGC) = 0;
+	}
 
-	pOldTile = pGC->tile.pixmap;
-	if (pOldTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel)
-	{
-	    pNewTile = fbGetRotatedPixmap(pGC);
-	    if (!pNewTile ||
-		pNewTile ->drawable.bitsPerPixel != pDrawable->bitsPerPixel)
-	    {
-		if (pNewTile)
-		    (*pGC->pScreen->DestroyPixmap) (pNewTile);
-		/* fb24_32ReformatTile will do direct access of a newly-
-		 * allocated pixmap.  This isn't a problem yet, since we don't
-		 * put pixmaps in FB until at least one accelerated UXA op.
-		 */
-		if (uxa_prepare_access(&pOldTile->drawable, UXA_ACCESS_RO)) {
-		    pNewTile = fb24_32ReformatTile (pOldTile,
-						    pDrawable->bitsPerPixel);
-		    uxa_finish_access(&pOldTile->drawable);
+	if (pGC->fillStyle == FillTiled) {
+		PixmapPtr pOldTile, pNewTile;
+
+		pOldTile = pGC->tile.pixmap;
+		if (pOldTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel) {
+			pNewTile = fbGetRotatedPixmap(pGC);
+			if (!pNewTile ||
+			    pNewTile->drawable.bitsPerPixel !=
+			    pDrawable->bitsPerPixel) {
+				if (pNewTile)
+					(*pGC->pScreen->
+					 DestroyPixmap) (pNewTile);
+				/* fb24_32ReformatTile will do direct access
+				 * of a newly-allocated pixmap.  This isn't a
+				 * problem yet, since we don't put pixmaps in
+				 * FB until at least one accelerated UXA op.
+				 */
+				if (uxa_prepare_access
+				    (&pOldTile->drawable, UXA_ACCESS_RO)) {
+					pNewTile =
+					    fb24_32ReformatTile(pOldTile,
+								pDrawable->
+								bitsPerPixel);
+					uxa_finish_access(&pOldTile->drawable);
+				}
+			}
+			if (pNewTile) {
+				fbGetRotatedPixmap(pGC) = pOldTile;
+				pGC->tile.pixmap = pNewTile;
+				changes |= GCTile;
+			}
 		}
-	    }
-	    if (pNewTile)
-	    {
-		fbGetRotatedPixmap(pGC) = pOldTile;
-		pGC->tile.pixmap = pNewTile;
-		changes |= GCTile;
-	    }
 	}
-    }
 #endif
-    if (changes & GCTile) {
-	if (!pGC->tileIsPixel && FbEvenTile (pGC->tile.pixmap->drawable.width *
-					     pDrawable->bitsPerPixel))
-	{
-	    if (uxa_prepare_access(&pGC->tile.pixmap->drawable, UXA_ACCESS_RW)) {
-		fbPadPixmap (pGC->tile.pixmap);
-		uxa_finish_access(&pGC->tile.pixmap->drawable);
-	    }
+	if (changes & GCTile) {
+		if (!pGC->tileIsPixel
+		    && FbEvenTile(pGC->tile.pixmap->drawable.width *
+				  pDrawable->bitsPerPixel)) {
+			if (uxa_prepare_access
+			    (&pGC->tile.pixmap->drawable, UXA_ACCESS_RW)) {
+				fbPadPixmap(pGC->tile.pixmap);
+				uxa_finish_access(&pGC->tile.pixmap->drawable);
+			}
+		}
+		/* Mask out the GCTile change notification, now that we've
+		 * done FB's job for it.
+		 */
+		changes &= ~GCTile;
 	}
-	/* Mask out the GCTile change notification, now that we've done FB's
-	 * job for it.
-	 */
-	changes &= ~GCTile;
-    }
 
-    if (changes & GCStipple && pGC->stipple) {
-	/* We can't inline stipple handling like we do for GCTile because it sets
-	 * fbgc privates.
-	 */
-	uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW);
-	fbValidateGC (pGC, changes, pDrawable);
-	uxa_finish_access(&pGC->stipple->drawable);
-    } else {
-	fbValidateGC (pGC, changes, pDrawable);
-    }
-
-    pGC->ops = (GCOps *) &uxa_ops;
-}
-
-static GCFuncs	uxaGCFuncs = {
-    uxa_validate_gc,
-    miChangeGC,
-    miCopyGC,
-    miDestroyGC,
-    miChangeClip,
-    miDestroyClip,
-    miCopyClip
+	if (changes & GCStipple && pGC->stipple) {
+		/* We can't inline stipple handling like we do for GCTile
+		 * because it sets fbgc privates.
+		 */
+		if (uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW)) {
+			fbValidateGC(pGC, changes, pDrawable);
+			uxa_finish_access(&pGC->stipple->drawable);
+		}
+	} else {
+		fbValidateGC(pGC, changes, pDrawable);
+	}
+
+	pGC->ops = (GCOps *) & uxa_ops;
+}
+
+static GCFuncs uxaGCFuncs = {
+	uxa_validate_gc,
+	miChangeGC,
+	miCopyGC,
+	miDestroyGC,
+	miChangeClip,
+	miDestroyClip,
+	miCopyClip
 };
 
 /**
  * uxa_create_gc makes a new GC and hooks up its funcs handler, so that
  * uxa_validate_gc() will get called.
  */
-static int
-uxa_create_gc (GCPtr pGC)
+static int uxa_create_gc(GCPtr pGC)
 {
-    if (!fbCreateGC (pGC))
-	return FALSE;
+	if (!fbCreateGC(pGC))
+		return FALSE;
 
-    pGC->funcs = &uxaGCFuncs;
+	pGC->funcs = &uxaGCFuncs;
 
-    return TRUE;
+	return TRUE;
 }
 
-Bool
-uxa_prepare_access_window(WindowPtr pWin)
+Bool uxa_prepare_access_window(WindowPtr pWin)
 {
-    if (pWin->backgroundState == BackgroundPixmap) {
-        if (!uxa_prepare_access(&pWin->background.pixmap->drawable, UXA_ACCESS_RO))
-	    return FALSE;
-    }
+	if (pWin->backgroundState == BackgroundPixmap) {
+		if (!uxa_prepare_access
+		    (&pWin->background.pixmap->drawable, UXA_ACCESS_RO))
+			return FALSE;
+	}
 
-    if (pWin->borderIsPixel == FALSE) {
-        if (!uxa_prepare_access(&pWin->border.pixmap->drawable, UXA_ACCESS_RO)) {
-	    if (pWin->backgroundState == BackgroundPixmap)
-		uxa_finish_access(&pWin->background.pixmap->drawable);
-	    return FALSE;
+	if (pWin->borderIsPixel == FALSE) {
+		if (!uxa_prepare_access
+		    (&pWin->border.pixmap->drawable, UXA_ACCESS_RO)) {
+			if (pWin->backgroundState == BackgroundPixmap)
+				uxa_finish_access(&pWin->background.pixmap->
+						  drawable);
+			return FALSE;
+		}
 	}
-    }
-    return TRUE;
+	return TRUE;
 }
 
-void
-uxa_finish_access_window(WindowPtr pWin)
+void uxa_finish_access_window(WindowPtr pWin)
 {
-    if (pWin->backgroundState == BackgroundPixmap) 
-        uxa_finish_access(&pWin->background.pixmap->drawable);
+	if (pWin->backgroundState == BackgroundPixmap)
+		uxa_finish_access(&pWin->background.pixmap->drawable);
 
-    if (pWin->borderIsPixel == FALSE)
-        uxa_finish_access(&pWin->border.pixmap->drawable);
+	if (pWin->borderIsPixel == FALSE)
+		uxa_finish_access(&pWin->border.pixmap->drawable);
 }
 
-static Bool
-uxa_change_window_attributes(WindowPtr pWin, unsigned long mask)
+static Bool uxa_change_window_attributes(WindowPtr pWin, unsigned long mask)
 {
-    Bool ret;
+	Bool ret;
 
-    if (!uxa_prepare_access_window(pWin))
-	return FALSE;
-    ret = fbChangeWindowAttributes(pWin, mask);
-    uxa_finish_access_window(pWin);
-    return ret;
+	if (!uxa_prepare_access_window(pWin))
+		return FALSE;
+	ret = fbChangeWindowAttributes(pWin, mask);
+	uxa_finish_access_window(pWin);
+	return ret;
 }
 
-static RegionPtr
-uxa_bitmap_to_region(PixmapPtr pPix)
-{
-  RegionPtr ret;
-  if (!uxa_prepare_access(&pPix->drawable, UXA_ACCESS_RO))
-    return NULL;
-  ret = fbPixmapToRegion(pPix);
-  uxa_finish_access(&pPix->drawable);
-  return ret;
+static RegionPtr uxa_bitmap_to_region(PixmapPtr pPix)
+{
+	RegionPtr ret;
+	if (!uxa_prepare_access(&pPix->drawable, UXA_ACCESS_RO))
+		return NULL;
+	ret = fbPixmapToRegion(pPix);
+	uxa_finish_access(&pPix->drawable);
+	return ret;
 }
 
-static void
-uxa_xorg_enable_disable_fb_access (int index, Bool enable)
+static void uxa_xorg_enable_disable_fb_access(int index, Bool enable)
 {
-    ScreenPtr screen = screenInfo.screens[index];
-    uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	ScreenPtr screen = screenInfo.screens[index];
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
 
-    if (!enable && uxa_screen->disableFbCount++ == 0)
-	uxa_screen->swappedOut = TRUE;
+	if (!enable && uxa_screen->disableFbCount++ == 0)
+		uxa_screen->swappedOut = TRUE;
 
-    if (enable && --uxa_screen->disableFbCount == 0)
-	uxa_screen->swappedOut = FALSE;
+	if (enable && --uxa_screen->disableFbCount == 0)
+		uxa_screen->swappedOut = FALSE;
 
-    if (uxa_screen->SavedEnableDisableFBAccess)
-       uxa_screen->SavedEnableDisableFBAccess(index, enable);
+	if (uxa_screen->SavedEnableDisableFBAccess)
+		uxa_screen->SavedEnableDisableFBAccess(index, enable);
 }
 
-void
-uxa_set_fallback_debug (ScreenPtr screen, Bool enable)
+void uxa_set_fallback_debug(ScreenPtr screen, Bool enable)
 {
-    uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
 
-    uxa_screen->fallback_debug = enable;
+	uxa_screen->fallback_debug = enable;
 }
 
 /**
  * uxa_close_screen() unwraps its wrapped screen functions and tears down UXA's
  * screen private, before calling down to the next CloseSccreen.
  */
-static Bool
-uxa_close_screen(int i, ScreenPtr pScreen)
+static Bool uxa_close_screen(int i, ScreenPtr pScreen)
 {
-    uxa_screen_t	*uxa_screen = uxa_get_screen(pScreen);
-    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
 #ifdef RENDER
-    PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
+	PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
 #endif
+	int n;
 
-#ifdef SERVER_1_5
-    uxa_glyphs_fini(pScreen);
-#endif
-
-    pScreen->CreateGC = uxa_screen->SavedCreateGC;
-    pScreen->CloseScreen = uxa_screen->SavedCloseScreen;
-    pScreen->GetImage = uxa_screen->SavedGetImage;
-    pScreen->GetSpans = uxa_screen->SavedGetSpans;
-#ifndef SERVER_1_5
-    pScreen->PaintWindowBackground = uxa_screen->SavedPaintWindowBackground;
-    pScreen->PaintWindowBorder = uxa_screen->SavedPaintWindowBorder;
-#endif
-    pScreen->CreatePixmap = uxa_screen->SavedCreatePixmap;
-    pScreen->DestroyPixmap = uxa_screen->SavedDestroyPixmap;
-    pScreen->CopyWindow = uxa_screen->SavedCopyWindow;
-    pScreen->ChangeWindowAttributes = uxa_screen->SavedChangeWindowAttributes;
-    pScreen->BitmapToRegion = uxa_screen->SavedBitmapToRegion;
-    scrn->EnableDisableFBAccess = uxa_screen->SavedEnableDisableFBAccess;
+	if (uxa_screen->solid_clear)
+		FreePicture(uxa_screen->solid_clear, 0);
+	if (uxa_screen->solid_black)
+		FreePicture(uxa_screen->solid_black, 0);
+	if (uxa_screen->solid_white)
+		FreePicture(uxa_screen->solid_white, 0);
+	for (n = 0; n < uxa_screen->solid_cache_size; n++)
+		FreePicture(uxa_screen->solid_cache[n].picture, 0);
+
+	uxa_glyphs_fini(pScreen);
+
+	pScreen->CreateGC = uxa_screen->SavedCreateGC;
+	pScreen->CloseScreen = uxa_screen->SavedCloseScreen;
+	pScreen->GetImage = uxa_screen->SavedGetImage;
+	pScreen->GetSpans = uxa_screen->SavedGetSpans;
+	pScreen->CreatePixmap = uxa_screen->SavedCreatePixmap;
+	pScreen->DestroyPixmap = uxa_screen->SavedDestroyPixmap;
+	pScreen->CopyWindow = uxa_screen->SavedCopyWindow;
+	pScreen->ChangeWindowAttributes =
+	    uxa_screen->SavedChangeWindowAttributes;
+	pScreen->BitmapToRegion = uxa_screen->SavedBitmapToRegion;
+	scrn->EnableDisableFBAccess = uxa_screen->SavedEnableDisableFBAccess;
 #ifdef RENDER
-    if (ps) {
-	ps->Composite = uxa_screen->SavedComposite;
-	ps->Glyphs = uxa_screen->SavedGlyphs;
-	ps->Trapezoids = uxa_screen->SavedTrapezoids;
-	ps->AddTraps = uxa_screen->SavedAddTraps;
-	ps->Triangles = uxa_screen->SavedTriangles;
-    }
+	if (ps) {
+		ps->Composite = uxa_screen->SavedComposite;
+		ps->CompositeRects = uxa_screen->SavedCompositeRects;
+		ps->Glyphs = uxa_screen->SavedGlyphs;
+		ps->Trapezoids = uxa_screen->SavedTrapezoids;
+		ps->AddTraps = uxa_screen->SavedAddTraps;
+		ps->Triangles = uxa_screen->SavedTriangles;
+
+		ps->UnrealizeGlyph = uxa_screen->SavedUnrealizeGlyph;
+	}
 #endif
 
-    xfree (uxa_screen);
+	free(uxa_screen);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+	return (*pScreen->CloseScreen) (i, pScreen);
 }
 
 /**
@@ -409,14 +413,13 @@ uxa_close_screen(int i, ScreenPtr pScree
  * without breaking ABI between UXA and the drivers.  The driver's
  * responsibility is to check beforehand that the UXA module has a matching
  * major number and sufficient minor.  Drivers are responsible for freeing the
- * driver structure using xfree().
+ * driver structure using free().
  *
  * @return a newly allocated, zero-filled driver structure
  */
-uxa_driver_t *
-uxa_driver_alloc(void)
+uxa_driver_t *uxa_driver_alloc(void)
 {
-    return xcalloc(1, sizeof(uxa_driver_t));
+	return calloc(1, sizeof(uxa_driver_t));
 }
 
 /**
@@ -429,152 +432,144 @@ uxa_driver_alloc(void)
  *
  * @return TRUE if UXA was successfully initialized.
  */
-Bool
-uxa_driver_init(ScreenPtr screen, uxa_driver_t *uxa_driver)
+Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver)
 {
-    uxa_screen_t	*uxa_screen;
-    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-#ifdef RENDER
-    PictureScreenPtr	ps;
-#endif
+	uxa_screen_t *uxa_screen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 
-    if (!uxa_driver)
-	return FALSE;
-
-    if (uxa_driver->uxa_major != UXA_VERSION_MAJOR ||
-	uxa_driver->uxa_minor > UXA_VERSION_MINOR)
-    {
-	LogMessage(X_ERROR, "UXA(%d): driver's UXA version requirements "
-		   "(%d.%d) are incompatible with UXA version (%d.%d)\n",
-		   screen->myNum,
-		   uxa_driver->uxa_major, uxa_driver->uxa_minor,
-		   UXA_VERSION_MAJOR, UXA_VERSION_MINOR);
-	return FALSE;
-    }
+	if (!uxa_driver)
+		return FALSE;
 
-    if (!uxa_driver->prepare_solid) {
-	LogMessage(X_ERROR, "UXA(%d): uxa_driver_t::prepare_solid must be "
-		   "non-NULL\n", screen->myNum);
-	return FALSE;
-    }
+	if (uxa_driver->uxa_major != UXA_VERSION_MAJOR ||
+	    uxa_driver->uxa_minor > UXA_VERSION_MINOR) {
+		LogMessage(X_ERROR,
+			   "UXA(%d): driver's UXA version requirements "
+			   "(%d.%d) are incompatible with UXA version (%d.%d)\n",
+			   screen->myNum, uxa_driver->uxa_major,
+			   uxa_driver->uxa_minor, UXA_VERSION_MAJOR,
+			   UXA_VERSION_MINOR);
+		return FALSE;
+	}
 
-    if (!uxa_driver->prepare_copy) {
-	LogMessage(X_ERROR, "UXA(%d): uxa_driver_t::prepare_copy must be "
-		   "non-NULL\n", screen->myNum);
-	return FALSE;
-    }
+	if (!uxa_driver->prepare_solid) {
+		LogMessage(X_ERROR,
+			   "UXA(%d): uxa_driver_t::prepare_solid must be "
+			   "non-NULL\n", screen->myNum);
+		return FALSE;
+	}
 
-#ifdef RENDER
-    ps = GetPictureScreenIfSet(screen);
+	if (!uxa_driver->prepare_copy) {
+		LogMessage(X_ERROR,
+			   "UXA(%d): uxa_driver_t::prepare_copy must be "
+			   "non-NULL\n", screen->myNum);
+		return FALSE;
+	}
+#if HAS_DIXREGISTERPRIVATEKEY
+	if (!dixRegisterPrivateKey(&uxa_screen_index, PRIVATE_SCREEN, 0))
+	    return FALSE;
 #endif
+	uxa_screen = calloc(sizeof(uxa_screen_t), 1);
 
-    uxa_screen = xcalloc (sizeof (uxa_screen_t), 1);
+	if (!uxa_screen) {
+		LogMessage(X_WARNING,
+			   "UXA(%d): Failed to allocate screen private\n",
+			   screen->myNum);
+		return FALSE;
+	}
 
-    if (!uxa_screen) {
-        LogMessage(X_WARNING, "UXA(%d): Failed to allocate screen private\n",
-		   screen->myNum);
-	return FALSE;
-    }
+	uxa_screen->info = uxa_driver;
 
-    uxa_screen->info = uxa_driver;
+	dixSetPrivate(&screen->devPrivates, &uxa_screen_index, uxa_screen);
 
-#ifdef SERVER_1_5
-    dixSetPrivate(&screen->devPrivates, &uxa_screen_index, uxa_screen);
-#else
-    if (uxa_generation != serverGeneration) {
-	uxa_screen_index = AllocateScreenPrivateIndex();
-	uxa_generation = serverGeneration;
-    }
-    screen->devPrivates[uxa_screen_index].ptr = uxa_screen;
-#endif
+	uxa_screen->solid_cache_size = 0;
+	uxa_screen->solid_clear = 0;
+	uxa_screen->solid_black = 0;
+	uxa_screen->solid_white = 0;
 
 //    exaDDXDriverInit(screen);
 
-    /*
-     * Replace various fb screen functions
-     */
-    uxa_screen->SavedCloseScreen = screen->CloseScreen;
-    screen->CloseScreen = uxa_close_screen;
+	/*
+	 * Replace various fb screen functions
+	 */
+	uxa_screen->SavedCloseScreen = screen->CloseScreen;
+	screen->CloseScreen = uxa_close_screen;
 
-    uxa_screen->SavedCreateGC = screen->CreateGC;
-    screen->CreateGC = uxa_create_gc;
+	uxa_screen->SavedCreateGC = screen->CreateGC;
+	screen->CreateGC = uxa_create_gc;
 
-    uxa_screen->SavedGetImage = screen->GetImage;
-    screen->GetImage = uxa_get_image;
+	uxa_screen->SavedGetImage = screen->GetImage;
+	screen->GetImage = uxa_get_image;
 
-    uxa_screen->SavedGetSpans = screen->GetSpans;
-    screen->GetSpans = uxa_check_get_spans;
+	uxa_screen->SavedGetSpans = screen->GetSpans;
+	screen->GetSpans = uxa_check_get_spans;
 
-#ifndef SERVER_1_5
-    uxa_screen->SavedPaintWindowBackground = screen->PaintWindowBackground;
-    screen->PaintWindowBackground = uxa_paint_window;
+	uxa_screen->SavedCopyWindow = screen->CopyWindow;
+	screen->CopyWindow = uxa_copy_window;
 
-    uxa_screen->SavedPaintWindowBorder = screen->PaintWindowBorder;
-    screen->PaintWindowBorder = uxa_paint_window;
-#endif /* !SERVER_1_5 */
+	uxa_screen->SavedChangeWindowAttributes =
+	    screen->ChangeWindowAttributes;
+	screen->ChangeWindowAttributes = uxa_change_window_attributes;
 
-    uxa_screen->SavedCopyWindow = screen->CopyWindow;
-    screen->CopyWindow = uxa_copy_window;
+	uxa_screen->SavedBitmapToRegion = screen->BitmapToRegion;
+	screen->BitmapToRegion = uxa_bitmap_to_region;
 
-    uxa_screen->SavedChangeWindowAttributes = screen->ChangeWindowAttributes;
-    screen->ChangeWindowAttributes = uxa_change_window_attributes;
+	uxa_screen->SavedEnableDisableFBAccess = scrn->EnableDisableFBAccess;
+	scrn->EnableDisableFBAccess = uxa_xorg_enable_disable_fb_access;
 
-    uxa_screen->SavedBitmapToRegion = screen->BitmapToRegion;
-    screen->BitmapToRegion = uxa_bitmap_to_region;
+#ifdef RENDER
+	{
+		PictureScreenPtr ps = GetPictureScreenIfSet(screen);
+		if (ps) {
+			uxa_screen->SavedComposite = ps->Composite;
+			ps->Composite = uxa_composite;
 
-    uxa_screen->SavedEnableDisableFBAccess = scrn->EnableDisableFBAccess;
-    scrn->EnableDisableFBAccess = uxa_xorg_enable_disable_fb_access;
+			uxa_screen->SavedCompositeRects = ps->CompositeRects;
+			ps->CompositeRects = uxa_solid_rects;
 
-#ifdef RENDER
-    if (ps) {
-        uxa_screen->SavedComposite = ps->Composite;
-	ps->Composite = uxa_composite;
-
-#ifdef SERVER_1_5
-	uxa_screen->SavedGlyphs = ps->Glyphs;
-	ps->Glyphs = uxa_glyphs;
-#endif
+			uxa_screen->SavedGlyphs = ps->Glyphs;
+			ps->Glyphs = uxa_glyphs;
 
-	uxa_screen->SavedTriangles = ps->Triangles;
-	ps->Triangles = uxa_triangles;
+			uxa_screen->SavedUnrealizeGlyph = ps->UnrealizeGlyph;
+			ps->UnrealizeGlyph = uxa_glyph_unrealize;
 
-	uxa_screen->SavedTrapezoids = ps->Trapezoids;
-	ps->Trapezoids = uxa_trapezoids;
+			uxa_screen->SavedTriangles = ps->Triangles;
+			ps->Triangles = uxa_triangles;
 
-	uxa_screen->SavedAddTraps = ps->AddTraps;
-	ps->AddTraps = uxa_check_add_traps;
-    }
-#endif
+			uxa_screen->SavedTrapezoids = ps->Trapezoids;
+			ps->Trapezoids = uxa_trapezoids;
 
-#ifdef MITSHM
-    /* Re-register with the MI funcs, which don't allow shared pixmaps.
-     * Shared pixmaps are almost always a performance loss for us, but this
-     * still allows for SHM PutImage.
-     */
-    ShmRegisterFuncs(screen, &uxa_shm_funcs);
+			uxa_screen->SavedAddTraps = ps->AddTraps;
+			ps->AddTraps = uxa_check_add_traps;
+		}
+	}
 #endif
 
-#ifdef SERVER_1_5
-    uxa_glyphs_init(screen);
-#endif
+	LogMessage(X_INFO,
+		   "UXA(%d): Driver registered support for the following"
+		   " operations:\n", screen->myNum);
+	assert(uxa_driver->prepare_solid != NULL);
+	LogMessage(X_INFO, "        solid\n");
+	assert(uxa_driver->prepare_copy != NULL);
+	LogMessage(X_INFO, "        copy\n");
+	if (uxa_driver->prepare_composite != NULL) {
+		LogMessage(X_INFO, "        composite (RENDER acceleration)\n");
+	}
+	if (uxa_driver->put_image != NULL) {
+		LogMessage(X_INFO, "        put_image\n");
+	}
+	if (uxa_driver->get_image != NULL) {
+		LogMessage(X_INFO, "        get_image\n");
+	}
 
-    LogMessage(X_INFO, "UXA(%d): Driver registered support for the following"
-	       " operations:\n", screen->myNum);
-    assert(uxa_driver->prepare_solid != NULL);
-    LogMessage(X_INFO, "        solid\n");
-    assert(uxa_driver->prepare_copy != NULL);
-    LogMessage(X_INFO, "        copy\n");
-    if (uxa_driver->prepare_composite != NULL) {
-	LogMessage(X_INFO, "        composite (RENDER acceleration)\n");
-    }
-    if (uxa_driver->put_image != NULL) {
-	LogMessage(X_INFO, "        put_image\n");
-    }
-    if (uxa_driver->get_image != NULL) {
-	LogMessage(X_INFO, "        get_image\n");
-    }
+	return TRUE;
+}
 
-    return TRUE;
+Bool uxa_resources_init(ScreenPtr screen)
+{
+	if (!uxa_glyphs_init(screen))
+		return FALSE;
+
+	return TRUE;
 }
 
 /**
@@ -582,8 +577,7 @@ uxa_driver_init(ScreenPtr screen, uxa_dr
  *
  * @param pScreen screen being torn down.
  */
-void
-uxa_driver_fini (ScreenPtr pScreen)
+void uxa_driver_fini(ScreenPtr pScreen)
 {
-    /*right now does nothing*/
+	/*right now does nothing */
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-glyphs.c new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-glyphs.c
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-glyphs.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-glyphs.c	2011-02-08 11:14:00.000000000 +0100
@@ -1,11 +1,29 @@
 /*
- * Copyright © 2008 Red Hat, Inc.
+ * Copyright © 2010 Intel Corporation
+ * Partly based on code Copyright © 2008 Red Hat, Inc.
  * Partly based on code Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Intel not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Intel makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * INTEL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INTEL
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
  * documentation, and that the name of Red Hat not be used in advertising or
  * publicity pertaining to distribution of the software without specific,
  * written prior permission.  Red Hat makes no representations about the
@@ -16,7 +34,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL Red Hat
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -33,11 +51,11 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: Owen Taylor <otaylor@fishsoup.net>
- * Based on code by: Keith Packard
+ * Author: Chris Wilson <chris@chris-wilson.co.uk>
+ * Based on code by: Keith Packard <keithp@keithp.com> and Owen Taylor <otaylor@fishsoup.net>
  */
 
 #ifdef HAVE_DIX_CONFIG_H
@@ -47,102 +65,67 @@
 #include <stdlib.h>
 
 #include "uxa-priv.h"
+#include "../src/common.h"
 
 #include "mipict.h"
 
-#ifdef SERVER_1_5
-
-#if DEBUG_GLYPH_CACHE
-#define DBG_GLYPH_CACHE(a) ErrorF a
-#else
-#define DBG_GLYPH_CACHE(a)
-#endif
-
 /* Width of the pixmaps we use for the caches; this should be less than
  * max texture size of the driver; this may need to actually come from
  * the driver.
  */
-#define CACHE_PICTURE_WIDTH 1024
-
-/* Maximum number of glyphs we buffer on the stack before flushing
- * rendering to the mask or destination surface.
- */
-#define GLYPH_BUFFER_SIZE 256
+#define CACHE_PICTURE_SIZE 1024
+#define GLYPH_MIN_SIZE 8
+#define GLYPH_MAX_SIZE 64
+#define GLYPH_CACHE_SIZE (CACHE_PICTURE_SIZE * CACHE_PICTURE_SIZE / (GLYPH_MIN_SIZE * GLYPH_MIN_SIZE))
+
+struct uxa_glyph {
+	uxa_glyph_cache_t *cache;
+	uint16_t x, y;
+	uint16_t size, pos;
+};
 
-typedef struct {
-    PicturePtr source;
-    uxa_composite_rect_t rects[GLYPH_BUFFER_SIZE];
-    int count;
-} uxa_glyph_buffer_t;
-
-typedef enum {
-    UXA_GLYPH_SUCCESS,    /* Glyph added to render buffer */
-    UXA_GLYPH_FAIL,       /* out of memory, etc */
-    UXA_GLYPH_NEED_FLUSH, /* would evict a glyph already in the buffer */
-} uxa_glyph_cache_result_t;
+#if HAS_DEVPRIVATEKEYREC
+static DevPrivateKeyRec uxa_glyph_key;
+#else
+static int uxa_glyph_key;
+#endif
 
-void
-uxa_glyphs_init(ScreenPtr pScreen)
+static inline struct uxa_glyph *uxa_glyph_get_private(GlyphPtr glyph)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    int		    i = 0;
-
-    memset(uxa_screen->glyphCaches, 0, sizeof(uxa_screen->glyphCaches));
+#if HAS_DEVPRIVATEKEYREC
+	return dixGetPrivate(&glyph->devPrivates, &uxa_glyph_key);
+#else
+	return dixLookupPrivate(&glyph->devPrivates, &uxa_glyph_key);
+#endif
+}
 
-    uxa_screen->glyphCaches[i].format = PICT_a8;
-    uxa_screen->glyphCaches[i].glyphWidth = uxa_screen->glyphCaches[i].glyphHeight = 16;
-    i++;
-    uxa_screen->glyphCaches[i].format = PICT_a8;
-    uxa_screen->glyphCaches[i].glyphWidth = uxa_screen->glyphCaches[i].glyphHeight = 32;
-    i++;
-    uxa_screen->glyphCaches[i].format = PICT_a8r8g8b8;
-    uxa_screen->glyphCaches[i].glyphWidth = uxa_screen->glyphCaches[i].glyphHeight = 16;
-    i++;
-    uxa_screen->glyphCaches[i].format = PICT_a8r8g8b8;
-    uxa_screen->glyphCaches[i].glyphWidth = uxa_screen->glyphCaches[i].glyphHeight = 32;
-    i++;
-
-    assert(i == UXA_NUM_GLYPH_CACHES);
-    
-    for (i = 0; i < UXA_NUM_GLYPH_CACHES; i++) {
-	uxa_screen->glyphCaches[i].columns = CACHE_PICTURE_WIDTH / uxa_screen->glyphCaches[i].glyphWidth;
-	uxa_screen->glyphCaches[i].size = 256;
-	uxa_screen->glyphCaches[i].hashSize = 557;
-    }
+static inline void uxa_glyph_set_private(GlyphPtr glyph, struct uxa_glyph *priv)
+{
+	dixSetPrivate(&glyph->devPrivates, &uxa_glyph_key, priv);
 }
 
-static void
-uxa_unrealize_glyph_caches(ScreenPtr    pScreen,
-			   unsigned int format)
+#define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
+
+static void uxa_unrealize_glyph_caches(ScreenPtr pScreen)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    int		    i;
+	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+	int i;
+
+	for (i = 0; i < UXA_NUM_GLYPH_CACHE_FORMATS; i++) {
+		uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
 
-    for (i = 0; i < UXA_NUM_GLYPH_CACHES; i++) {
-	uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
-	
-	if (cache->format != format)
-	    continue;
-
-	if (cache->picture) {
-	    FreePicture ((pointer) cache->picture, (XID) 0);
-	    cache->picture = NULL;
-	}
-
-	if (cache->hashEntries) {
-	    xfree(cache->hashEntries);
-	    cache->hashEntries = NULL;
-	}
-	
-	if (cache->glyphs) {
-	    xfree(cache->glyphs);
-	    cache->glyphs = NULL;
+		if (cache->picture)
+			FreePicture(cache->picture, 0);
+
+		if (cache->glyphs)
+			free(cache->glyphs);
 	}
-	cache->glyphCount = 0;
-    }
 }
 
-#define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
+void uxa_glyphs_fini(ScreenPtr pScreen)
+{
+	uxa_unrealize_glyph_caches(pScreen);
+}
 
 /* All caches for a single format share a single pixmap for glyph storage,
  * allowing mixing glyphs of different sizes without paying a penalty
@@ -153,725 +136,1051 @@ uxa_unrealize_glyph_caches(ScreenPtr
  * This function allocates the storage pixmap, and then fills in the
  * rest of the allocated structures for all caches with the given format.
  */
-static Bool
-uxa_realize_glyph_caches(ScreenPtr    pScreen,
-			 unsigned int format)
+static Bool uxa_realize_glyph_caches(ScreenPtr pScreen)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    int		    depth = PIXMAN_FORMAT_DEPTH(format);
-    PictFormatPtr   pPictFormat;
-    PixmapPtr	    pPixmap;
-    PicturePtr	    pPicture;
-    CARD32          component_alpha;
-    int		    height;
-    int		    i;
-    int		    error;
+	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+	unsigned int formats[] = {
+		PIXMAN_a8,
+		PIXMAN_a8r8g8b8,
+	};
+	int i;
+
+	memset(uxa_screen->glyphCaches, 0, sizeof(uxa_screen->glyphCaches));
+
+	for (i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) {
+		uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
+		PixmapPtr pixmap;
+		PicturePtr picture;
+		CARD32 component_alpha;
+		int depth = PIXMAN_FORMAT_DEPTH(formats[i]);
+		int error;
+		PictFormatPtr pPictFormat = PictureMatchFormat(pScreen, depth, formats[i]);
+		if (!pPictFormat)
+			goto bail;
+
+		/* Now allocate the pixmap and picture */
+		pixmap = pScreen->CreatePixmap(pScreen,
+					       CACHE_PICTURE_SIZE, CACHE_PICTURE_SIZE, depth,
+					       INTEL_CREATE_PIXMAP_TILING_X);
+		if (!pixmap)
+			goto bail;
+		assert (uxa_pixmap_is_offscreen(pixmap));
+
+		component_alpha = NeedsComponent(pPictFormat->format);
+		picture = CreatePicture(0, &pixmap->drawable, pPictFormat,
+					CPComponentAlpha, &component_alpha,
+					serverClient, &error);
+
+		pScreen->DestroyPixmap(pixmap);
+
+		if (!picture)
+			goto bail;
+
+		ValidatePicture(picture);
+
+		cache->picture = picture;
+		cache->glyphs = calloc(sizeof(GlyphPtr), GLYPH_CACHE_SIZE);
+		if (!cache->glyphs)
+			goto bail;
 
-    pPictFormat = PictureMatchFormat(pScreen, depth, format);
-    if (!pPictFormat)
-	return FALSE;
-    
-    /* Compute the total vertical size needed for the format */
+		cache->evict = rand() % GLYPH_CACHE_SIZE;
+	}
+	assert(i == UXA_NUM_GLYPH_CACHE_FORMATS);
+
+	return TRUE;
 
-    height = 0;
-    for (i = 0; i < UXA_NUM_GLYPH_CACHES; i++) {
-	uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
-	int rows;
-
-	if (cache->format != format)
-	    continue;
-
-	cache->yOffset = height;
-
-	rows = (cache->size + cache->columns - 1) / cache->columns;
-	height += rows * cache->glyphHeight;
-    }
-
-    /* Now allocate the pixmap and picture */
-       
-    pPixmap = (*pScreen->CreatePixmap) (pScreen,
-					CACHE_PICTURE_WIDTH,
-					height, depth, 0);
-    if (!pPixmap)
+bail:
+	uxa_unrealize_glyph_caches(pScreen);
 	return FALSE;
+}
 
-    component_alpha = NeedsComponent(pPictFormat->format);
-    pPicture = CreatePicture(0, &pPixmap->drawable, pPictFormat,
-			     CPComponentAlpha, &component_alpha, serverClient,
-			     &error);
 
-    (*pScreen->DestroyPixmap) (pPixmap); /* picture holds a refcount */
+Bool uxa_glyphs_init(ScreenPtr pScreen)
+{
+	/* We are trying to initialise per screen resources prior to the
+	 * complete initialisation of the screen. So ensure the components
+	 * that we depend upon are initialsed prior to our use.
+	 */
+	if (!CreateScratchPixmapsForScreen(pScreen->myNum))
+		return FALSE;
 
-    if (!pPicture)
-	return FALSE;
+#if HAS_DIXREGISTERPRIVATEKEY
+	if (!dixRegisterPrivateKey(&uxa_glyph_key, PRIVATE_GLYPH, 0))
+		return FALSE;
+#else
+	if (!dixRequestPrivate(&uxa_glyph_key, 0))
+		return FALSE;
+#endif
 
-    /* And store the picture in all the caches for the format */
-    
-    for (i = 0; i < UXA_NUM_GLYPH_CACHES; i++) {
-	uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
-	int j;
-
-	if (cache->format != format)
-	    continue;
-
-	cache->picture = pPicture;
-	cache->picture->refcnt++;
-	cache->hashEntries = xalloc(sizeof(int) * cache->hashSize);
-	cache->glyphs = xalloc(sizeof(uxa_cached_glyph_t) * cache->size);
-	cache->glyphCount = 0;
-
-	if (!cache->hashEntries || !cache->glyphs)
-	    goto bail;
-
-	for (j = 0; j < cache->hashSize; j++)
-	    cache->hashEntries[j] = -1;
-	
-	cache->evictionPosition = rand() % cache->size;
-    }
-
-    /* Each cache references the picture individually */
-    FreePicture ((pointer) pPicture, (XID) 0);
-    return TRUE;
+	if (!uxa_realize_glyph_caches(pScreen))
+		return FALSE;
 
-bail:
-    uxa_unrealize_glyph_caches(pScreen, format);
-    return FALSE;
+	return TRUE;
 }
 
-void
-uxa_glyphs_fini (ScreenPtr pScreen)
+/* The most efficient thing to way to upload the glyph to the screen
+ * is to use CopyArea; uxa pixmaps are always offscreen.
+ */
+static void
+uxa_glyph_cache_upload_glyph(ScreenPtr screen,
+			     uxa_glyph_cache_t * cache,
+			     GlyphPtr glyph,
+			     int x, int y)
 {
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    int		    i;
+	PicturePtr pGlyphPicture = GlyphPicture(glyph)[screen->myNum];
+	PixmapPtr pGlyphPixmap = (PixmapPtr) pGlyphPicture->pDrawable;
+	PixmapPtr pCachePixmap = (PixmapPtr) cache->picture->pDrawable;
+	PixmapPtr scratch;
+	GCPtr gc;
+
+	gc = GetScratchGC(pCachePixmap->drawable.depth, screen);
+	if (!gc)
+		return;
+
+	ValidateGC(&pCachePixmap->drawable, gc);
+
+	scratch = pGlyphPixmap;
+	/* Create a temporary bo to stream the updates to the cache */
+	if (pGlyphPixmap->drawable.depth != pCachePixmap->drawable.depth ||
+	    !uxa_pixmap_is_offscreen(scratch)) {
+		scratch = screen->CreatePixmap(screen,
+					       glyph->info.width,
+					       glyph->info.height,
+					       pCachePixmap->drawable.depth,
+					       UXA_CREATE_PIXMAP_FOR_MAP);
+		if (scratch) {
+			if (pGlyphPixmap->drawable.depth != pCachePixmap->drawable.depth) {
+				PicturePtr picture;
+				int error;
+
+				picture = CreatePicture(0, &scratch->drawable,
+							PictureMatchFormat(screen,
+									   pCachePixmap->drawable.depth,
+									   cache->picture->format),
+							0, NULL,
+							serverClient, &error);
+				if (picture) {
+					ValidatePicture(picture);
+					uxa_composite(PictOpSrc, pGlyphPicture, NULL, picture,
+						      0, 0,
+						      0, 0,
+						      0, 0,
+						      glyph->info.width, glyph->info.height);
+					FreePicture(picture, 0);
+				}
+			} else {
+				uxa_copy_area(&pGlyphPixmap->drawable,
+					      &scratch->drawable,
+					      gc,
+					      0, 0,
+					      glyph->info.width, glyph->info.height,
+					      0, 0);
+			}
+		} else {
+			scratch = pGlyphPixmap;
+		}
+	}
 
-    for (i = 0; i < UXA_NUM_GLYPH_CACHES; i++) {
-	uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
+	uxa_copy_area(&scratch->drawable, &pCachePixmap->drawable, gc,
+		      0, 0,
+		      glyph->info.width, glyph->info.height,
+		      x, y);
 
-	if (cache->picture)
-	    uxa_unrealize_glyph_caches(pScreen, cache->format);
-    }
+	if (scratch != pGlyphPixmap)
+		screen->DestroyPixmap(scratch);
+
+	FreeScratchGC(gc);
 }
 
-static int
-uxa_glyph_cache_hash_lookup(uxa_glyph_cache_t *cache, GlyphPtr pGlyph)
+void
+uxa_glyph_unrealize(ScreenPtr pScreen,
+		    GlyphPtr pGlyph)
 {
-    int slot;
+	struct uxa_glyph *priv;
 
-    slot = (*(CARD32 *) pGlyph->sha1) % cache->hashSize;
-    
-    while (TRUE) { /* hash table can never be full */
-	int entryPos = cache->hashEntries[slot];
-	if (entryPos == -1)
-	    return -1;
-
-	if (memcmp(pGlyph->sha1, cache->glyphs[entryPos].sha1, sizeof(pGlyph->sha1)) == 0){
-	    return entryPos;
-	}
-	    
-	slot--;
-	if (slot < 0)
-	    slot = cache->hashSize - 1;
-    }
-}
+	priv = uxa_glyph_get_private(pGlyph);
+	if (priv == NULL)
+		return;
 
-static void
-uxa_glyph_cache_hash_insert(uxa_glyph_cache_t *cache,
-			GlyphPtr         pGlyph,
-			int              pos)
-{
-    int slot;
-
-    memcpy(cache->glyphs[pos].sha1, pGlyph->sha1, sizeof(pGlyph->sha1));
-    
-    slot = (*(CARD32 *) pGlyph->sha1) % cache->hashSize;
-    
-    while (TRUE) { /* hash table can never be full */
-	if (cache->hashEntries[slot] == -1) {
-	    cache->hashEntries[slot] = pos;
-	    return;
-	}
-	    
-	slot--;
-	if (slot < 0)
-	    slot = cache->hashSize - 1;
-    }
+	priv->cache->glyphs[priv->pos] = NULL;
+
+	uxa_glyph_set_private(pGlyph, NULL);
+	free(priv);
 }
 
+/* Cut and paste from render/glyph.c - probably should export it instead */
 static void
-uxa_glyph_cache_hash_remove(uxa_glyph_cache_t *cache,
-			int              pos)
+uxa_glyph_extents(int nlist,
+		  GlyphListPtr list, GlyphPtr * glyphs, BoxPtr extents)
 {
-    int slot;
-    int emptiedSlot = -1;
+	int x1, x2, y1, y2;
+	int x, y, n;
 
-    slot = (*(CARD32 *) cache->glyphs[pos].sha1) % cache->hashSize;
+	x1 = y1 = MAXSHORT;
+	x2 = y2 = MINSHORT;
+	x = y = 0;
+	while (nlist--) {
+		x += list->xOff;
+		y += list->yOff;
+		n = list->len;
+		list++;
+		while (n--) {
+			GlyphPtr glyph = *glyphs++;
+			int v;
+
+			v = x - glyph->info.x;
+			if (v < x1)
+			    x1 = v;
+			v += glyph->info.width;
+			if (v > x2)
+			    x2 = v;
+
+			v = y - glyph->info.y;
+			if (v < y1)
+			    y1 = v;
+			v += glyph->info.height;
+			if (v > y2)
+			    y2 = v;
 
-    while (TRUE) { /* hash table can never be full */
-	int entryPos = cache->hashEntries[slot];
-	
-	if (entryPos == -1)
-	    return;
+			x += glyph->info.xOff;
+			y += glyph->info.yOff;
+		}
+	}
 
-	if (entryPos == pos) {
-	    cache->hashEntries[slot] = -1;
-	    emptiedSlot = slot;
-	} else if (emptiedSlot != -1) {
-	    /* See if we can move this entry into the emptied slot, we can't
-	     * do that if if entry would have hashed between the current position
-	     * and the emptied slot. (taking wrapping into account). Bad positions
-	     * are:
-	     *
-	     * |   XXXXXXXXXX             |
-	     *     i         j            
-	     *                            
-	     * |XXX                   XXXX|
-	     *     j                  i
-	     *
-	     * i - slot, j - emptiedSlot
-	     *
-	     * (Knuth 6.4R)
-	     */
-	    
-	    int entrySlot = (*(CARD32 *) cache->glyphs[entryPos].sha1) % cache->hashSize;
-
-	    if (!((entrySlot >= slot && entrySlot < emptiedSlot) ||
-		  (emptiedSlot < slot && (entrySlot < emptiedSlot || entrySlot >= slot)))) 
-	    {
-		cache->hashEntries[emptiedSlot] = entryPos;
-		cache->hashEntries[slot] = -1;
-		emptiedSlot = slot;
-	    }
-	}
-	
-	slot--;
-	if (slot < 0)
-	    slot = cache->hashSize - 1;
-    }
+	extents->x1 = x1 < MINSHORT ? MINSHORT : x1;
+	extents->x2 = x2 > MAXSHORT ? MAXSHORT : x2;
+	extents->y1 = y1 < MINSHORT ? MINSHORT : y1;
+	extents->y2 = y2 > MAXSHORT ? MAXSHORT : y2;
 }
 
-#define CACHE_X(pos) (((pos) % cache->columns) * cache->glyphWidth)
-#define CACHE_Y(pos) (cache->yOffset + ((pos) / cache->columns) * cache->glyphHeight)
-
-/* The most efficient thing to way to upload the glyph to the screen
- * is to use CopyArea; uxa pixmaps are always offscreen.
+/**
+ * Returns TRUE if the glyphs in the lists intersect.  Only checks based on
+ * bounding box, which appears to be good enough to catch most cases at least.
  */
 static Bool
-uxa_glyph_cache_upload_glyph(ScreenPtr		    pScreen,
-			     uxa_glyph_cache_t	    *cache,
-			     int		    pos,
-			     GlyphPtr		    pGlyph)
-{
-    PicturePtr	    pGlyphPicture = GlyphPicture(pGlyph)[pScreen->myNum];
-    PixmapPtr	    pGlyphPixmap = (PixmapPtr)pGlyphPicture->pDrawable;
-    PixmapPtr	    pCachePixmap = (PixmapPtr)cache->picture->pDrawable;
-    GCPtr	    pGC;
+uxa_glyphs_intersect(int nlist, GlyphListPtr list, GlyphPtr * glyphs)
+{
+	int x1, x2, y1, y2;
+	int n;
+	int x, y;
+	BoxRec extents;
+	Bool first = TRUE;
+
+	x = 0;
+	y = 0;
+	extents.x1 = 0;
+	extents.y1 = 0;
+	extents.x2 = 0;
+	extents.y2 = 0;
+	while (nlist--) {
+		x += list->xOff;
+		y += list->yOff;
+		n = list->len;
+		list++;
+		while (n--) {
+			GlyphPtr glyph = *glyphs++;
+
+			if (glyph->info.width == 0 || glyph->info.height == 0) {
+				x += glyph->info.xOff;
+				y += glyph->info.yOff;
+				continue;
+			}
+
+			x1 = x - glyph->info.x;
+			if (x1 < MINSHORT)
+				x1 = MINSHORT;
+			y1 = y - glyph->info.y;
+			if (y1 < MINSHORT)
+				y1 = MINSHORT;
+			x2 = x1 + glyph->info.width;
+			if (x2 > MAXSHORT)
+				x2 = MAXSHORT;
+			y2 = y1 + glyph->info.height;
+			if (y2 > MAXSHORT)
+				y2 = MAXSHORT;
+
+			if (first) {
+				extents.x1 = x1;
+				extents.y1 = y1;
+				extents.x2 = x2;
+				extents.y2 = y2;
+				first = FALSE;
+			} else {
+				if (x1 < extents.x2 && x2 > extents.x1 &&
+				    y1 < extents.y2 && y2 > extents.y1) {
+					return TRUE;
+				}
+
+				if (x1 < extents.x1)
+					extents.x1 = x1;
+				if (x2 > extents.x2)
+					extents.x2 = x2;
+				if (y1 < extents.y1)
+					extents.y1 = y1;
+				if (y2 > extents.y2)
+					extents.y2 = y2;
+			}
+			x += glyph->info.xOff;
+			y += glyph->info.yOff;
+		}
+	}
 
-    /* UploadToScreen only works if bpp match */
-    if (pGlyphPixmap->drawable.bitsPerPixel != pCachePixmap->drawable.bitsPerPixel)
 	return FALSE;
+}
 
-    pGC = GetScratchGC(pCachePixmap->drawable.depth, pScreen);
-    ValidateGC(&pCachePixmap->drawable, pGC);
-    (void) uxa_copy_area (&pGlyphPixmap->drawable,
-			  &pCachePixmap->drawable,
-			  pGC,
-			  0, 0, pGlyph->info.width, pGlyph->info.height,
-			  CACHE_X(pos), CACHE_Y(pos));
-    FreeScratchGC (pGC);
-    return TRUE;
-}
-
-static uxa_glyph_cache_result_t
-uxa_glyph_cache_buffer_glyph(ScreenPtr		pScreen,
-			     uxa_glyph_cache_t	*cache,
-			     uxa_glyph_buffer_t *buffer,
-			     GlyphPtr		pGlyph,
-			     int		xGlyph,
-			     int		yGlyph)
-{
-    uxa_composite_rect_t    *rect;
-    int			    pos;
-    
-    if (buffer->source && buffer->source != cache->picture)
-	return UXA_GLYPH_NEED_FLUSH;
-
-    if (!cache->picture) {
-	if (!uxa_realize_glyph_caches(pScreen, cache->format))
-	    return UXA_GLYPH_FAIL;
-    }
-
-    DBG_GLYPH_CACHE(("(%d,%d,%s): buffering glyph %lx\n",
-		     cache->glyphWidth, cache->glyphHeight, cache->format == PICT_a8 ? "A" : "ARGB",
-		     (long)*(CARD32 *) pGlyph->sha1));
-   
-    pos = uxa_glyph_cache_hash_lookup(cache, pGlyph);
-    if (pos != -1) {
-	DBG_GLYPH_CACHE(("  found existing glyph at %d\n", pos));
-    } else {
-	if (cache->glyphCount < cache->size) {
-	    /* Space remaining; we fill from the start */
-	    pos = cache->glyphCount;
-	    cache->glyphCount++;
-	    DBG_GLYPH_CACHE(("  storing glyph in free space at %d\n", pos));
+static void
+uxa_check_glyphs(CARD8 op,
+		 PicturePtr src,
+		 PicturePtr dst,
+		 PictFormatPtr maskFormat,
+		 INT16 xSrc,
+		 INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs)
+{
+	int screen = dst->pDrawable->pScreen->myNum;
+	pixman_image_t *image;
+	PixmapPtr scratch;
+	PicturePtr mask;
+	int width = 0, height = 0;
+	int x, y, n;
+	int xDst = list->xOff, yDst = list->yOff;
+	BoxRec extents = { 0, 0, 0, 0 };
+
+	if (maskFormat) {
+		pixman_format_code_t format;
+		CARD32 component_alpha;
+		int error;
+
+		uxa_glyph_extents(nlist, list, glyphs, &extents);
+		if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1)
+			return;
+
+		width = extents.x2 - extents.x1;
+		height = extents.y2 - extents.y1;
+
+		format = maskFormat->format |
+			(BitsPerPixel(maskFormat->depth) << 24);
+		image =
+			pixman_image_create_bits(format, width, height, NULL, 0);
+		if (!image)
+			return;
+
+		scratch = GetScratchPixmapHeader(dst->pDrawable->pScreen, width, height,
+						 PIXMAN_FORMAT_DEPTH(format),
+						 PIXMAN_FORMAT_BPP(format),
+						 pixman_image_get_stride(image),
+						 pixman_image_get_data(image));
+
+		if (!scratch) {
+			pixman_image_unref(image);
+			return;
+		}
 
-	    uxa_glyph_cache_hash_insert(cache, pGlyph, pos);
+		component_alpha = NeedsComponent(maskFormat->format);
+		mask = CreatePicture(0, &scratch->drawable,
+				     maskFormat, CPComponentAlpha,
+				     &component_alpha, serverClient, &error);
+		if (!mask) {
+			FreeScratchPixmapHeader(scratch);
+			pixman_image_unref(image);
+			return;
+		}
+		ValidatePicture(mask);
 
+		x = -extents.x1;
+		y = -extents.y1;
 	} else {
-	    /* Need to evict an entry. We have to see if any glyphs
-	     * already in the output buffer were at this position in
-	     * the cache
-	     */
-	    
-	    pos = cache->evictionPosition;
-	    DBG_GLYPH_CACHE(("  evicting glyph at %d\n", pos));
-	    if (buffer->count) {
-		int x, y;
-		int i;
-		
-		x = CACHE_X(pos);
-		y = CACHE_Y(pos);
-
-		for (i = 0; i < buffer->count; i++) {
-		    if (buffer->rects[i].xSrc == x && buffer->rects[i].ySrc == y) {
-			DBG_GLYPH_CACHE(("  must flush buffer\n"));
-			return UXA_GLYPH_NEED_FLUSH;
-		    }
-		}
-	    }
-
-	    /* OK, we're all set, swap in the new glyph */
-	    uxa_glyph_cache_hash_remove(cache, pos);
-	    uxa_glyph_cache_hash_insert(cache, pGlyph, pos);
-
-	    /* And pick a new eviction position */
-	    cache->evictionPosition = rand() % cache->size;
-	}
-
-	/* Now actually upload the glyph into the cache picture; if
-	 * we can't do it with UploadToScreen (because the glyph is
-	 * offscreen, etc), we fall back to CompositePicture.
-	 */
-	if (!uxa_glyph_cache_upload_glyph(pScreen, cache, pos, pGlyph)) {
-	    CompositePicture (PictOpSrc,
-			      GlyphPicture(pGlyph)[pScreen->myNum],
-			      None,
-			      cache->picture,
-			      0, 0,
-			      0, 0,
-			      CACHE_X(pos),
-			      CACHE_Y(pos),
-			      pGlyph->info.width,
-			      pGlyph->info.height);
-	}
-
-    }
-    
-
-    buffer->source = cache->picture;
-	    
-    rect = &buffer->rects[buffer->count];
-    rect->xSrc = CACHE_X(pos);
-    rect->ySrc = CACHE_Y(pos);
-    rect->xDst = xGlyph - pGlyph->info.x;
-    rect->yDst = yGlyph - pGlyph->info.y;
-    rect->width = pGlyph->info.width;
-    rect->height = pGlyph->info.height;
-	    
-    buffer->count++;
-
-    return UXA_GLYPH_SUCCESS;
-}
-
-#undef CACHE_X
-#undef CACHE_Y
-
-static uxa_glyph_cache_result_t
-uxa_buffer_glyph(ScreenPtr	    pScreen,
-		 uxa_glyph_buffer_t *buffer,
-		 GlyphPtr	    pGlyph,
-		 int		    xGlyph,
-		 int		    yGlyph)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pScreen);
-    unsigned int    format = (GlyphPicture(pGlyph)[pScreen->myNum])->format;
-    int		    width = pGlyph->info.width;
-    int		    height = pGlyph->info.height;
-    uxa_composite_rect_t    *rect;
-    PicturePtr	    source;
-    int		     i;
-
-    if (buffer->count == GLYPH_BUFFER_SIZE)
-	return UXA_GLYPH_NEED_FLUSH;
-
-    if (PICT_FORMAT_BPP(format) == 1)
-	format = PICT_a8;
-    
-    for (i = 0; i < UXA_NUM_GLYPH_CACHES; i++) {
-	uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
-
-	if (format == cache->format &&
-	    width <= cache->glyphWidth &&
-	    height <= cache->glyphHeight) {
-	    uxa_glyph_cache_result_t result = uxa_glyph_cache_buffer_glyph(pScreen, &uxa_screen->glyphCaches[i],
-									   buffer,
-									   pGlyph, xGlyph, yGlyph);
-	    switch (result) {
-	    case UXA_GLYPH_FAIL:
-		break;
-	    case UXA_GLYPH_SUCCESS:
-	    case UXA_GLYPH_NEED_FLUSH:
-		return result;
-	    }
-	}
-    }
-
-    /* Couldn't find the glyph in the cache, use the glyph picture directly */
-
-    source = GlyphPicture(pGlyph)[pScreen->myNum];
-    if (buffer->source && buffer->source != source)
-	return UXA_GLYPH_NEED_FLUSH;
-
-    buffer->source = source;
-    
-    rect = &buffer->rects[buffer->count];
-    rect->xSrc = 0;
-    rect->ySrc = 0;
-    rect->xDst = xGlyph - pGlyph->info.x;
-    rect->yDst = yGlyph - pGlyph->info.y;
-    rect->width = pGlyph->info.width;
-    rect->height = pGlyph->info.height;
+		mask = dst;
+		x = 0;
+		y = 0;
+	}
+
+	while (nlist--) {
+		x += list->xOff;
+		y += list->yOff;
+		n = list->len;
+		while (n--) {
+			GlyphPtr glyph = *glyphs++;
+			PicturePtr g = GlyphPicture(glyph)[screen];
+			if (g) {
+				if (maskFormat) {
+					CompositePicture(PictOpAdd, g, NULL, mask,
+							 0, 0,
+							 0, 0,
+							 x - glyph->info.x,
+							 y - glyph->info.y,
+							 glyph->info.width,
+							 glyph->info.height);
+				} else {
+					CompositePicture(op, src, g, dst,
+							 xSrc + (x - glyph->info.x) - xDst,
+							 ySrc + (y - glyph->info.y) - yDst,
+							 0, 0,
+							 x - glyph->info.x,
+							 y - glyph->info.y,
+							 glyph->info.width,
+							 glyph->info.height);
+				}
+			}
 
-    buffer->count++;
+			x += glyph->info.xOff;
+			y += glyph->info.yOff;
+		}
+		list++;
+	}
 
-    return UXA_GLYPH_SUCCESS;
+	if (maskFormat) {
+		x = extents.x1;
+		y = extents.y1;
+		CompositePicture(op, src, mask, dst,
+				 xSrc + x - xDst,
+				 ySrc + y - yDst,
+				 0, 0,
+				 x, y,
+				 width, height);
+		FreePicture(mask, 0);
+		FreeScratchPixmapHeader(scratch);
+		pixman_image_unref(image);
+	}
 }
 
-static void
-uxa_glyphs_to_mask(PicturePtr		pMask,
-		   uxa_glyph_buffer_t	*buffer)
+static inline unsigned int
+uxa_glyph_size_to_count(int size)
 {
-    uxa_composite_rects(PictOpAdd, buffer->source, pMask,
-		      buffer->count, buffer->rects);
-    
-    buffer->count = 0;
-    buffer->source = NULL;
+	size /= GLYPH_MIN_SIZE;
+	return size * size;
 }
 
-static void
-uxa_glyphs_to_dst(CARD8			op,
-		  PicturePtr		pSrc,
-		  PicturePtr		pDst,
-		  uxa_glyph_buffer_t	*buffer,
-		  INT16			xSrc,
-		  INT16			ySrc,
-		  INT16			xDst,
-		  INT16			yDst)
-{
-    int i;
-
-    for (i = 0; i < buffer->count; i++) {
-	uxa_composite_rect_t	*rect = &buffer->rects[i];
-	
-	CompositePicture (op,
-			  pSrc,
-			  buffer->source,
-			  pDst,
-			  xSrc + rect->xDst - xDst,
-			  ySrc + rect->yDst - yDst,
-			  rect->xSrc,
-			  rect->ySrc,
-			  rect->xDst,
-			  rect->yDst,
-			  rect->width,
-			  rect->height);
-    }
-    
-    buffer->count = 0;
-    buffer->source = NULL;
+static inline unsigned int
+uxa_glyph_count_to_mask(int count)
+{
+	return ~(count - 1);
 }
 
-/* Cut and paste from render/glyph.c - probably should export it instead */
-static void
-uxa_glyph_extents (int		nlist,
-	      GlyphListPtr	list,
-	      GlyphPtr	       *glyphs,
-	      BoxPtr		extents)
-{
-    int		x1, x2, y1, y2;
-    int		n;
-    GlyphPtr	glyph;
-    int		x, y;
-    
-    x = 0;
-    y = 0;
-    extents->x1 = MAXSHORT;
-    extents->x2 = MINSHORT;
-    extents->y1 = MAXSHORT;
-    extents->y2 = MINSHORT;
-    while (nlist--)
-    {
-	x += list->xOff;
-	y += list->yOff;
-	n = list->len;
-	list++;
-	while (n--)
-	{
-	    glyph = *glyphs++;
-	    x1 = x - glyph->info.x;
-	    if (x1 < MINSHORT)
-		x1 = MINSHORT;
-	    y1 = y - glyph->info.y;
-	    if (y1 < MINSHORT)
-		y1 = MINSHORT;
-	    x2 = x1 + glyph->info.width;
-	    if (x2 > MAXSHORT)
-		x2 = MAXSHORT;
-	    y2 = y1 + glyph->info.height;
-	    if (y2 > MAXSHORT)
-		y2 = MAXSHORT;
-	    if (x1 < extents->x1)
-		extents->x1 = x1;
-	    if (x2 > extents->x2)
-		extents->x2 = x2;
-	    if (y1 < extents->y1)
-		extents->y1 = y1;
-	    if (y2 > extents->y2)
-		extents->y2 = y2;
-	    x += glyph->info.xOff;
-	    y += glyph->info.yOff;
+static inline unsigned int
+uxa_glyph_size_to_mask(int size)
+{
+	return uxa_glyph_count_to_mask(uxa_glyph_size_to_count(size));
+}
+
+static PicturePtr
+uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int *out_x, int *out_y)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PicturePtr glyph_picture = GlyphPicture(glyph)[screen->myNum];
+	uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[PICT_FORMAT_RGB(glyph_picture->format) != 0];
+	struct uxa_glyph *priv = NULL;
+	int size, mask, pos, s;
+
+	if (glyph->info.width > GLYPH_MAX_SIZE || glyph->info.height > GLYPH_MAX_SIZE)
+		return NULL;
+
+	for (size = GLYPH_MIN_SIZE; size <= GLYPH_MAX_SIZE; size *= 2)
+		if (glyph->info.width <= size && glyph->info.height <= size)
+			break;
+
+	s = uxa_glyph_size_to_count(size);
+	mask = uxa_glyph_count_to_mask(s);
+	pos = (cache->count + s - 1) & mask;
+	if (pos < GLYPH_CACHE_SIZE) {
+		cache->count = pos + s;
+	} else {
+		for (s = size; s <= GLYPH_MAX_SIZE; s *= 2) {
+			int i = cache->evict & uxa_glyph_size_to_mask(s);
+			GlyphPtr evicted = cache->glyphs[i];
+			if (evicted == NULL)
+				continue;
+
+			priv = uxa_glyph_get_private(evicted);
+			if (priv->size >= s) {
+				cache->glyphs[i] = NULL;
+				uxa_glyph_set_private(evicted, NULL);
+				pos = cache->evict & uxa_glyph_size_to_mask(size);
+			} else
+				priv = NULL;
+			break;
+		}
+		if (priv == NULL) {
+			int count = uxa_glyph_size_to_count(size);
+			mask = uxa_glyph_count_to_mask(count);
+			pos = cache->evict & mask;
+			for (s = 0; s < count; s++) {
+				GlyphPtr evicted = cache->glyphs[pos + s];
+				if (evicted != NULL) {
+					if (priv != NULL)
+						free(priv);
+
+					priv = uxa_glyph_get_private(evicted);
+					uxa_glyph_set_private(evicted, NULL);
+					cache->glyphs[pos + s] = NULL;
+				}
+			}
+		}
+
+		/* And pick a new eviction position */
+		cache->evict = rand() % GLYPH_CACHE_SIZE;
 	}
-    }
+
+	if (priv == NULL) {
+		priv = malloc(sizeof(struct uxa_glyph));
+		if (priv == NULL)
+			return NULL;
+	}
+
+	uxa_glyph_set_private(glyph, priv);
+	cache->glyphs[pos] = glyph;
+
+	priv->cache = cache;
+	priv->size = size;
+	priv->pos = pos;
+	s = pos / ((GLYPH_MAX_SIZE / GLYPH_MIN_SIZE) * (GLYPH_MAX_SIZE / GLYPH_MIN_SIZE));
+	priv->x = s % (CACHE_PICTURE_SIZE / GLYPH_MAX_SIZE) * GLYPH_MAX_SIZE;
+	priv->y = (s / (CACHE_PICTURE_SIZE / GLYPH_MAX_SIZE)) * GLYPH_MAX_SIZE;
+	for (s = GLYPH_MIN_SIZE; s < GLYPH_MAX_SIZE; s *= 2) {
+		if (pos & 1)
+			priv->x += s;
+		if (pos & 2)
+			priv->y += s;
+		pos >>= 2;
+	}
+
+	uxa_glyph_cache_upload_glyph(screen, cache, glyph, priv->x, priv->y);
+
+	*out_x = priv->x;
+	*out_y = priv->y;
+	return cache->picture;
 }
 
-/**
- * Returns TRUE if the glyphs in the lists intersect.  Only checks based on
- * bounding box, which appears to be good enough to catch most cases at least.
- */
-static Bool
-uxa_glyphs_intersect(int nlist, GlyphListPtr list, GlyphPtr *glyphs)
+static int
+uxa_glyphs_to_dst(CARD8 op,
+		  PicturePtr pSrc,
+		  PicturePtr pDst,
+		  INT16 src_x, INT16 src_y,
+		  INT16 xDst, INT16 yDst,
+		  int nlist, GlyphListPtr list, GlyphPtr * glyphs,
+		  BoxPtr extents)
 {
-    int x1, x2, y1, y2;
-    int n;
-    GlyphPtr glyph;
-    int x, y;
-    BoxRec extents;
-    Bool first = TRUE;
-
-    x = 0;
-    y = 0;
-    extents.x1 = 0;
-    extents.y1 = 0;
-    extents.x2 = 0;
-    extents.y2 = 0;
-    while (nlist--) {
-       x += list->xOff;
-       y += list->yOff;
-       n = list->len;
-       list++;
-       while (n--) {
-           glyph = *glyphs++;
-
-           if (glyph->info.width == 0 || glyph->info.height == 0) {
-               x += glyph->info.xOff;
-               y += glyph->info.yOff;
-               continue;
-           }
-
-           x1 = x - glyph->info.x;
-           if (x1 < MINSHORT)
-               x1 = MINSHORT;
-           y1 = y - glyph->info.y;
-           if (y1 < MINSHORT)
-               y1 = MINSHORT;
-           x2 = x1 + glyph->info.width;
-           if (x2 > MAXSHORT)
-               x2 = MAXSHORT;
-           y2 = y1 + glyph->info.height;
-           if (y2 > MAXSHORT)
-               y2 = MAXSHORT;
-
-           if (first) {
-               extents.x1 = x1;
-               extents.y1 = y1;
-               extents.x2 = x2;
-               extents.y2 = y2;
-               first = FALSE;
-           } else {
-               if (x1 < extents.x2 && x2 > extents.x1 &&
-                   y1 < extents.y2 && y2 > extents.y1)
-               {
-                   return TRUE;
-               }
-
-               if (x1 < extents.x1)
-                  extents.x1 = x1;
-               if (x2 > extents.x2)
-                   extents.x2 = x2;
-               if (y1 < extents.y1)
-                   extents.y1 = y1;
-               if (y2 > extents.y2)
-                   extents.y2 = y2;
-           }
-           x += glyph->info.xOff;
-           y += glyph->info.yOff;
-       }
-    }
+	ScreenPtr screen = pDst->pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PixmapPtr src_pixmap, dst_pixmap;
+	PicturePtr localSrc, glyph_atlas;
+	int x, y, n;
+	BoxRec box;
+
+	if (uxa_screen->info->check_composite_texture &&
+	    uxa_screen->info->check_composite_texture(screen, pSrc)) {
+		if (pSrc->pDrawable) {
+			int src_off_x, src_off_y;
+
+			src_pixmap = uxa_get_offscreen_pixmap(pSrc->pDrawable, &src_off_x, &src_off_y);
+			if (src_pixmap == NULL)
+				return -1;
+
+			src_x += pSrc->pDrawable->x + src_off_x;
+			src_y += pSrc->pDrawable->y + src_off_y;
+		} else {
+			src_pixmap = NULL;
+		}
+		localSrc = pSrc;
+	} else {
+		int width, height;
+
+		if (extents == NULL) {
+			uxa_glyph_extents(nlist, list, glyphs, &box);
+			extents = &box;
+		}
+
+		width  = extents->x2 - extents->x1;
+		height = extents->y2 - extents->y1;
+		if (width == 0 || height == 0)
+			return 0;
+
+		if (pSrc->pDrawable) {
+			int src_off_x, src_off_y;
+
+			src_off_x = extents->x1 - xDst;
+			src_off_y = extents->y1 - yDst;
+			localSrc = uxa_acquire_drawable(screen, pSrc,
+							src_x + src_off_x, src_y + src_off_y,
+							width, height,
+							&src_x, &src_y);
+			if (uxa_screen->info->check_composite_texture &&
+			    !uxa_screen->info->check_composite_texture(screen, localSrc)) {
+				if (localSrc != pSrc)
+					FreePicture(localSrc, 0);
+				return -1;
+			}
+
+			src_pixmap = uxa_get_offscreen_pixmap(localSrc->pDrawable, &src_off_x, &src_off_y);
+			if (src_pixmap == NULL) {
+				if (localSrc != pSrc)
+					FreePicture(localSrc, 0);
+				return -1;
+			}
+
+			src_x += localSrc->pDrawable->x + src_off_x;
+			src_y += localSrc->pDrawable->y + src_off_y;
+		} else {
+			localSrc = uxa_acquire_pattern(screen, pSrc,
+						       PICT_a8r8g8b8, x, y, width, height);
+			if (!localSrc)
+				return 1;
+
+			src_pixmap = uxa_get_drawable_pixmap(localSrc->pDrawable);
+			if (src_pixmap == NULL) {
+				FreePicture(localSrc, 0);
+				return -1;
+			}
+
+			src_x = src_y = 0;
+		}
+	}
+
+	dst_pixmap = uxa_get_offscreen_pixmap(pDst->pDrawable, &x, &y);
+	x += xDst + pDst->pDrawable->x - list->xOff;
+	y += yDst + pDst->pDrawable->y - list->yOff;
+
+	glyph_atlas = NULL;
+	while (nlist--) {
+		x += list->xOff;
+		y += list->yOff;
+		n = list->len;
+		while (n--) {
+			GlyphPtr glyph = *glyphs++;
+			PicturePtr this_atlas;
+			int mask_x, mask_y, nrect;
+			struct uxa_glyph *priv;
+			BoxPtr rects;
+
+			if (glyph->info.width == 0 || glyph->info.height == 0)
+				goto next_glyph;
+
+			priv = uxa_glyph_get_private(glyph);
+			if (priv != NULL) {
+				mask_x = priv->x;
+				mask_y = priv->y;
+				this_atlas = priv->cache->picture;
+			} else {
+				if (glyph_atlas) {
+					uxa_screen->info->done_composite(dst_pixmap);
+					glyph_atlas = NULL;
+				}
+				this_atlas = uxa_glyph_cache(screen, glyph, &mask_x, &mask_y);
+				if (this_atlas == NULL) {
+					/* no cache for this glyph */
+					this_atlas = GlyphPicture(glyph)[screen->myNum];
+					mask_x = mask_y = 0;
+				}
+			}
+
+			if (this_atlas != glyph_atlas) {
+				PixmapPtr mask_pixmap;
+
+				if (glyph_atlas)
+					uxa_screen->info->done_composite(dst_pixmap);
+
+				mask_pixmap =
+					uxa_get_drawable_pixmap(this_atlas->pDrawable);
+				assert (uxa_pixmap_is_offscreen(mask_pixmap));
+
+				if (!uxa_screen->info->prepare_composite(op,
+									 localSrc, this_atlas, pDst,
+									 src_pixmap, mask_pixmap, dst_pixmap))
+					return -1;
+
+				glyph_atlas = this_atlas;
+			}
+
+			rects = REGION_RECTS(pDst->pCompositeClip);
+			nrect = REGION_NUM_RECTS(pDst->pCompositeClip);
+			while (nrect--) {
+				int x1 = x - glyph->info.x, dx = 0;
+				int y1 = y - glyph->info.y, dy = 0;
+				int x2 = x1 + glyph->info.width;
+				int y2 = y1 + glyph->info.height;
+
+				if (rects->y1 >= y2)
+					break;
+
+				if (x1 < rects->x1)
+					dx = rects->x1 - x1, x1 = rects->x1;
+				if (x2 > rects->x2)
+					x2 = rects->x2;
+				if (y1 < rects->y1)
+					dy = rects->y1 - y1, y1 = rects->y1;
+				if (y2 > rects->y2)
+					y2 = rects->y2;
+
+				if (x1 < x2 && y1 < y2) {
+					uxa_screen->info->composite(dst_pixmap,
+								    x1 + src_x,  y1 + src_y,
+								    dx + mask_x, dy + mask_y,
+								    x1, y1,
+								    x2 - x1, y2 - y1);
+				}
+				rects++;
+			}
+
+next_glyph:
+			x += glyph->info.xOff;
+			y += glyph->info.yOff;
+		}
+		list++;
+	}
+	if (glyph_atlas)
+		uxa_screen->info->done_composite(dst_pixmap);
+
+	if (localSrc != pSrc)
+		FreePicture(localSrc, 0);
 
-    return FALSE;
+	return 0;
 }
 
-void
-uxa_glyphs (CARD8 	 op,
-	   PicturePtr	 pSrc,
-	   PicturePtr	 pDst,
-	   PictFormatPtr maskFormat,
-	   INT16	 xSrc,
-	   INT16	 ySrc,
-	   int		 nlist,
-	   GlyphListPtr	 list,
-	   GlyphPtr	*glyphs)
-{
-    PicturePtr	pPicture;
-    PixmapPtr   pMaskPixmap = 0;
-    PicturePtr  pMask;
-    ScreenPtr   pScreen = pDst->pDrawable->pScreen;
-    int		width = 0, height = 0;
-    int		x, y;
-    int		xDst = list->xOff, yDst = list->yOff;
-    int		n;
-    GlyphPtr	glyph;
-    int		error;
-    BoxRec	extents = {0, 0, 0, 0};
-    CARD32	component_alpha;
-    uxa_glyph_buffer_t buffer;
-
-    /* If we don't have a mask format but all the glyphs have the same format
-     * and don't intersect, use the glyph format as mask format for the full
-     * benefits of the glyph cache.
-     */
-    if (!maskFormat) {
-       Bool sameFormat = TRUE;
-       int i;
-
-       maskFormat = list[0].format;
-
-       for (i = 0; i < nlist; i++) {
-           if (maskFormat->format != list[i].format->format) {
-               sameFormat = FALSE;
-               break;
-           }
-       }
-
-       if (!sameFormat || (maskFormat->depth != 1 &&
-			   uxa_glyphs_intersect(nlist, list, glyphs))) {
-	   maskFormat = NULL;
-       }
-    }
-
-    if (maskFormat)
-    {
-	GCPtr	    pGC;
-	xRectangle  rect;
+static void
+uxa_clear_pixmap(ScreenPtr screen,
+		 uxa_screen_t *uxa_screen,
+		 PixmapPtr pixmap)
+{
+	if (uxa_screen->info->check_solid &&
+	    !uxa_screen->info->check_solid(&pixmap->drawable, GXcopy, FB_ALLONES))
+		goto fallback;
+
+	if (!uxa_screen->info->prepare_solid(pixmap, GXcopy, FB_ALLONES, 0))
+		goto fallback;
+
+	uxa_screen->info->solid(pixmap,
+				0, 0,
+				pixmap->drawable.width,
+				pixmap->drawable.height);
 
-	uxa_glyph_extents (nlist, list, glyphs, &extents);
+	uxa_screen->info->done_solid(pixmap);
+	return;
 
-	if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1)
-	    return;
-	width = extents.x2 - extents.x1;
-	height = extents.y2 - extents.y1;
+fallback:
+	{
+		GCPtr gc;
+
+		gc = GetScratchGC(pixmap->drawable.depth, screen);
+		if (gc) {
+			xRectangle rect;
+
+			ValidateGC(&pixmap->drawable, gc);
+
+			rect.x = 0;
+			rect.y = 0;
+			rect.width  = pixmap->drawable.width;
+			rect.height = pixmap->drawable.height;
+			gc->ops->PolyFillRect(&pixmap->drawable, gc, 1, &rect);
+
+			FreeScratchGC(gc);
+		}
+	}
+}
+
+static int
+uxa_glyphs_via_mask(CARD8 op,
+		    PicturePtr pSrc,
+		    PicturePtr pDst,
+		    PictFormatPtr maskFormat,
+		    INT16 xSrc, INT16 ySrc,
+		    INT16 xDst, INT16 yDst,
+		    int nlist, GlyphListPtr list, GlyphPtr * glyphs,
+		    BoxPtr extents)
+{
+	ScreenPtr screen = pDst->pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	CARD32 component_alpha;
+	PixmapPtr pixmap;
+	PicturePtr glyph_atlas, mask;
+	int x, y, width, height;
+	int dst_off_x, dst_off_y;
+	int n, error;
+	BoxRec box;
+
+	if (!extents) {
+		uxa_glyph_extents(nlist, list, glyphs, &box);
+
+		if (box.x2 <= box.x1 || box.y2 <= box.y1)
+			return 0;
+
+		extents = &box;
+		dst_off_x = box.x1;
+		dst_off_y = box.y1;
+	} else {
+		dst_off_x = dst_off_y = 0;
+	}
+
+	width  = extents->x2 - extents->x1;
+	height = extents->y2 - extents->y1;
+	x = -extents->x1;
+	y = -extents->y1;
 
 	if (maskFormat->depth == 1) {
-	    PictFormatPtr a8Format = PictureMatchFormat (pScreen, 8, PICT_a8);
+		PictFormatPtr a8Format =
+			PictureMatchFormat(screen, 8, PICT_a8);
+
+		if (!a8Format)
+			return -1;
 
-	    if (a8Format)
 		maskFormat = a8Format;
 	}
 
-	pMaskPixmap = (*pScreen->CreatePixmap) (pScreen, width, height,
-						maskFormat->depth,
-						CREATE_PIXMAP_USAGE_SCRATCH);
-	if (!pMaskPixmap)
-	    return;
+	pixmap = screen->CreatePixmap(screen, width, height,
+				      maskFormat->depth,
+				      CREATE_PIXMAP_USAGE_SCRATCH);
+	if (!pixmap)
+		return 1;
+
+	uxa_clear_pixmap(screen, uxa_screen, pixmap);
+
 	component_alpha = NeedsComponent(maskFormat->format);
-	pMask = CreatePicture (0, &pMaskPixmap->drawable,
-			       maskFormat, CPComponentAlpha, &component_alpha,
-			       serverClient, &error);
-	if (!pMask)
-	{
-	    (*pScreen->DestroyPixmap) (pMaskPixmap);
-	    return;
+	mask = CreatePicture(0, &pixmap->drawable,
+			      maskFormat, CPComponentAlpha,
+			      &component_alpha, serverClient, &error);
+	screen->DestroyPixmap(pixmap);
+
+	if (!mask)
+		return 1;
+
+	ValidatePicture(mask);
+
+	glyph_atlas = NULL;
+	while (nlist--) {
+		x += list->xOff;
+		y += list->yOff;
+		n = list->len;
+		while (n--) {
+			GlyphPtr glyph = *glyphs++;
+			PicturePtr this_atlas;
+			int src_x, src_y;
+			struct uxa_glyph *priv;
+
+			if (glyph->info.width == 0 || glyph->info.height == 0)
+				goto next_glyph;
+
+			priv = uxa_glyph_get_private(glyph);
+			if (priv != NULL) {
+				src_x = priv->x;
+				src_y = priv->y;
+				this_atlas = priv->cache->picture;
+			} else {
+				if (glyph_atlas) {
+					uxa_screen->info->done_composite(pixmap);
+					glyph_atlas = NULL;
+				}
+				this_atlas = uxa_glyph_cache(screen, glyph, &src_x, &src_y);
+				if (this_atlas == NULL) {
+					/* no cache for this glyph */
+					this_atlas = GlyphPicture(glyph)[screen->myNum];
+					src_x = src_y = 0;
+				}
+			}
+
+			if (this_atlas != glyph_atlas) {
+				PixmapPtr src_pixmap;
+
+				if (glyph_atlas)
+					uxa_screen->info->done_composite(pixmap);
+
+				src_pixmap =
+					uxa_get_drawable_pixmap(this_atlas->pDrawable);
+				assert (uxa_pixmap_is_offscreen(src_pixmap));
+
+				if (!uxa_screen->info->prepare_composite(PictOpAdd,
+									 this_atlas, NULL, mask,
+									 src_pixmap, NULL, pixmap))
+					return -1;
+
+				glyph_atlas = this_atlas;
+			}
+
+			uxa_screen->info->composite(pixmap,
+						    src_x, src_y,
+						    0, 0,
+						    x - glyph->info.x,
+						    y - glyph->info.y,
+						    glyph->info.width,
+						    glyph->info.height);
+
+next_glyph:
+			x += glyph->info.xOff;
+			y += glyph->info.yOff;
+		}
+		list++;
 	}
-	pGC = GetScratchGC (pMaskPixmap->drawable.depth, pScreen);
-	ValidateGC (&pMaskPixmap->drawable, pGC);
-	rect.x = 0;
-	rect.y = 0;
-	rect.width = width;
-	rect.height = height;
-	(*pGC->ops->PolyFillRect) (&pMaskPixmap->drawable, pGC, 1, &rect);
-	FreeScratchGC (pGC);
-	x = -extents.x1;
-	y = -extents.y1;
-    }
-    else
-    {
-	pMask = pDst;
-	x = 0;
-	y = 0;
-    }
-    buffer.count = 0;
-    buffer.source = NULL;
-    while (nlist--)
-    {
-	x += list->xOff;
-	y += list->yOff;
-	n = list->len;
-	while (n--)
-	{
-	    glyph = *glyphs++;
-	    pPicture = GlyphPicture (glyph)[pScreen->myNum];
+	if (glyph_atlas)
+		uxa_screen->info->done_composite(pixmap);
+
+	uxa_composite(op,
+		      pSrc, mask, pDst,
+		      dst_off_x + xSrc - xDst,
+		      dst_off_y + ySrc - yDst,
+		      0, 0,
+		      dst_off_x, dst_off_y,
+		      width, height);
 
-	    if (glyph->info.width > 0 && glyph->info.height > 0 &&
-		uxa_buffer_glyph(pScreen, &buffer, glyph, x, y) == UXA_GLYPH_NEED_FLUSH)
-	    {
-		if (maskFormat)
-		    uxa_glyphs_to_mask(pMask, &buffer);
-		else
-		    uxa_glyphs_to_dst(op, pSrc, pDst, &buffer,
-				   xSrc, ySrc, xDst, yDst);
-
-		uxa_buffer_glyph(pScreen, &buffer, glyph, x, y);
-	    }
-
-	    x += glyph->info.xOff;
-	    y += glyph->info.yOff;
-	}
-	list++;
-    }
-
-    if (buffer.count) {
-	if (maskFormat)
-	    uxa_glyphs_to_mask(pMask, &buffer);
-	else
-	    uxa_glyphs_to_dst(op, pSrc, pDst, &buffer,
-			      xSrc, ySrc, xDst, yDst);
-    }
-
-    if (maskFormat)
-    {
-	x = extents.x1;
-	y = extents.y1;
-	CompositePicture (op,
-			  pSrc,
-			  pMask,
-			  pDst,
-			  xSrc + x - xDst,
-			  ySrc + y - yDst,
-			  0, 0,
-			  x, y,
-			  width, height);
-	FreePicture ((pointer) pMask, (XID) 0);
-	(*pScreen->DestroyPixmap) (pMaskPixmap);
-    }
+	FreePicture(mask, 0);
+	return 0;
 }
 
-#endif /* SERVER_1_5 */
+void
+uxa_glyphs(CARD8 op,
+	   PicturePtr pSrc,
+	   PicturePtr pDst,
+	   PictFormatPtr maskFormat,
+	   INT16 xSrc, INT16 ySrc,
+	   int nlist, GlyphListPtr list, GlyphPtr * glyphs)
+{
+	ScreenPtr screen = pDst->pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	int xDst = list->xOff, yDst = list->yOff;
+	BoxRec extents = { 0, 0, 0, 0 };
+	Bool have_extents = FALSE;
+	int width, height, ret;
+	PicturePtr localDst = pDst;
+
+	if (!uxa_screen->info->prepare_composite ||
+	    uxa_screen->swappedOut ||
+	    !uxa_drawable_is_offscreen(pDst->pDrawable) ||
+	    pDst->alphaMap || pSrc->alphaMap) {
+fallback:
+	    uxa_check_glyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
+	    return;
+	}
+
+	/* basic sanity check */
+	if (uxa_screen->info->check_composite &&
+	    !uxa_screen->info->check_composite(op, pSrc, NULL, pDst, 0, 0)) {
+		goto fallback;
+	}
+
+	ValidatePicture(pSrc);
+	ValidatePicture(pDst);
+
+	if (!maskFormat) {
+		/* If we don't have a mask format but all the glyphs have the same format,
+		 * require ComponentAlpha and don't intersect, use the glyph format as mask
+		 * format for the full benefits of the glyph cache.
+		 */
+		if (NeedsComponent(list[0].format->format)) {
+			Bool sameFormat = TRUE;
+			int i;
+
+			maskFormat = list[0].format;
+
+			for (i = 0; i < nlist; i++) {
+				if (maskFormat->format != list[i].format->format) {
+					sameFormat = FALSE;
+					break;
+				}
+			}
+
+			if (!sameFormat ||
+			    uxa_glyphs_intersect(nlist, list, glyphs))
+				maskFormat = NULL;
+		}
+	}
+
+	if (!maskFormat &&
+	    uxa_screen->info->check_composite_target &&
+	    !uxa_screen->info->check_composite_target(uxa_get_drawable_pixmap(pDst->pDrawable))) {
+		int depth = pDst->pDrawable->depth;
+		PixmapPtr pixmap;
+		int x, y, error;
+		GCPtr gc;
+
+		pixmap = uxa_get_drawable_pixmap(pDst->pDrawable);
+		if (uxa_screen->info->check_copy &&
+		    !uxa_screen->info->check_copy(pixmap, pixmap, GXcopy, FB_ALLONES))
+			goto fallback;
+
+		uxa_glyph_extents(nlist, list, glyphs, &extents);
+
+		/* clip against dst bounds */
+		if (extents.x1 < 0)
+			extents.x1 = 0;
+		if (extents.y1 < 0)
+			extents.y1 = 0;
+		if (extents.x2 > pDst->pDrawable->width)
+			extents.x2 = pDst->pDrawable->width;
+		if (extents.y2 > pDst->pDrawable->height)
+			extents.y2 = pDst->pDrawable->height;
+
+		if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1)
+			return;
+		width  = extents.x2 - extents.x1;
+		height = extents.y2 - extents.y1;
+		x = -extents.x1;
+		y = -extents.y1;
+		have_extents = TRUE;
+
+		xDst += x;
+		yDst += y;
+
+		pixmap = screen->CreatePixmap(screen,
+					      width, height, depth,
+					      CREATE_PIXMAP_USAGE_SCRATCH);
+		if (!pixmap)
+			return;
+
+		gc = GetScratchGC(depth, screen);
+		if (!gc) {
+			screen->DestroyPixmap(pixmap);
+			return;
+		}
+
+		ValidateGC(&pixmap->drawable, gc);
+		gc->ops->CopyArea(pDst->pDrawable, &pixmap->drawable, gc,
+				  extents.x1, extents.y1,
+				  width, height,
+				  0, 0);
+		FreeScratchGC(gc);
+
+		localDst = CreatePicture(0, &pixmap->drawable,
+					 PictureMatchFormat(screen, depth, pDst->format),
+					 0, 0, serverClient, &error);
+		screen->DestroyPixmap(pixmap);
+
+		if (!localDst)
+			return;
+
+		ValidatePicture(localDst);
+	}
+
+	if (maskFormat) {
+		ret = uxa_glyphs_via_mask(op,
+					  pSrc, localDst, maskFormat,
+					  xSrc, ySrc,
+					  xDst, yDst,
+					  nlist, list, glyphs,
+					  have_extents ? &extents : NULL);
+	} else {
+		ret = uxa_glyphs_to_dst(op,
+					pSrc, localDst,
+					xSrc, ySrc,
+					xDst, yDst,
+					nlist, list, glyphs,
+					have_extents ? &extents : NULL);
+	}
+	if (ret) {
+		if (localDst != pDst)
+			FreePicture(localDst, 0);
+
+		goto fallback;
+	}
+
+	if (localDst != pDst) {
+		GCPtr gc;
+
+		gc = GetScratchGC(pDst->pDrawable->depth, screen);
+		if (gc) {
+			ValidateGC(pDst->pDrawable, gc);
+			gc->ops->CopyArea(localDst->pDrawable, pDst->pDrawable, gc,
+					  0, 0,
+					  width, height,
+					  extents.x1, extents.y1);
+			FreeScratchGC(gc);
+		}
+
+		FreePicture(localDst, 0);
+	}
+}
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.h new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.h
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.h	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.h	2011-02-08 11:14:00.000000000 +0100
@@ -53,444 +53,484 @@ typedef enum {
  * fllled in by drivers.
  */
 typedef struct _UxaDriver {
-    /**
-     * uxa_major and uxa_minor should be set by the driver to the version of
-     * UXA which the driver was compiled for (or configures itself at runtime
-     * to support).  This allows UXA to extend the structure for new features
-     * without breaking ABI for drivers compiled against older versions.
-     */
-    int uxa_major, uxa_minor;
-
-    /**
-     * The flags field is bitfield of boolean values controlling UXA's behavior.
-     *
-     * The flags include UXA_TWO_BITBLT_DIRECTIONS.
-     */
-    int flags;
-
-    /** @name solid
-     * @{
-     */
-    /**
-     * prepare_solid() sets up the driver for doing a solid fill.
-     * @param pPixmap Destination pixmap
-     * @param alu raster operation
-     * @param planemask write mask for the fill
-     * @param fg "foreground" color for the fill
-     *
-     * This call should set up the driver for doing a series of solid fills
-     * through the solid() call.  The alu raster op is one of the GX*
-     * graphics functions listed in X.h, and typically maps to a similar
-     * single-byte "ROP" setting in all hardware.  The planemask controls
-     * which bits of the destination should be affected, and will only represent
-     * the bits up to the depth of pPixmap.  The fg is the pixel value of the
-     * foreground color referred to in ROP descriptions.
-     *
-     * Note that many drivers will need to store some of the data in the driver
-     * private record, for sending to the hardware with each drawing command.
-     *
-     * The prepare_solid() call is required of all drivers, but it may fail for any
-     * reason.  Failure results in a fallback to software rendering.
-     */
-    Bool        (*prepare_solid) (PixmapPtr      pPixmap,
-                                 int            alu,
-                                 Pixel          planemask,
-                                 Pixel          fg);
-
-    /**
-     * solid() performs a solid fill set up in the last prepare_solid() call.
-     *
-     * @param pPixmap destination pixmap
-     * @param x1 left coordinate
-     * @param y1 top coordinate
-     * @param x2 right coordinate
-     * @param y2 bottom coordinate
-     *
-     * Performs the fill set up by the last prepare_solid() call, covering the
-     * area from (x1,y1) to (x2,y2) in pPixmap.  Note that the coordinates are
-     * in the coordinate space of the destination pixmap, so the driver will
-     * need to set up the hardware's offset and pitch for the destination
-     * coordinates according to the pixmap's offset and pitch within
-     * framebuffer.
-     *
-     * This call is required if prepare_solid() ever succeeds.
-     */
-    void        (*solid) (PixmapPtr      pPixmap, int x1, int y1, int x2, int y2);
-
-    /**
-     * done_solid() finishes a set of solid fills.
-     *
-     * @param pPixmap destination pixmap.
-     *
-     * The done_solid() call is called at the end of a series of consecutive
-     * solid() calls following a successful prepare_solid().  This allows drivers
-     * to finish up emitting drawing commands that were buffered, or clean up
-     * state from prepare_solid().
-     *
-     * This call is required if prepare_solid() ever succeeds.
-     */
-    void        (*done_solid) (PixmapPtr      pPixmap);
-    /** @} */
-
-    /** @name copy
-     * @{
-     */
-    /**
-     * prepare_copy() sets up the driver for doing a copy within video 
-     * memory.
-     *
-     * @param pSrcPixmap source pixmap
-     * @param pDstPixmap destination pixmap
-     * @param dx X copy direction
-     * @param dy Y copy direction
-     * @param alu raster operation
-     * @param planemask write mask for the fill
-     *
-     * This call should set up the driver for doing a series of copies from the
-     * the pSrcPixmap to the pDstPixmap.  The dx flag will be positive if the
-     * hardware should do the copy from the left to the right, and dy will be
-     * positive if the copy should be done from the top to the bottom.  This
-     * is to deal with self-overlapping copies when pSrcPixmap == pDstPixmap.
-     * If your hardware can only support blits that are (left to right, top to
-     * bottom) or (right to left, bottom to top), then you should set
-     * #UXA_TWO_BITBLT_DIRECTIONS, and UXA will break down copy operations to
-     * ones that meet those requirements.  The alu raster op is one of the GX*
-     * graphics functions listed in X.h, and typically maps to a similar
-     * single-byte "ROP" setting in all hardware.  The planemask controls which
-     * bits of the destination should be affected, and will only represent the
-     * bits up to the depth of pPixmap.
-     *
-     * Note that many drivers will need to store some of the data in the driver
-     * private record, for sending to the hardware with each drawing command.
-     *
-     * The prepare_copy() call is required of all drivers, but it may fail for any
-     * reason.  Failure results in a fallback to software rendering.
-     */
-    Bool        (*prepare_copy) (PixmapPtr       pSrcPixmap,
-                                PixmapPtr       pDstPixmap,
-                                int             dx,
-                                int             dy,
-                                int             alu,
-                                Pixel           planemask);
-
-    /**
-     * copy() performs a copy set up in the last prepare_copy call.
-     *
-     * @param pDstPixmap destination pixmap
-     * @param srcX source X coordinate
-     * @param srcY source Y coordinate
-     * @param dstX destination X coordinate
-     * @param dstY destination Y coordinate
-     * @param width width of the rectangle to be copied
-     * @param height height of the rectangle to be copied.
-     *
-     * Performs the copy set up by the last prepare_copy() call, copying the
-     * rectangle from (srcX, srcY) to (srcX + width, srcY + width) in the source
-     * pixmap to the same-sized rectangle at (dstX, dstY) in the destination
-     * pixmap.  Those rectangles may overlap in memory, if
-     * pSrcPixmap == pDstPixmap.  Note that this call does not receive the
-     * pSrcPixmap as an argument -- if it's needed in this function, it should
-     * be stored in the driver private during prepare_copy().  As with solid(),
-     * the coordinates are in the coordinate space of each pixmap, so the driver
-     * will need to set up source and destination pitches and offsets from those
-     * pixmaps, probably using uxaGetPixmapOffset() and uxa_get_pixmap_pitch().
-     *
-     * This call is required if prepare_copy ever succeeds.
-     */
-    void        (*copy) (PixmapPtr       pDstPixmap,
-                         int    srcX,
-                         int    srcY,
-                         int    dstX,
-                         int    dstY,
-                         int    width,
-                         int    height);
-
-    /**
-     * done_copy() finishes a set of copies.
-     *
-     * @param pPixmap destination pixmap.
-     *
-     * The done_copy() call is called at the end of a series of consecutive
-     * copy() calls following a successful prepare_copy().  This allows drivers
-     * to finish up emitting drawing commands that were buffered, or clean up
-     * state from prepare_copy().
-     *
-     * This call is required if prepare_copy() ever succeeds.
-     */
-    void        (*done_copy) (PixmapPtr       pDstPixmap);
-    /** @} */
-
-    /** @name composite
-     * @{
-     */
-    /**
-     * check_composite() checks to see if a composite operation could be
-     * accelerated.
-     *
-     * @param op Render operation
-     * @param pSrcPicture source Picture
-     * @param pMaskPicture mask picture
-     * @param pDstPicture destination Picture
-     *
-     * The check_composite() call checks if the driver could handle acceleration
-     * of op with the given source, mask, and destination pictures.  This allows
-     * drivers to check source and destination formats, supported operations,
-     * transformations, and component alpha state, and send operations it can't
-     * support to software rendering early on.
-     *
-     * See prepare_composite() for more details on likely issues that drivers
-     * will have in accelerating composite operations.
-     *
-     * The check_composite() call is recommended if prepare_composite() is
-     * implemented, but is not required.
-     */
-    Bool        (*check_composite) (int          op,
-                                   PicturePtr   pSrcPicture,
-                                   PicturePtr   pMaskPicture,
-                                   PicturePtr   pDstPicture);
-
-    /**
-     * prepare_composite() sets up the driver for doing a composite operation
-     * described in the Render extension protocol spec.
-     *
-     * @param op Render operation
-     * @param pSrcPicture source Picture
-     * @param pMaskPicture mask picture
-     * @param pDstPicture destination Picture
-     * @param pSrc source pixmap
-     * @param pMask mask pixmap
-     * @param pDst destination pixmap
-     *
-     * This call should set up the driver for doing a series of composite
-     * operations, as described in the Render protocol spec, with the given
-     * pSrcPicture, pMaskPicture, and pDstPicture.  The pSrc, pMask, and
-     * pDst are the pixmaps containing the pixel data, and should be used for
-     * setting the offset and pitch used for the coordinate spaces for each of
-     * the Pictures.
-     *
-     * Notes on interpreting Picture structures:
-     * - The Picture structures will always have a valid pDrawable.
-     * - The Picture structures will never have alphaMap set.
-     * - The mask Picture (and therefore pMask) may be NULL, in which case the
-     *   operation is simply src OP dst instead of src IN mask OP dst, and
-     *   mask coordinates should be ignored.
-     * - pMarkPicture may have componentAlpha set, which greatly changes
-     *   the behavior of the composite operation.  componentAlpha has no effect
-     *   when set on pSrcPicture or pDstPicture.
-     * - The source and mask Pictures may have a transformation set
-     *   (Picture->transform != NULL), which means that the source coordinates
-     *   should be transformed by that transformation, resulting in scaling,
-     *   rotation, etc.  The PictureTransformPoint() call can transform
-     *   coordinates for you.  Transforms have no effect on Pictures when used
-     *   as a destination.
-     * - The source and mask pictures may have a filter set.  PictFilterNearest
-     *   and PictFilterBilinear are defined in the Render protocol, but others
-     *   may be encountered, and must be handled correctly (usually by
-     *   prepare_composite failing, and falling back to software).  Filters have
-     *   no effect on Pictures when used as a destination.
-     * - The source and mask Pictures may have repeating set, which must be
-     *   respected.  Many chipsets will be unable to support repeating on
-     *   pixmaps that have a width or height that is not a power of two.
-     *
-     * If your hardware can't support source pictures (textures) with
-     * non-power-of-two pitches, you should set #UXA_OFFSCREEN_ALIGN_POT.
-     *
-     * Note that many drivers will need to store some of the data in the driver
-     * private record, for sending to the hardware with each drawing command.
-     *
-     * The prepare_composite() call is not required.  However, it is highly
-     * recommended for performance of antialiased font rendering and performance
-     * of cairo applications.  Failure results in a fallback to software
-     * rendering.
-     */
-    Bool        (*prepare_composite) (int                op,
-                                     PicturePtr         pSrcPicture,
-                                     PicturePtr         pMaskPicture,
-                                     PicturePtr         pDstPicture,
-                                     PixmapPtr          pSrc,
-                                     PixmapPtr          pMask,
-                                     PixmapPtr          pDst);
-
-    /**
-     * composite() performs a composite operation set up in the last
-     * prepare_composite() call.
-     *
-     * @param pDstPixmap destination pixmap
-     * @param srcX source X coordinate
-     * @param srcY source Y coordinate
-     * @param maskX source X coordinate
-     * @param maskY source Y coordinate
-     * @param dstX destination X coordinate
-     * @param dstY destination Y coordinate
-     * @param width destination rectangle width
-     * @param height destination rectangle height
-     *
-     * Performs the composite operation set up by the last prepare_composite()
-     * call, to the rectangle from (dstX, dstY) to (dstX + width, dstY + height)
-     * in the destination Pixmap.  Note that if a transformation was set on
-     * the source or mask Pictures, the source rectangles may not be the same
-     * size as the destination rectangles and filtering.  Getting the coordinate
-     * transformation right at the subpixel level can be tricky, and rendercheck
-     * can test this for you.
-     *
-     * This call is required if prepare_composite() ever succeeds.
-     */
-    void        (*composite) (PixmapPtr         pDst,
-                              int       srcX,
-                              int        srcY,
-                              int        maskX,
-                              int        maskY,
-                              int        dstX,
-                              int        dstY,
-                              int        width,
-                              int        height);
-
-    /**
-     * done_composite() finishes a set of composite operations.
-     *
-     * @param pPixmap destination pixmap.
-     *
-     * The done_composite() call is called at the end of a series of consecutive
-     * composite() calls following a successful prepare_composite().  This allows
-     * drivers to finish up emitting drawing commands that were buffered, or
-     * clean up state from prepare_composite().
-     *
-     * This call is required if prepare_composite() ever succeeds.
-     */
-    void        (*done_composite) (PixmapPtr         pDst);
-    /** @} */
-
-    /**
-     * put_image() loads a rectangle of data from src into pDst.
-     *
-     * @param pDst destination pixmap
-     * @param x destination X coordinate.
-     * @param y destination Y coordinate
-     * @param width width of the rectangle to be copied
-     * @param height height of the rectangle to be copied
-     * @param src pointer to the beginning of the source data
-     * @param src_pitch pitch (in bytes) of the lines of source data.
-     *
-     * put_image() copies data in system memory beginning at src (with
-     * pitch src_pitch) into the destination pixmap from (x, y) to
-     * (x + width, y + height).  This is typically done with hostdata uploads,
-     * where the CPU sets up a blit command on the hardware with instructions
-     * that the blit data will be fed through some sort of aperture on the card.
-     *
-     * put_image() is most important for the performance of uxa_glyphs()
-     * (antialiased font drawing) by allowing pipelining of data uploads,
-     * avoiding a sync of the card after each glyph.
-     * 
-     * @return TRUE if the driver successfully uploaded the data.  FALSE
-     * indicates that UXA should fall back to doing the upload in software.
-     *
-     * put_image() is not required, but is recommended if composite
-     * acceleration is supported.
-     */
-    Bool        (*put_image) (PixmapPtr            pDst,
-				   int                  x,
-				   int                  y,
-				   int                  w,
-				   int                  h,
-                                   char                 *src,
-                                   int                  src_pitch);
-
-    /**
-     * get_image() loads a rectangle of data from pSrc into dst
-     *
-     * @param pSrc source pixmap
-     * @param x source X coordinate.
-     * @param y source Y coordinate
-     * @param width width of the rectangle to be copied
-     * @param height height of the rectangle to be copied
-     * @param dst pointer to the beginning of the destination data
-     * @param dst_pitch pitch (in bytes) of the lines of destination data.
-     *
-     * get_image() copies data from offscreen memory in pSrc from
-     * (x, y) to (x + width, y + height), to system memory starting at
-     * dst (with pitch dst_pitch).  This would usually be done
-     * using scatter-gather DMA, supported by a DRM call, or by blitting to AGP
-     * and then synchronously reading from AGP.  Because the implementation
-     * might be synchronous, UXA leaves it up to the driver to call
-     * uxa_mark_sync() if get_image() was asynchronous.  This is in
-     * contrast to most other acceleration calls in UXA.
-     *
-     * @return TRUE if the driver successfully downloaded the data.  FALSE
-     * indicates that UXA should fall back to doing the download in software.
-     *
-     * get_image() is not required, but is highly recommended.
-     */
-    Bool (*get_image)(PixmapPtr pSrc,
-                               int x,  int y,
-                               int w,  int h,
-                               char *dst,  int dst_pitch);
-
-    /** @{ */
-    /**
-     * prepare_access() is called before CPU access to an offscreen pixmap.
-     *
-     * @param pPix the pixmap being accessed
-     * @param index the index of the pixmap being accessed.
-     *
-     * prepare_access() will be called before CPU access to an offscreen pixmap.
-     * This can be used to set up hardware surfaces for byteswapping or
-     * untiling, or to adjust the pixmap's devPrivate.ptr for the purpose of
-     * making CPU access use a different aperture.
-     *
-     * The index is one of #UXA_PREPARE_DEST, #UXA_PREPARE_SRC, or
-     * #UXA_PREPARE_MASK, indicating which pixmap is in question.  Since only up
-     * to three pixmaps will have prepare_access() called on them per operation,
-     * drivers can have a small, statically-allocated space to maintain state
-     * for prepare_access() and finish_access() in.  Note that the same pixmap may
-     * have prepare_access() called on it more than once, for uxample when doing
-     * a copy within the same pixmap (so it gets prepare_access as()
-     * #UXA_PREPARE_DEST and then as #UXA_PREPARE_SRC).
-     *
-     * prepare_access() may fail.  An uxample might be the case of hardware that
-     * can set up 1 or 2 surfaces for CPU access, but not 3.  If prepare_access()
-     * fails, UXA will migrate the pixmap to system memory.
-     * get_image() must be implemented and must not fail if a driver
-     * wishes to fail in prepare_access().  prepare_access() must not fail when
-     * pPix is the visible screen, because the visible screen can not be
-     * migrated.
-     *
-     * @return TRUE if prepare_access() successfully prepared the pixmap for CPU
-     * drawing.
-     * @return FALSE if prepare_access() is unsuccessful and UXA should use
-     * get_image() to migate the pixmap out.
-     */
-    Bool	(*prepare_access)(PixmapPtr pPix, uxa_access_t access);
-
-    /**
-     * finish_access() is called after CPU access to an offscreen pixmap.
-     *
-     * @param pPix the pixmap being accessed
-     * @param index the index of the pixmap being accessed.
-     *
-     * finish_access() will be called after finishing CPU access of an offscreen
-     * pixmap set up by prepare_access().  Note that the finish_access() will not be
-     * called if prepare_access() failed.
-     */
-    void	(*finish_access)(PixmapPtr pPix);
-
-    /**
-     * PixmapIsOffscreen() is an optional driver replacement to
-     * uxa_pixmap_is_offscreen(). Set to NULL if you want the standard behaviour
-     * of uxa_pixmap_is_offscreen().
-     *
-     * @param pPix the pixmap
-     * @return TRUE if the given drawable is in framebuffer memory.
-     *
-     * uxa_pixmap_is_offscreen() is used to determine if a pixmap is in offscreen
-     * memory, meaning that acceleration could probably be done to it, and that it
-     * will need to be wrapped by prepare_access()/finish_access() when accessing it
-     * with the CPU.
-     *
-     *
-     */
-    Bool	(*pixmap_is_offscreen)(PixmapPtr pPix);
+	/**
+	 * uxa_major and uxa_minor should be set by the driver to the version of
+	 * UXA which the driver was compiled for (or configures itself at
+	 * runtime to support).  This allows UXA to extend the structure for
+	 * new features without breaking ABI for drivers compiled against
+	 * older versions.
+	 */
+	int uxa_major, uxa_minor;
+
+	/**
+	 * The flags field is bitfield of boolean values controlling UXA's
+	 * behavior.
+	 *
+	 * The flags include UXA_TWO_BITBLT_DIRECTIONS.
+	 */
+	int flags;
+
+	/** @name solid
+	 * @{
+	 */
+	/**
+	 * check_solid() checks whether the driver can do a solid fill to this drawable.
+	 * @param pDrawable Destination drawable
+	 * @param alu raster operation
+	 * @param planemask write mask for the fill
+	 *
+	 * The check_solid() call is recommended if prepare_solid() is
+	 * implemented, but is not required.
+	 */
+	Bool(*check_solid) (DrawablePtr pDrawable, int alu, Pixel planemask);
+
+	/**
+	 * prepare_solid() sets up the driver for doing a solid fill.
+	 * @param pPixmap Destination pixmap
+	 * @param alu raster operation
+	 * @param planemask write mask for the fill
+	 * @param fg "foreground" color for the fill
+	 *
+	 * This call should set up the driver for doing a series of solid fills
+	 * through the solid() call.  The alu raster op is one of the GX*
+	 * graphics functions listed in X.h, and typically maps to a similar
+	 * single-byte "ROP" setting in all hardware.  The planemask controls
+	 * which bits of the destination should be affected, and will only
+	 * represent the bits up to the depth of pPixmap.  The fg is the pixel
+	 * value of the foreground color referred to in ROP descriptions.
+	 *
+	 * Note that many drivers will need to store some of the data in the
+	 * driver private record, for sending to the hardware with each
+	 * drawing command.
+	 *
+	 * The prepare_solid() call is required of all drivers, but it may fail
+	 * for any reason.  Failure results in a fallback to software rendering.
+	 */
+	Bool(*prepare_solid) (PixmapPtr pPixmap,
+			      int alu, Pixel planemask, Pixel fg);
+
+	/**
+	 * solid() performs a solid fill set up in the last prepare_solid()
+	 * call.
+	 *
+	 * @param pPixmap destination pixmap
+	 * @param x1 left coordinate
+	 * @param y1 top coordinate
+	 * @param x2 right coordinate
+	 * @param y2 bottom coordinate
+	 *
+	 * Performs the fill set up by the last prepare_solid() call,
+	 * covering the area from (x1,y1) to (x2,y2) in pPixmap.  Note that
+	 * the coordinates are in the coordinate space of the destination
+	 * pixmap, so the driver will need to set up the hardware's offset
+	 * and pitch for the destination coordinates according to the pixmap's
+	 * offset and pitch within framebuffer.
+	 *
+	 * This call is required if prepare_solid() ever succeeds.
+	 */
+	void (*solid) (PixmapPtr pPixmap, int x1, int y1, int x2, int y2);
+
+	/**
+	 * done_solid() finishes a set of solid fills.
+	 *
+	 * @param pPixmap destination pixmap.
+	 *
+	 * The done_solid() call is called at the end of a series of consecutive
+	 * solid() calls following a successful prepare_solid().  This allows
+	 * drivers to finish up emitting drawing commands that were buffered, or
+	 * clean up state from prepare_solid().
+	 *
+	 * This call is required if prepare_solid() ever succeeds.
+	 */
+	void (*done_solid) (PixmapPtr pPixmap);
+	/** @} */
+
+	/** @name copy
+	 * @{
+	 */
+	/**
+	 * check_copy() checks whether the driver can blit between the two Pictures
+	 */
+	Bool(*check_copy) (PixmapPtr pSrc, PixmapPtr pDst, int alu, Pixel planemask);
+	/**
+	 * prepare_copy() sets up the driver for doing a copy within video
+	 * memory.
+	 -     *
+	 * @param pSrcPixmap source pixmap
+	 * @param pDstPixmap destination pixmap
+	 * @param dx X copy direction
+	 * @param dy Y copy direction
+	 * @param alu raster operation
+	 * @param planemask write mask for the fill
+	 *
+	 * This call should set up the driver for doing a series of copies
+	 * from the pSrcPixmap to the pDstPixmap.  The dx flag will be
+	 * positive if the
+	 * hardware should do the copy from the left to the right, and dy will
+	 * be positive if the copy should be done from the top to the bottom.
+	 * This is to deal with self-overlapping copies when
+	 * pSrcPixmap == pDstPixmap.
+	 *
+	 * If your hardware can only support blits that are (left to right,
+	 * top to bottom) or (right to left, bottom to top), then you should
+	 * set #UXA_TWO_BITBLT_DIRECTIONS, and UXA will break down copy
+	 * operations to ones that meet those requirements.  The alu raster
+	 * op is one of the GX* graphics functions listed in X.h, and
+	 * typically maps to a similar single-byte "ROP" setting in all
+	 * hardware.  The planemask controls which bits of the destination
+	 * should be affected, and will only represent the bits up to the
+	 * depth of pPixmap.
+	 *
+	 * Note that many drivers will need to store some of the data in the
+	 * driver private record, for sending to the hardware with each
+	 * drawing command.
+	 *
+	 * The prepare_copy() call is required of all drivers, but it may fail
+	 * for any reason.  Failure results in a fallback to software rendering.
+	 */
+	Bool(*prepare_copy) (PixmapPtr pSrcPixmap,
+			     PixmapPtr pDstPixmap,
+			     int dx, int dy, int alu, Pixel planemask);
+
+	/**
+	 * copy() performs a copy set up in the last prepare_copy call.
+	 *
+	 * @param pDstPixmap destination pixmap
+	 * @param srcX source X coordinate
+	 * @param srcY source Y coordinate
+	 * @param dstX destination X coordinate
+	 * @param dstY destination Y coordinate
+	 * @param width width of the rectangle to be copied
+	 * @param height height of the rectangle to be copied.
+	 *
+	 * Performs the copy set up by the last prepare_copy() call, copying the
+	 * rectangle from (srcX, srcY) to (srcX + width, srcY + width) in the
+	 * source pixmap to the same-sized rectangle at (dstX, dstY) in the
+	 * destination pixmap.  Those rectangles may overlap in memory, if
+	 * pSrcPixmap == pDstPixmap.  Note that this call does not receive the
+	 * pSrcPixmap as an argument -- if it's needed in this function, it
+	 * should be stored in the driver private during prepare_copy().  As
+	 * with solid(), the coordinates are in the coordinate space of each
+	 * pixmap, so the driver will need to set up source and destination
+	 * pitches and offsets from those pixmaps, probably using
+	 * uxaGetPixmapOffset() and uxa_get_pixmap_pitch().
+	 *
+	 * This call is required if prepare_copy ever succeeds.
+	 */
+	void (*copy) (PixmapPtr pDstPixmap,
+		      int srcX,
+		      int srcY, int dstX, int dstY, int width, int height);
+
+	/**
+	 * done_copy() finishes a set of copies.
+	 *
+	 * @param pPixmap destination pixmap.
+	 *
+	 * The done_copy() call is called at the end of a series of consecutive
+	 * copy() calls following a successful prepare_copy().  This allows
+	 * drivers to finish up emitting drawing commands that were buffered,
+	 * or clean up state from prepare_copy().
+	 *
+	 * This call is required if prepare_copy() ever succeeds.
+	 */
+	void (*done_copy) (PixmapPtr pDstPixmap);
+	/** @} */
+
+	/** @name composite
+	 * @{
+	 */
+	/**
+	 * check_composite() checks to see if a composite operation could be
+	 * accelerated.
+	 *
+	 * @param op Render operation
+	 * @param pSrcPicture source Picture
+	 * @param pMaskPicture mask picture
+	 * @param pDstPicture destination Picture
+	 * @param width The width of the composite operation
+	 * @param height The height of the composite operation
+	 *
+	 * The check_composite() call checks if the driver could handle
+	 * acceleration of op with the given source, mask, and destination
+	 * pictures.  This allows drivers to check source and destination
+	 * formats, supported operations, transformations, and component
+	 * alpha state, and send operations it can't support to software
+	 * rendering early on.
+	 *
+	 * See prepare_composite() for more details on likely issues that
+	 * drivers will have in accelerating composite operations.
+	 *
+	 * The check_composite() call is recommended if prepare_composite() is
+	 * implemented, but is not required.
+	 */
+	Bool(*check_composite) (int op,
+				PicturePtr pSrcPicture,
+				PicturePtr pMaskPicture,
+				PicturePtr pDstPicture,
+				int width, int height);
+
+	/**
+	 * check_composite_target() checks to see if the destination of the composite
+	 * operation can be used without midification.
+	 *
+	 * @param pixmap Destination Pixmap
+	 *
+	 * The check_composite_target() call is recommended if prepare_composite() is
+	 * implemented, but is not required.
+	 */
+	Bool(*check_composite_target) (PixmapPtr pixmap);
+
+	/**
+	 * check_composite_texture() checks to see if a source to the composite
+	 * operation can be used without midification.
+	 *
+	 * @param pScreen Screen
+	 * @param pPicture Picture
+	 *
+	 * The check_composite_texture() call is recommended if prepare_composite() is
+	 * implemented, but is not required.
+	 */
+	Bool(*check_composite_texture) (ScreenPtr pScreen,
+					PicturePtr pPicture);
+
+	/**
+	 * prepare_composite() sets up the driver for doing a composite
+	 * operation described in the Render extension protocol spec.
+	 *
+	 * @param op Render operation
+	 * @param pSrcPicture source Picture
+	 * @param pMaskPicture mask picture
+	 * @param pDstPicture destination Picture
+	 * @param pSrc source pixmap
+	 * @param pMask mask pixmap
+	 * @param pDst destination pixmap
+	 *
+	 * This call should set up the driver for doing a series of composite
+	 * operations, as described in the Render protocol spec, with the given
+	 * pSrcPicture, pMaskPicture, and pDstPicture.  The pSrc, pMask, and
+	 * pDst are the pixmaps containing the pixel data, and should be used
+	 * for setting the offset and pitch used for the coordinate spaces for
+	 * each of the Pictures.
+	 *
+	 * Notes on interpreting Picture structures:
+	 * - The Picture structures will always have a valid pDrawable.
+	 * - The Picture structures will never have alphaMap set.
+	 * - The mask Picture (and therefore pMask) may be NULL, in which case
+	 *   the operation is simply src OP dst instead of src IN mask OP dst,
+	 *   and mask coordinates should be ignored.
+	 * - pMarkPicture may have componentAlpha set, which greatly changes
+	 *   the behavior of the composite operation.  componentAlpha has no
+	 *   effect when set on pSrcPicture or pDstPicture.
+	 * - The source and mask Pictures may have a transformation set
+	 *   (Picture->transform != NULL), which means that the source
+	 *   coordinates should be transformed by that transformation,
+	 *   resulting in scaling, rotation, etc.  The PictureTransformPoint()
+	 *   call can transform coordinates for you.  Transforms have no
+	 *   effect on Pictures when used as a destination.
+	 * - The source and mask pictures may have a filter set.
+	 *   PictFilterNearest and PictFilterBilinear are defined in the
+	 *   Render protocol, but others may be encountered, and must be
+	 *   handled correctly (usually by prepare_composite failing, and
+	 *   falling back to software).  Filters have
+	 *   no effect on Pictures when used as a destination.
+	 * - The source and mask Pictures may have repeating set, which must be
+	 *   respected.  Many chipsets will be unable to support repeating on
+	 *   pixmaps that have a width or height that is not a power of two.
+	 *
+	 * If your hardware can't support source pictures (textures) with
+	 * non-power-of-two pitches, you should set #UXA_OFFSCREEN_ALIGN_POT.
+	 *
+	 * Note that many drivers will need to store some of the data in the
+	 * driver private record, for sending to the hardware with each
+	 * drawing command.
+	 *
+	 * The prepare_composite() call is not required.  However, it is highly
+	 * recommended for performance of antialiased font rendering and
+	 * performance of cairo applications.  Failure results in a fallback
+	 * to software rendering.
+	 */
+	Bool(*prepare_composite) (int op,
+				  PicturePtr pSrcPicture,
+				  PicturePtr pMaskPicture,
+				  PicturePtr pDstPicture,
+				  PixmapPtr pSrc,
+				  PixmapPtr pMask, PixmapPtr pDst);
+
+	/**
+	 * composite() performs a composite operation set up in the last
+	 * prepare_composite() call.
+	 *
+	 * @param pDstPixmap destination pixmap
+	 * @param srcX source X coordinate
+	 * @param srcY source Y coordinate
+	 * @param maskX source X coordinate
+	 * @param maskY source Y coordinate
+	 * @param dstX destination X coordinate
+	 * @param dstY destination Y coordinate
+	 * @param width destination rectangle width
+	 * @param height destination rectangle height
+	 *
+	 * Performs the composite operation set up by the last
+	 * prepare_composite() call, to the rectangle from (dstX, dstY) to
+	 * (dstX + width, dstY + height) in the destination Pixmap.  Note that
+	 * if a transformation was set on the source or mask Pictures, the
+	 * source rectangles may not be the same size as the destination
+	 * rectangles and filtering.  Getting the coordinate transformation
+	 * right at the subpixel level can be tricky, and rendercheck
+	 * can test this for you.
+	 *
+	 * This call is required if prepare_composite() ever succeeds.
+	 */
+	void (*composite) (PixmapPtr pDst,
+			   int srcX,
+			   int srcY,
+			   int maskX,
+			   int maskY,
+			   int dstX, int dstY, int width, int height);
+
+	/**
+	 * done_composite() finishes a set of composite operations.
+	 *
+	 * @param pPixmap destination pixmap.
+	 *
+	 * The done_composite() call is called at the end of a series of
+	 * consecutive composite() calls following a successful
+	 * prepare_composite().  This allows drivers to finish up emitting
+	 * drawing commands that were buffered, or clean up state from
+	 * prepare_composite().
+	 *
+	 * This call is required if prepare_composite() ever succeeds.
+	 */
+	void (*done_composite) (PixmapPtr pDst);
+	/** @} */
+
+	/**
+	 * put_image() loads a rectangle of data from src into pDst.
+	 *
+	 * @param pDst destination pixmap
+	 * @param x destination X coordinate.
+	 * @param y destination Y coordinate
+	 * @param width width of the rectangle to be copied
+	 * @param height height of the rectangle to be copied
+	 * @param src pointer to the beginning of the source data
+	 * @param src_pitch pitch (in bytes) of the lines of source data.
+	 *
+	 * put_image() copies data in system memory beginning at src (with
+	 * pitch src_pitch) into the destination pixmap from (x, y) to
+	 * (x + width, y + height).  This is typically done with hostdata
+	 * uploads, where the CPU sets up a blit command on the hardware with
+	 * instructions that the blit data will be fed through some sort of
+	 * aperture on the card.
+	 *
+	 * put_image() is most important for the performance of uxa_glyphs()
+	 * (antialiased font drawing) by allowing pipelining of data uploads,
+	 * avoiding a sync of the card after each glyph.
+	 *
+	 * @return TRUE if the driver successfully uploaded the data.  FALSE
+	 * indicates that UXA should fall back to doing the upload in software.
+	 *
+	 * put_image() is not required, but is recommended if composite
+	 * acceleration is supported.
+	 */
+	Bool(*put_image) (PixmapPtr pDst,
+			  int x,
+			  int y, int w, int h, char *src, int src_pitch);
+
+	/**
+	 * get_image() loads a rectangle of data from pSrc into dst
+	 *
+	 * @param pSrc source pixmap
+	 * @param x source X coordinate.
+	 * @param y source Y coordinate
+	 * @param width width of the rectangle to be copied
+	 * @param height height of the rectangle to be copied
+	 * @param dst pointer to the beginning of the destination data
+	 * @param dst_pitch pitch (in bytes) of the lines of destination data.
+	 *
+	 * get_image() copies data from offscreen memory in pSrc from
+	 * (x, y) to (x + width, y + height), to system memory starting at
+	 * dst (with pitch dst_pitch).  This would usually be done
+	 * using scatter-gather DMA, supported by a DRM call, or by blitting
+	 * to AGP and then synchronously reading from AGP.
+	 *
+	 * @return TRUE if the driver successfully downloaded the data.  FALSE
+	 * indicates that UXA should fall back to doing the download in
+	 * software.
+	 *
+	 * get_image() is not required, but is highly recommended.
+	 */
+	Bool(*get_image) (PixmapPtr pSrc,
+			  int x, int y,
+			  int w, int h, char *dst, int dst_pitch);
+
+	/** @{ */
+	/**
+	 * prepare_access() is called before CPU access to an offscreen pixmap.
+	 *
+	 * @param pPix the pixmap being accessed
+	 * @param index the index of the pixmap being accessed.
+	 *
+	 * prepare_access() will be called before CPU access to an offscreen
+	 * pixmap.
+	 *
+	 * This can be used to set up hardware surfaces for byteswapping or
+	 * untiling, or to adjust the pixmap's devPrivate.ptr for the purpose of
+	 * making CPU access use a different aperture.
+	 *
+	 * The index is one of #UXA_PREPARE_DEST, #UXA_PREPARE_SRC, or
+	 * #UXA_PREPARE_MASK, indicating which pixmap is in question.  Since
+	 * only up to three pixmaps will have prepare_access() called on them
+	 * per operation, drivers can have a small, statically-allocated space
+	 * to maintain state for prepare_access() and finish_access() in.
+	 * Note that the same pixmap may have prepare_access() called on it
+	 * more than once, for uxample when doing a copy within the same
+	 * pixmap (so it gets prepare_access as
+	 * #UXA_PREPARE_DEST and then as #UXA_PREPARE_SRC).
+	 *
+	 * prepare_access() may fail.  An example might be the case of
+	 * hardware that can set up 1 or 2 surfaces for CPU access, but not
+	 * 3.  If prepare_access()
+	 * fails, UXA will migrate the pixmap to system memory.
+	 * get_image() must be implemented and must not fail if a driver
+	 * wishes to fail in prepare_access().  prepare_access() must not
+	 * fail when pPix is the visible screen, because the visible screen
+	 * can not be migrated.
+	 *
+	 * @return TRUE if prepare_access() successfully prepared the pixmap
+	 * for CPU drawing.
+	 * @return FALSE if prepare_access() is unsuccessful and UXA should use
+	 * get_image() to migate the pixmap out.
+	 */
+	Bool(*prepare_access) (PixmapPtr pPix, uxa_access_t access);
+
+	/**
+	 * finish_access() is called after CPU access to an offscreen pixmap.
+	 *
+	 * @param pPix the pixmap being accessed
+	 * @param index the index of the pixmap being accessed.
+	 *
+	 * finish_access() will be called after finishing CPU access of an
+	 * offscreen pixmap set up by prepare_access().  Note that the
+	 * finish_access() will not be called if prepare_access() failed.
+	 */
+	void (*finish_access) (PixmapPtr pPix);
+
+	/**
+	 * PixmapIsOffscreen() is an optional driver replacement to
+	 * uxa_pixmap_is_offscreen(). Set to NULL if you want the standard
+	 * behaviour of uxa_pixmap_is_offscreen().
+	 *
+	 * @param pPix the pixmap
+	 * @return TRUE if the given drawable is in framebuffer memory.
+	 *
+	 * uxa_pixmap_is_offscreen() is used to determine if a pixmap is in
+	 * offscreen memory, meaning that acceleration could probably be done
+	 * to it, and that it will need to be wrapped by
+	 * prepare_access()/finish_access() when accessing it with the CPU.
+	 */
+	Bool(*pixmap_is_offscreen) (PixmapPtr pPix);
 
-    /** @} */
+	/** @} */
 } uxa_driver_t;
 
 /** @name UXA driver flags
@@ -505,20 +545,32 @@ typedef struct _UxaDriver {
 
 /** @} */
 
-uxa_driver_t *
-uxa_driver_alloc(void);
+/** @name UXA CreatePixmap hint flags
+ * @{
+ */
+/**
+ * Flag to hint that the first operation on the pixmap will be a
+ * prepare_access.
+ */
+#define UXA_CREATE_PIXMAP_FOR_MAP	0x20000000
+/** @} */
 
-Bool
-uxa_driver_init(ScreenPtr screen, uxa_driver_t *uxa_driver);
+uxa_driver_t *uxa_driver_alloc(void);
+
+Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver);
+Bool uxa_resources_init(ScreenPtr screen);
 
-void
-uxa_driver_fini(ScreenPtr pScreen);
+void uxa_driver_fini(ScreenPtr pScreen);
 
-CARD32
-uxa_get_pixmap_first_pixel (PixmapPtr pPixmap);
+CARD32 uxa_get_pixmap_first_pixel(PixmapPtr pPixmap);
+
+Bool
+uxa_get_color_for_pixmap (PixmapPtr	 pixmap,
+			  CARD32	 src_format,
+			  CARD32	 dst_format,
+			  CARD32	*pixel);
 
-void
-uxa_set_fallback_debug (ScreenPtr screen, Bool enable);
+void uxa_set_fallback_debug(ScreenPtr screen, Bool enable);
 
 /**
  * Returns TRUE if the given planemask covers all the significant bits in the
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h	2011-02-08 11:14:00.000000000 +0100
@@ -41,10 +41,6 @@
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
-#ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
-#endif
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
@@ -64,6 +60,15 @@
 #endif
 #include "damage.h"
 
+/* Provide substitutes for gcc's __FUNCTION__ on other compilers */
+#if !defined(__GNUC__) && !defined(__FUNCTION__)
+# if defined(__STDC__) && (__STDC_VERSION__>=199901L)	/* C99 */
+#  define __FUNCTION__ __func__
+# else
+#  define __FUNCTION__ ""
+# endif
+#endif
+
 /* 1.6 and earlier server compat */
 #ifndef miGetCompositeClip
 #define miCopyRegion fbCopyRegion
@@ -81,8 +86,7 @@ if (uxa_get_screen(screen)->fallback_deb
 	ErrorF x;						\
 }
 
-char
-uxa_drawable_location(DrawablePtr pDrawable);
+char uxa_drawable_location(DrawablePtr pDrawable);
 
 #if DEBUG_PIXMAP
 #define DBG_PIXMAP(a) ErrorF a
@@ -91,68 +95,54 @@ uxa_drawable_location(DrawablePtr pDrawa
 #endif
 
 typedef struct {
-    unsigned char sha1[20];
-} uxa_cached_glyph_t;
+	PicturePtr picture;	/* Where the glyphs of the cache are stored */
+	GlyphPtr *glyphs;
+	uint16_t count;
+	uint16_t evict;
+} uxa_glyph_cache_t;
+
+#define UXA_NUM_GLYPH_CACHE_FORMATS 2
 
 typedef struct {
-    /* The identity of the cache, statically configured at initialization */
-    unsigned int format;
-    int glyphWidth;
-    int glyphHeight;
-
-    int size; /* Size of cache; eventually this should be dynamically determined */
-
-    /* Hash table mapping from glyph sha1 to position in the glyph; we use
-     * open addressing with a hash table size determined based on size and large
-     * enough so that we always have a good amount of free space, so we can
-     * use linear probing. (Linear probing is preferrable to double hashing
-     * here because it allows us to easily remove entries.)
-     */
-    int *hashEntries;
-    int hashSize;
-    
-    uxa_cached_glyph_t *glyphs;
-    int glyphCount; /* Current number of glyphs */
-    
-    PicturePtr picture;   /* Where the glyphs of the cache are stored */
-    int yOffset;          /* y location within the picture where the cache starts */
-    int columns;          /* Number of columns the glyphs are layed out in */
-    int evictionPosition; /* Next random position to evict a glyph */
-} uxa_glyph_cache_t;
+	uint32_t color;
+	PicturePtr picture;
+} uxa_solid_cache_t;
 
-#define UXA_NUM_GLYPH_CACHES 4
+#define UXA_NUM_SOLID_CACHE 16
 
-typedef void (*EnableDisableFBAccessProcPtr)(int, Bool);
+typedef void (*EnableDisableFBAccessProcPtr) (int, Bool);
 typedef struct {
-    uxa_driver_t		*info;
-    CreateGCProcPtr 		 SavedCreateGC;
-    CloseScreenProcPtr 		 SavedCloseScreen;
-    GetImageProcPtr 		 SavedGetImage;
-    GetSpansProcPtr 		 SavedGetSpans;
-#ifndef SERVER_1_5
-    PaintWindowBackgroundProcPtr SavedPaintWindowBackground;
-    PaintWindowBorderProcPtr	 SavedPaintWindowBorder;
-#endif
-    CreatePixmapProcPtr 	 SavedCreatePixmap;
-    DestroyPixmapProcPtr 	 SavedDestroyPixmap;
-    CopyWindowProcPtr 		 SavedCopyWindow;
-    ChangeWindowAttributesProcPtr SavedChangeWindowAttributes;
-    BitmapToRegionProcPtr        SavedBitmapToRegion;
+	uxa_driver_t *info;
+	CreateGCProcPtr SavedCreateGC;
+	CloseScreenProcPtr SavedCloseScreen;
+	GetImageProcPtr SavedGetImage;
+	GetSpansProcPtr SavedGetSpans;
+	CreatePixmapProcPtr SavedCreatePixmap;
+	DestroyPixmapProcPtr SavedDestroyPixmap;
+	CopyWindowProcPtr SavedCopyWindow;
+	ChangeWindowAttributesProcPtr SavedChangeWindowAttributes;
+	BitmapToRegionProcPtr SavedBitmapToRegion;
 #ifdef RENDER
-    CompositeProcPtr             SavedComposite;
-    TrianglesProcPtr		 SavedTriangles;
-    GlyphsProcPtr                SavedGlyphs;
-    TrapezoidsProcPtr            SavedTrapezoids;
-    AddTrapsProcPtr		 SavedAddTraps;
+	CompositeProcPtr SavedComposite;
+	CompositeRectsProcPtr SavedCompositeRects;
+	TrianglesProcPtr SavedTriangles;
+	GlyphsProcPtr SavedGlyphs;
+	TrapezoidsProcPtr SavedTrapezoids;
+	AddTrapsProcPtr SavedAddTraps;
+	UnrealizeGlyphProcPtr SavedUnrealizeGlyph;
 #endif
-    EnableDisableFBAccessProcPtr SavedEnableDisableFBAccess;
-
-    Bool			 fallback_debug;
-    Bool			 swappedOut;
-    unsigned			 disableFbCount;
-    unsigned			 offScreenCounter;
+	EnableDisableFBAccessProcPtr SavedEnableDisableFBAccess;
 
-    uxa_glyph_cache_t             glyphCaches[UXA_NUM_GLYPH_CACHES];
+	Bool fallback_debug;
+	Bool swappedOut;
+	unsigned disableFbCount;
+	unsigned offScreenCounter;
+
+	uxa_glyph_cache_t glyphCaches[UXA_NUM_GLYPH_CACHE_FORMATS];
+
+	PicturePtr solid_clear, solid_black, solid_white;
+	uxa_solid_cache_t solid_cache[UXA_NUM_SOLID_CACHE];
+	int solid_cache_size;
 } uxa_screen_t;
 
 /*
@@ -167,15 +157,18 @@ typedef struct {
     (PixmapWidthPaddingInfo[d].padRoundUp+1)))
 #endif
 
+#if HAS_DEVPRIVATEKEYREC
+extern DevPrivateKeyRec uxa_screen_index;
+#else
 extern int uxa_screen_index;
-static inline uxa_screen_t *
-uxa_get_screen(ScreenPtr screen)
+#endif
+
+static inline uxa_screen_t *uxa_get_screen(ScreenPtr screen)
 {
-#ifdef SERVER_1_5
-    return (uxa_screen_t *)dixLookupPrivate(&screen->devPrivates,
-					    &uxa_screen_index);
+#if HAS_DEVPRIVATEKEYREC
+	return dixGetPrivate(&screen->devPrivates, &uxa_screen_index);
 #else
-    return screen->devPrivates[uxa_screen_index].ptr;
+	return dixLookupPrivate(&screen->devPrivates, &uxa_screen_index);
 #endif
 }
 
@@ -186,283 +179,255 @@ uxa_get_screen(ScreenPtr screen)
 #define UXA_ALIGN2(offset, align) (((offset) + (align) - 1) & ~((align) - 1))
 
 typedef struct {
-    INT16 xSrc;
-    INT16 ySrc;
-    INT16 xDst;
-    INT16 yDst;
-    INT16 width;
-    INT16 height;
+	INT16 xSrc;
+	INT16 ySrc;
+	INT16 xDst;
+	INT16 yDst;
+	INT16 width;
+	INT16 height;
 } uxa_composite_rect_t;
 
 /**
  * exaDDXDriverInit must be implemented by the DDX using EXA, and is the place
  * to set EXA options or hook in screen functions to handle using EXA as the AA.
   */
-void exaDDXDriverInit (ScreenPtr pScreen);
+void exaDDXDriverInit(ScreenPtr pScreen);
 
-Bool
-uxa_prepare_access_window(WindowPtr pWin);
+Bool uxa_prepare_access_window(WindowPtr pWin);
 
-void
-uxa_finish_access_window(WindowPtr pWin);
+void uxa_finish_access_window(WindowPtr pWin);
 
 /* uxa-unaccel.c */
-Bool
-uxa_prepare_access_gc(GCPtr pGC);
+Bool uxa_prepare_access_gc(GCPtr pGC);
 
-void
-uxa_finish_access_gc(GCPtr pGC);
+void uxa_finish_access_gc(GCPtr pGC);
 
 void
-uxa_check_fill_spans  (DrawablePtr pDrawable, GCPtr pGC, int nspans,
-		   DDXPointPtr ppt, int *pwidth, int fSorted);
+uxa_check_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int nspans,
+		     DDXPointPtr ppt, int *pwidth, int fSorted);
 
 void
-uxa_check_set_spans (DrawablePtr pDrawable, GCPtr pGC, char *psrc,
-		 DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);
+uxa_check_set_spans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
+		    DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);
 
 void
-uxa_check_put_image (DrawablePtr pDrawable, GCPtr pGC, int depth,
-		 int x, int y, int w, int h, int leftPad, int format,
-		 char *bits);
+uxa_check_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth,
+		    int x, int y, int w, int h, int leftPad, int format,
+		    char *bits);
 
 RegionPtr
-uxa_check_copy_area (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-		 int srcx, int srcy, int w, int h, int dstx, int dsty);
+uxa_check_copy_area(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		    int srcx, int srcy, int w, int h, int dstx, int dsty);
 
 RegionPtr
-uxa_check_copy_plane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-		  int srcx, int srcy, int w, int h, int dstx, int dsty,
-		  unsigned long bitPlane);
+uxa_check_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		     int srcx, int srcy, int w, int h, int dstx, int dsty,
+		     unsigned long bitPlane);
 
 void
-uxa_check_poly_point (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
-		  DDXPointPtr pptInit);
+uxa_check_poly_point(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
+		     DDXPointPtr pptInit);
 
 void
-uxa_check_poly_lines (DrawablePtr pDrawable, GCPtr pGC,
-		  int mode, int npt, DDXPointPtr ppt);
+uxa_check_poly_lines(DrawablePtr pDrawable, GCPtr pGC,
+		     int mode, int npt, DDXPointPtr ppt);
 
 void
-uxa_check_poly_segment (DrawablePtr pDrawable, GCPtr pGC,
-		    int nsegInit, xSegment *pSegInit);
+uxa_check_poly_segment(DrawablePtr pDrawable, GCPtr pGC,
+		       int nsegInit, xSegment * pSegInit);
 
 void
-uxa_check_poly_arc (DrawablePtr pDrawable, GCPtr pGC,
-		int narcs, xArc *pArcs);
+uxa_check_poly_arc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc * pArcs);
 
 void
-uxa_check_poly_fill_rect (DrawablePtr pDrawable, GCPtr pGC,
-		     int nrect, xRectangle *prect);
+uxa_check_poly_fill_rect(DrawablePtr pDrawable, GCPtr pGC,
+			 int nrect, xRectangle * prect);
 
 void
-uxa_check_image_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
-		      int x, int y, unsigned int nglyph,
-		      CharInfoPtr *ppci, pointer pglyphBase);
+uxa_check_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
+			  int x, int y, unsigned int nglyph,
+			  CharInfoPtr * ppci, pointer pglyphBase);
 
 void
-uxa_check_poly_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
-		     int x, int y, unsigned int nglyph,
-		     CharInfoPtr *ppci, pointer pglyphBase);
+uxa_check_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
+			 int x, int y, unsigned int nglyph,
+			 CharInfoPtr * ppci, pointer pglyphBase);
 
 void
-uxa_check_push_pixels (GCPtr pGC, PixmapPtr pBitmap,
-		   DrawablePtr pDrawable,
-		   int w, int h, int x, int y);
+uxa_check_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
+		      DrawablePtr pDrawable, int w, int h, int x, int y);
 
 void
-uxa_check_get_spans (DrawablePtr pDrawable,
-		 int wMax,
-		 DDXPointPtr ppt,
-		 int *pwidth,
-		 int nspans,
-		 char *pdstStart);
+uxa_check_get_spans(DrawablePtr pDrawable,
+		    int wMax,
+		    DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart);
 
-void uxa_check_paint_window (WindowPtr pWin, RegionPtr pRegion, int what);
+void uxa_check_paint_window(WindowPtr pWin, RegionPtr pRegion, int what);
 
 void
-uxa_check_add_traps (PicturePtr	pPicture,
-		  INT16		x_off,
-		  INT16		y_off,
-		  int		ntrap,
-		  xTrap		*traps);
+uxa_check_add_traps(PicturePtr pPicture,
+		    INT16 x_off, INT16 y_off, int ntrap, xTrap * traps);
 
 /* uxa-accel.c */
 
 static _X_INLINE Bool
 uxa_gc_reads_destination(DrawablePtr pDrawable, unsigned long planemask,
-		      unsigned int fillStyle, unsigned char alu)
+			 unsigned int fillStyle, unsigned char alu)
 {
-    return ((alu != GXcopy && alu != GXclear &&alu != GXset &&
-	     alu != GXcopyInverted) || fillStyle == FillStippled ||
-	    !UXA_PM_IS_SOLID(pDrawable, planemask));
+	return ((alu != GXcopy && alu != GXclear && alu != GXset &&
+		 alu != GXcopyInverted) || fillStyle == FillStippled ||
+		!UXA_PM_IS_SOLID(pDrawable, planemask));
 }
 
-void
-uxa_copy_window(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
+void uxa_copy_window(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
 
 Bool
-uxa_fill_region_tiled (DrawablePtr	pDrawable, RegionPtr pRegion, PixmapPtr pTile,
-		    DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu);
-
-void
-uxa_shm_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth, unsigned int format,
-	       int w, int h, int sx, int sy, int sw, int sh, int dx, int dy,
-	       char *data);
+uxa_fill_region_tiled(DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile,
+		      DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu);
 
 void uxa_paint_window(WindowPtr pWin, RegionPtr pRegion, int what);
 
 void
-uxa_get_image (DrawablePtr pDrawable, int x, int y, int w, int h,
-	     unsigned int format, unsigned long planeMask, char *d);
+uxa_get_image(DrawablePtr pDrawable, int x, int y, int w, int h,
+	      unsigned int format, unsigned long planeMask, char *d);
 
 extern const GCOps uxa_ops;
 
-#ifdef MITSHM
-extern ShmFuncs uxa_shm_funcs;
-
-/* XXX these come from shmint.h, which isn't exported by the server */
-void
-ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
-
-void
-ShmSetPixmapFormat(ScreenPtr pScreen, int format);
-
-void
-fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
-
-#endif
-
 #ifdef RENDER
 
 /* XXX these are in fbpict.h, which is not installed */
 void
-fbComposite (CARD8      op,
-	     PicturePtr pSrc,
-	     PicturePtr pMask,
-	     PicturePtr pDst,
-	     INT16      xSrc,
-	     INT16      ySrc,
-	     INT16      xMask,
-	     INT16      yMask,
-	     INT16      xDst,
-	     INT16      yDst,
-	     CARD16     width,
-	     CARD16     height);
-
-void
-fbAddTraps (PicturePtr	pPicture,
-	    INT16	xOff,
-	    INT16	yOff,
-	    int		ntrap,
-	    xTrap	*traps);
-
-void
-uxa_check_composite (CARD8      op,
-		  PicturePtr pSrc,
-		  PicturePtr pMask,
-		  PicturePtr pDst,
-		  INT16      xSrc,
-		  INT16      ySrc,
-		  INT16      xMask,
-		  INT16      yMask,
-		  INT16      xDst,
-		  INT16      yDst,
-		  CARD16     width,
-		  CARD16     height);
+fbComposite(CARD8 op,
+	    PicturePtr pSrc,
+	    PicturePtr pMask,
+	    PicturePtr pDst,
+	    INT16 xSrc,
+	    INT16 ySrc,
+	    INT16 xMask,
+	    INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
+
+void
+fbAddTraps(PicturePtr pPicture,
+	   INT16 xOff, INT16 yOff, int ntrap, xTrap * traps);
+
+void
+uxa_check_composite(CARD8 op,
+		    PicturePtr pSrc,
+		    PicturePtr pMask,
+		    PicturePtr pDst,
+		    INT16 xSrc,
+		    INT16 ySrc,
+		    INT16 xMask,
+		    INT16 yMask,
+		    INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
 #endif
 
 /* uxa.c */
-Bool
-uxa_prepare_access(DrawablePtr pDrawable, uxa_access_t access);
+Bool uxa_prepare_access(DrawablePtr pDrawable, uxa_access_t access);
 
-void
-uxa_finish_access(DrawablePtr pDrawable);
+void uxa_finish_access(DrawablePtr pDrawable);
 
 void
-uxa_get_drawable_deltas (DrawablePtr pDrawable, PixmapPtr pPixmap,
-		      int *xp, int *yp);
+uxa_get_drawable_deltas(DrawablePtr pDrawable, PixmapPtr pPixmap,
+			int *xp, int *yp);
 
-Bool
-uxa_drawable_is_offscreen (DrawablePtr pDrawable);
+Bool uxa_drawable_is_offscreen(DrawablePtr pDrawable);
 
-Bool
-uxa_pixmap_is_offscreen(PixmapPtr p);
+Bool uxa_pixmap_is_offscreen(PixmapPtr p);
 
-PixmapPtr
-uxa_get_offscreen_pixmap (DrawablePtr pDrawable, int *xp, int *yp);
+PixmapPtr uxa_get_offscreen_pixmap(DrawablePtr pDrawable, int *xp, int *yp);
 
-PixmapPtr
-uxa_get_drawable_pixmap(DrawablePtr pDrawable);
+PixmapPtr uxa_get_drawable_pixmap(DrawablePtr pDrawable);
 
 RegionPtr
 uxa_copy_area(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
-	    int srcx, int srcy, int width, int height, int dstx, int dsty);
+	      int srcx, int srcy, int width, int height, int dstx, int dsty);
 
 void
-uxa_copy_n_to_n (DrawablePtr    pSrcDrawable,
-	     DrawablePtr    pDstDrawable,
-	     GCPtr	    pGC,
-	     BoxPtr	    pbox,
-	     int	    nbox,
-	     int	    dx,
-	     int	    dy,
-	     Bool	    reverse,
-	     Bool	    upsidedown,
-	     Pixel	    bitplane,
-	     void	    *closure);
+uxa_copy_n_to_n(DrawablePtr pSrcDrawable,
+		DrawablePtr pDstDrawable,
+		GCPtr pGC,
+		BoxPtr pbox,
+		int nbox,
+		int dx,
+		int dy,
+		Bool reverse, Bool upsidedown, Pixel bitplane, void *closure);
 
 /* uxa_render.c */
-Bool
-uxa_op_reads_destination (CARD8 op);
+Bool uxa_op_reads_destination(CARD8 op);
 
 void
-uxa_composite(CARD8	op,
-	     PicturePtr pSrc,
-	     PicturePtr pMask,
-	     PicturePtr pDst,
-	     INT16	xSrc,
-	     INT16	ySrc,
-	     INT16	xMask,
-	     INT16	yMask,
-	     INT16	xDst,
-	     INT16	yDst,
-	     CARD16	width,
-	     CARD16	height);
+uxa_composite(CARD8 op,
+	      PicturePtr pSrc,
+	      PicturePtr pMask,
+	      PicturePtr pDst,
+	      INT16 xSrc,
+	      INT16 ySrc,
+	      INT16 xMask,
+	      INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
 
 void
-uxa_composite_rects(CARD8	            op,
-		    PicturePtr		    pSrc,
-		    PicturePtr		    pDst,
-		    int			    nrect,
-		    uxa_composite_rect_t    *rects);
+uxa_composite_rects(CARD8 op,
+		    PicturePtr pSrc,
+		    PicturePtr pDst, int nrect, uxa_composite_rect_t * rects);
 
 void
-uxa_trapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
-		PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
-		int ntrap, xTrapezoid *traps);
+uxa_solid_rects (CARD8		op,
+		 PicturePtr	dst,
+		 xRenderColor  *color,
+		 int		num_rects,
+		 xRectangle    *rects);
 
 void
-uxa_triangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+uxa_trapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 	       PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
-	       int ntri, xTriangle *tris);
+	       int ntrap, xTrapezoid * traps);
 
-/* uxa_glyph.c */
 void
-uxa_glyphs_init(ScreenPtr pScreen);
+uxa_triangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+	      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
+	      int ntri, xTriangle * tris);
+
+PicturePtr
+uxa_acquire_solid(ScreenPtr screen, SourcePict *source);
+
+PicturePtr
+uxa_acquire_drawable(ScreenPtr pScreen,
+		     PicturePtr pSrc,
+		     INT16 x, INT16 y,
+		     CARD16 width, CARD16 height,
+		     INT16 * out_x, INT16 * out_y);
+
+PicturePtr
+uxa_acquire_pattern(ScreenPtr pScreen,
+		    PicturePtr pSrc,
+		    pixman_format_code_t format,
+		    INT16 x, INT16 y,
+		    CARD16 width, CARD16 height);
+
+Bool
+uxa_get_rgba_from_pixel(CARD32 pixel,
+			CARD16 * red,
+			CARD16 * green,
+			CARD16 * blue,
+			CARD16 * alpha,
+			CARD32 format);
+
+/* uxa_glyph.c */
+Bool uxa_glyphs_init(ScreenPtr pScreen);
+
+void uxa_glyphs_fini(ScreenPtr pScreen);
 
 void
-uxa_glyphs_fini (ScreenPtr pScreen);
+uxa_glyphs(CARD8 op,
+	   PicturePtr pSrc,
+	   PicturePtr pDst,
+	   PictFormatPtr maskFormat,
+	   INT16 xSrc,
+	   INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs);
 
 void
-uxa_glyphs (CARD8	op,
-	  PicturePtr	pSrc,
-	  PicturePtr	pDst,
-	  PictFormatPtr	maskFormat,
-	  INT16		xSrc,
-	  INT16		ySrc,
-	  int		nlist,
-	  GlyphListPtr	list,
-	  GlyphPtr	*glyphs);
+uxa_glyph_unrealize(ScreenPtr pScreen,
+		    GlyphPtr pGlyph);
 
 #endif /* UXAPRIV_H */
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-render.c new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-render.c
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-render.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-render.c	2011-02-08 11:14:00.000000000 +0100
@@ -29,496 +29,1244 @@
 #include <stdlib.h>
 
 #include "uxa-priv.h"
+#include <xorgVersion.h>
 
 #ifdef RENDER
 #include "mipict.h"
 
-static void uxa_composite_fallback_pict_desc(PicturePtr pict, char *string, int n)
+static void uxa_composite_fallback_pict_desc(PicturePtr pict, char *string,
+					     int n)
 {
-    char format[20];
-    char size[20];
-    char loc;
+	char format[20];
+	char size[20];
+	char loc;
+
+	if (!pict) {
+		snprintf(string, n, "None");
+		return;
+	}
 
-    if (!pict) {
-	snprintf(string, n, "None");
-	return;
-    }
+	if (pict->pDrawable == NULL) {
+		snprintf(string, n, "source-only");
+		return;
+	}
 
-    switch (pict->format)
-    {
-    case PICT_a8r8g8b8:
-	snprintf(format, 20, "ARGB8888");
-	break;
-    case PICT_x8r8g8b8:
-	snprintf(format, 20, "XRGB8888");
-	break;
-    case PICT_r5g6b5:
-	snprintf(format, 20, "RGB565  ");
-	break;
-    case PICT_x1r5g5b5:
-	snprintf(format, 20, "RGB555  ");
-	break;
-    case PICT_a8:
-	snprintf(format, 20, "A8      ");
-	break;
-    case PICT_a1:
-	snprintf(format, 20, "A1      ");
-	break;
-    default:
-	snprintf(format, 20, "0x%x", (int)pict->format);
-	break;
-    }
+	switch (pict->format) {
+	case PICT_a8r8g8b8:
+		snprintf(format, 20, "ARGB8888");
+		break;
+	case PICT_x8r8g8b8:
+		snprintf(format, 20, "XRGB8888");
+		break;
+	case PICT_r5g6b5:
+		snprintf(format, 20, "RGB565  ");
+		break;
+	case PICT_x1r5g5b5:
+		snprintf(format, 20, "RGB555  ");
+		break;
+	case PICT_a8:
+		snprintf(format, 20, "A8      ");
+		break;
+	case PICT_a1:
+		snprintf(format, 20, "A1      ");
+		break;
+	default:
+		snprintf(format, 20, "0x%x", (int)pict->format);
+		break;
+	}
 
-    loc = uxa_drawable_is_offscreen(pict->pDrawable) ? 's' : 'm';
+	loc = uxa_drawable_is_offscreen(pict->pDrawable) ? 's' : 'm';
 
-    snprintf(size, 20, "%dx%d%s", pict->pDrawable->width,
-	     pict->pDrawable->height, pict->repeat ?
-	     " R" : "");
+	snprintf(size, 20, "%dx%d%s", pict->pDrawable->width,
+		 pict->pDrawable->height, pict->repeat ? " R" : "");
 
-    snprintf(string, n, "%p:%c fmt %s (%s)", pict->pDrawable, loc, format, size);
+	snprintf(string, n, "%p:%c fmt %s (%s)%s",
+		 pict->pDrawable, loc, format, size,
+		 pict->alphaMap ? " with alpha map" :"");
 }
 
-static void
-uxa_print_composite_fallback(CARD8 op,
-			  PicturePtr pSrc,
-			  PicturePtr pMask,
-			  PicturePtr pDst)
-{
-    char sop[20];
-    char srcdesc[40], maskdesc[40], dstdesc[40];
-
-    switch(op)
-    {
-    case PictOpSrc:
-	sprintf(sop, "Src");
-	break;
-    case PictOpOver:
-	sprintf(sop, "Over");
-	break;
-    default:
-	sprintf(sop, "0x%x", (int)op);
-	break;
+static const char *
+op_to_string(CARD8 op)
+{
+    switch (op) {
+#define C(x) case PictOp##x: return #x
+	C(Clear);
+	C(Src);
+	C(Dst);
+	C(Over);
+	C(OverReverse);
+	C(In);
+	C(InReverse);
+	C(Out);
+	C(OutReverse);
+	C(Atop);
+	C(AtopReverse);
+	C(Xor);
+	C(Add);
+	C(Saturate);
+
+	/*
+	 * Operators only available in version 0.2
+	 */
+	C(DisjointClear);
+	C(DisjointSrc);
+	C(DisjointDst);
+	C(DisjointOver);
+	C(DisjointOverReverse);
+	C(DisjointIn);
+	C(DisjointInReverse);
+	C(DisjointOut);
+	C(DisjointOutReverse);
+	C(DisjointAtop);
+	C(DisjointAtopReverse);
+	C(DisjointXor);
+
+	C(ConjointClear);
+	C(ConjointSrc);
+	C(ConjointDst);
+	C(ConjointOver);
+	C(ConjointOverReverse);
+	C(ConjointIn);
+	C(ConjointInReverse);
+	C(ConjointOut);
+	C(ConjointOutReverse);
+	C(ConjointAtop);
+	C(ConjointAtopReverse);
+	C(ConjointXor);
+
+	/*
+	 * Operators only available in version 0.11
+	 */
+	C(Multiply);
+	C(Screen);
+	C(Overlay);
+	C(Darken);
+	C(Lighten);
+	C(ColorDodge);
+	C(ColorBurn);
+	C(HardLight);
+	C(SoftLight);
+	C(Difference);
+	C(Exclusion);
+	C(HSLHue);
+	C(HSLSaturation);
+	C(HSLColor);
+	C(HSLLuminosity);
+    default: return "garbage";
+#undef C
     }
+}
+
+static void
+uxa_print_composite_fallback(const char *func, CARD8 op,
+			     PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
+	char srcdesc[40], maskdesc[40], dstdesc[40];
+
+	if (! uxa_screen->fallback_debug)
+		return;
+
+	uxa_composite_fallback_pict_desc(pSrc, srcdesc, 40);
+	uxa_composite_fallback_pict_desc(pMask, maskdesc, 40);
+	uxa_composite_fallback_pict_desc(pDst, dstdesc, 40);
+
+	ErrorF("Composite fallback at %s:\n"
+	       "  op   %s, \n"
+	       "  src  %s, \n"
+	       "  mask %s, \n"
+	       "  dst  %s, \n"
+	       "  screen %s\n",
+	       func, op_to_string (op), srcdesc, maskdesc, dstdesc,
+	       uxa_screen->swappedOut ? "swapped out" : "normal");
+}
+
+Bool uxa_op_reads_destination(CARD8 op)
+{
+	/* FALSE (does not read destination) is the list of ops in the protocol
+	 * document with "0" in the "Fb" column and no "Ab" in the "Fa" column.
+	 * That's just Clear and Src.  ReduceCompositeOp() will already have
+	 * converted con/disjoint clear/src to Clear or Src.
+	 */
+	switch (op) {
+	case PictOpClear:
+	case PictOpSrc:
+		return FALSE;
+	default:
+		return TRUE;
+	}
+}
+
+static Bool
+uxa_get_pixel_from_rgba(CARD32 * pixel,
+			CARD16 red,
+			CARD16 green, CARD16 blue, CARD16 alpha, CARD32 format)
+{
+	int rbits, bbits, gbits, abits;
+	int rshift, bshift, gshift, ashift;
+
+	rbits = PICT_FORMAT_R(format);
+	gbits = PICT_FORMAT_G(format);
+	bbits = PICT_FORMAT_B(format);
+	abits = PICT_FORMAT_A(format);
+	if (abits == 0)
+	    abits = PICT_FORMAT_BPP(format) - (rbits+gbits+bbits);
+
+	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_A) {
+		*pixel = alpha >> (16 - abits);
+		return TRUE;
+	}
+
+	if (!PICT_FORMAT_COLOR(format))
+		return FALSE;
+
+	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+		bshift = 0;
+		gshift = bbits;
+		rshift = gshift + gbits;
+		ashift = rshift + rbits;
+	} else {		/* PICT_TYPE_ABGR */
+		rshift = 0;
+		gshift = rbits;
+		bshift = gshift + gbits;
+		ashift = bshift + bbits;
+	}
+
+	*pixel = 0;
+	*pixel |= (blue >> (16 - bbits)) << bshift;
+	*pixel |= (red >> (16 - rbits)) << rshift;
+	*pixel |= (green >> (16 - gbits)) << gshift;
+	*pixel |= (alpha >> (16 - abits)) << ashift;
 
-    uxa_composite_fallback_pict_desc(pSrc, srcdesc, 40);
-    uxa_composite_fallback_pict_desc(pMask, maskdesc, 40);
-    uxa_composite_fallback_pict_desc(pDst, dstdesc, 40);
-
-    ErrorF("Composite fallback: op %s, \n"
-	   "                    src  %s, \n"
-	   "                    mask %s, \n"
-	   "                    dst  %s, \n",
-	   sop, srcdesc, maskdesc, dstdesc);
+	return TRUE;
 }
 
 Bool
-uxa_op_reads_destination (CARD8 op)
+uxa_get_rgba_from_pixel(CARD32 pixel,
+			CARD16 * red,
+			CARD16 * green,
+			CARD16 * blue, CARD16 * alpha, CARD32 format)
 {
-    /* FALSE (does not read destination) is the list of ops in the protocol
-     * document with "0" in the "Fb" column and no "Ab" in the "Fa" column.
-     * That's just Clear and Src.  ReduceCompositeOp() will already have
-     * converted con/disjoint clear/src to Clear or Src.
-     */
-    switch (op) {
-    case PictOpClear:
-    case PictOpSrc:
-	return FALSE;
-    default:
+	int rbits, bbits, gbits, abits;
+	int rshift, bshift, gshift, ashift;
+
+	rbits = PICT_FORMAT_R(format);
+	gbits = PICT_FORMAT_G(format);
+	bbits = PICT_FORMAT_B(format);
+	abits = PICT_FORMAT_A(format);
+
+	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_A) {
+		rshift = gshift = bshift = ashift = 0;
+        } else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+		bshift = 0;
+		gshift = bbits;
+		rshift = gshift + gbits;
+		ashift = rshift + rbits;
+        } else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
+		rshift = 0;
+		gshift = rbits;
+		bshift = gshift + gbits;
+		ashift = bshift + bbits;
+	} else {
+		return FALSE;
+	}
+
+	if (rbits) {
+		*red = ((pixel >> rshift) & ((1 << rbits) - 1)) << (16 - rbits);
+		while (rbits < 16) {
+			*red |= *red >> rbits;
+			rbits <<= 1;
+		}
+	} else
+		*red = 0;
+
+	if (gbits) {
+		*green = ((pixel >> gshift) & ((1 << gbits) - 1)) << (16 - gbits);
+		while (gbits < 16) {
+			*green |= *green >> gbits;
+			gbits <<= 1;
+		}
+	} else
+		*green = 0;
+
+	if (bbits) {
+		*blue = ((pixel >> bshift) & ((1 << bbits) - 1)) << (16 - bbits);
+		while (bbits < 16) {
+			*blue |= *blue >> bbits;
+			bbits <<= 1;
+		}
+	} else
+		*blue = 0;
+
+	if (abits) {
+		*alpha =
+		    ((pixel >> ashift) & ((1 << abits) - 1)) << (16 - abits);
+		while (abits < 16) {
+			*alpha |= *alpha >> abits;
+			abits <<= 1;
+		}
+	} else
+		*alpha = 0xffff;
+
 	return TRUE;
-    }
 }
 
+Bool
+uxa_get_color_for_pixmap (PixmapPtr	 pixmap,
+			  CARD32	 src_format,
+			  CARD32	 dst_format,
+			  CARD32	*pixel)
+{
+	CARD16 red, green, blue, alpha;
 
-static Bool
-uxa_get_pixel_from_rgba(CARD32	*pixel,
-		    CARD16	red,
-		    CARD16	green,
-		    CARD16	blue,
-		    CARD16	alpha,
-		    CARD32	format)
-{
-    int rbits, bbits, gbits, abits;
-    int rshift, bshift, gshift, ashift;
-
-    *pixel = 0;
-
-    if (!PICT_FORMAT_COLOR(format))
-	return FALSE;
-
-    rbits = PICT_FORMAT_R(format);
-    gbits = PICT_FORMAT_G(format);
-    bbits = PICT_FORMAT_B(format);
-    abits = PICT_FORMAT_A(format);
-
-    if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
-	bshift = 0;
-	gshift = bbits;
-	rshift = gshift + gbits;
-	ashift = rshift + rbits;
-    } else {  /* PICT_TYPE_ABGR */
-	rshift = 0;
-	gshift = rbits;
-	bshift = gshift + gbits;
-	ashift = bshift + bbits;
-    }
+	*pixel = uxa_get_pixmap_first_pixel(pixmap);
 
-    *pixel |=  ( blue >> (16 - bbits)) << bshift;
-    *pixel |=  (  red >> (16 - rbits)) << rshift;
-    *pixel |=  (green >> (16 - gbits)) << gshift;
-    *pixel |=  (alpha >> (16 - abits)) << ashift;
+	if (src_format != dst_format) {
+	    if (!uxa_get_rgba_from_pixel(*pixel, &red, &green, &blue, &alpha,
+					 src_format))
+		return FALSE;
+
+	    if (!uxa_get_pixel_from_rgba(pixel, red, green, blue, alpha,
+					 dst_format))
+		return FALSE;
+	}
 
-    return TRUE;
+	return TRUE;
+}
+
+static int
+uxa_try_driver_solid_fill(PicturePtr pSrc,
+			  PicturePtr pDst,
+			  INT16 xSrc,
+			  INT16 ySrc,
+			  INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
+	RegionRec region;
+	BoxPtr pbox;
+	int nbox;
+	int dst_off_x, dst_off_y;
+	PixmapPtr pSrcPix = NULL, pDstPix;
+	CARD32 pixel;
+
+	if (uxa_screen->info->check_solid && !uxa_screen->info->check_solid(pDst->pDrawable, GXcopy, FB_ALLONES))
+		return -1;
+
+	pDstPix = uxa_get_offscreen_pixmap(pDst->pDrawable, &dst_off_x, &dst_off_y);
+	if (!pDstPix)
+		return -1;
+
+	xDst += pDst->pDrawable->x;
+	yDst += pDst->pDrawable->y;
+
+	if (pSrc->pDrawable) {
+		pSrcPix = uxa_get_drawable_pixmap(pSrc->pDrawable);
+		xSrc += pSrc->pDrawable->x;
+		ySrc += pSrc->pDrawable->y;
+	}
+
+	if (!miComputeCompositeRegion(&region, pSrc, NULL, pDst,
+				      xSrc, ySrc, 0, 0, xDst, yDst,
+				      width, height))
+		return 1;
+
+	if (pSrcPix) {
+		if (! uxa_get_color_for_pixmap (pSrcPix, pSrc->format, pDst->format, &pixel)) {
+			REGION_UNINIT(pDst->pDrawable->pScreen, &region);
+			return -1;
+		}
+	} else {
+		SourcePict *source = pSrc->pSourcePict;
+		PictSolidFill *solid = &source->solidFill;
+
+		if (source == NULL || source->type != SourcePictTypeSolidFill) {
+			REGION_UNINIT(pDst->pDrawable->pScreen, &region);
+			return -1;
+		}
+
+		pixel = solid->color;
+	}
+
+	if (!(*uxa_screen->info->prepare_solid)
+	    (pDstPix, GXcopy, FB_ALLONES, pixel)) {
+		REGION_UNINIT(pDst->pDrawable->pScreen, &region);
+		return -1;
+	}
+
+	REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y);
+
+	nbox = REGION_NUM_RECTS(&region);
+	pbox = REGION_RECTS(&region);
+
+	while (nbox--) {
+		(*uxa_screen->info->solid) (pDstPix, pbox->x1, pbox->y1,
+					    pbox->x2, pbox->y2);
+		pbox++;
+	}
+
+	(*uxa_screen->info->done_solid) (pDstPix);
+
+	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
+	return 1;
+}
+
+static PicturePtr
+uxa_picture_for_pixman_format(ScreenPtr pScreen,
+			      pixman_format_code_t format,
+			      int width, int height)
+{
+	PicturePtr pPicture;
+	PixmapPtr pPixmap;
+	int error;
+
+	if (format == PIXMAN_a1)
+		format = PIXMAN_a8;
+
+	/* fill alpha if unset */
+	if (PIXMAN_FORMAT_A(format) == 0)
+	    format = PIXMAN_a8r8g8b8;
+
+	pPixmap = (*pScreen->CreatePixmap)(pScreen, width, height,
+					   PIXMAN_FORMAT_DEPTH(format),
+					   UXA_CREATE_PIXMAP_FOR_MAP);
+	if (!pPixmap)
+		return 0;
+
+	pPicture = CreatePicture(0, &pPixmap->drawable,
+				 PictureMatchFormat(pScreen,
+						    PIXMAN_FORMAT_DEPTH(format),
+						    format),
+				 0, 0, serverClient, &error);
+	(*pScreen->DestroyPixmap) (pPixmap);
+	if (!pPicture)
+		return 0;
+
+	ValidatePicture(pPicture);
+
+	return pPicture;
+}
+
+static PicturePtr
+uxa_picture_from_pixman_image(ScreenPtr screen,
+			      pixman_image_t * image,
+			      pixman_format_code_t format)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PicturePtr picture;
+	PixmapPtr pixmap;
+	int width, height;
+
+	width = pixman_image_get_width(image);
+	height = pixman_image_get_height(image);
+
+	picture = uxa_picture_for_pixman_format(screen, format,
+						width, height);
+	if (!picture)
+		return 0;
+
+	if (uxa_screen->info->put_image &&
+	    ((picture->pDrawable->depth << 24) | picture->format) == format &&
+	    uxa_screen->info->put_image((PixmapPtr)picture->pDrawable,
+					0, 0,
+					width, height,
+					(char *)pixman_image_get_data(image),
+					pixman_image_get_stride(image)))
+		return picture;
+
+	pixmap = GetScratchPixmapHeader(screen, width, height,
+					PIXMAN_FORMAT_DEPTH(format),
+					PIXMAN_FORMAT_BPP(format),
+					pixman_image_get_stride(image),
+					pixman_image_get_data(image));
+	if (!pixmap) {
+		FreePicture(picture, 0);
+		return 0;
+	}
+
+	if (((picture->pDrawable->depth << 24) | picture->format) == format) {
+		GCPtr gc;
+
+		gc = GetScratchGC(PIXMAN_FORMAT_DEPTH(format), screen);
+		if (!gc) {
+			FreeScratchPixmapHeader(pixmap);
+			FreePicture(picture, 0);
+			return 0;
+		}
+		ValidateGC(picture->pDrawable, gc);
+
+		(*gc->ops->CopyArea) (&pixmap->drawable, picture->pDrawable,
+				      gc, 0, 0, width, height, 0, 0);
+
+		FreeScratchGC(gc);
+	} else {
+		PicturePtr src;
+		int error;
+
+		src = CreatePicture(0, &pixmap->drawable,
+				    PictureMatchFormat(screen,
+						       PIXMAN_FORMAT_DEPTH(format),
+						       format),
+				    0, 0, serverClient, &error);
+		if (!src) {
+			FreeScratchPixmapHeader(pixmap);
+			FreePicture(picture, 0);
+			return 0;
+		}
+		ValidatePicture(src);
+
+		if (uxa_prepare_access(picture->pDrawable, UXA_ACCESS_RW)) {
+			fbComposite(PictOpSrc, src, NULL, picture,
+				    0, 0, 0, 0, 0, 0, width, height);
+			uxa_finish_access(picture->pDrawable);
+		}
+
+		FreePicture(src, 0);
+	}
+	FreeScratchPixmapHeader(pixmap);
+
+	return picture;
+}
+
+static PicturePtr
+uxa_create_solid(ScreenPtr screen, uint32_t color)
+{
+	PixmapPtr pixmap;
+	PicturePtr picture;
+	XID repeat = RepeatNormal;
+	int error = 0;
+
+	pixmap = (*screen->CreatePixmap)(screen, 1, 1, 32,
+					 UXA_CREATE_PIXMAP_FOR_MAP);
+	if (!pixmap)
+		return 0;
+
+	if (!uxa_prepare_access((DrawablePtr)pixmap, UXA_ACCESS_RW)) {
+		(*screen->DestroyPixmap)(pixmap);
+		return 0;
+	}
+	*((uint32_t *)pixmap->devPrivate.ptr) = color;
+	uxa_finish_access((DrawablePtr)pixmap);
+
+	picture = CreatePicture(0, &pixmap->drawable,
+				PictureMatchFormat(screen, 32, PICT_a8r8g8b8),
+				CPRepeat, &repeat, serverClient, &error);
+	(*screen->DestroyPixmap)(pixmap);
+
+	return picture;
+}
+
+static PicturePtr
+uxa_solid_clear(ScreenPtr screen)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PicturePtr picture;
+
+	if (!uxa_screen->solid_clear) {
+		uxa_screen->solid_clear = uxa_create_solid(screen, 0);
+		if (!uxa_screen->solid_clear)
+			return 0;
+	}
+	picture = uxa_screen->solid_clear;
+	return picture;
+}
+
+PicturePtr
+uxa_acquire_solid(ScreenPtr screen, SourcePict *source)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PictSolidFill *solid = &source->solidFill;
+	PicturePtr picture;
+	int i;
+
+	if ((solid->color >> 24) == 0) {
+		picture = uxa_solid_clear(screen);
+		if (!picture)
+		    return 0;
+
+		goto DONE;
+	} else if (solid->color == 0xff000000) {
+		if (!uxa_screen->solid_black) {
+			uxa_screen->solid_black = uxa_create_solid(screen, 0xff000000);
+			if (!uxa_screen->solid_black)
+				return 0;
+		}
+		picture = uxa_screen->solid_black;
+		goto DONE;
+	} else if (solid->color == 0xffffffff) {
+		if (!uxa_screen->solid_white) {
+			uxa_screen->solid_white = uxa_create_solid(screen, 0xffffffff);
+			if (!uxa_screen->solid_white)
+				return 0;
+		}
+		picture = uxa_screen->solid_white;
+		goto DONE;
+	}
+
+	for (i = 0; i < uxa_screen->solid_cache_size; i++) {
+		if (uxa_screen->solid_cache[i].color == solid->color) {
+			picture = uxa_screen->solid_cache[i].picture;
+			goto DONE;
+		}
+	}
+
+	picture = uxa_create_solid(screen, solid->color);
+	if (!picture)
+		return 0;
+
+	if (uxa_screen->solid_cache_size == UXA_NUM_SOLID_CACHE) {
+		i = rand() % UXA_NUM_SOLID_CACHE;
+		FreePicture(uxa_screen->solid_cache[i].picture, 0);
+	} else
+		uxa_screen->solid_cache_size++;
+
+	uxa_screen->solid_cache[i].picture = picture;
+	uxa_screen->solid_cache[i].color = solid->color;
+
+DONE:
+	picture->refcnt++;
+	return picture;
+}
+
+PicturePtr
+uxa_acquire_pattern(ScreenPtr pScreen,
+		    PicturePtr pSrc,
+		    pixman_format_code_t format,
+		    INT16 x, INT16 y, CARD16 width, CARD16 height)
+{
+	PicturePtr pDst;
+
+	if (pSrc->pSourcePict) {
+		SourcePict *source = pSrc->pSourcePict;
+		if (source->type == SourcePictTypeSolidFill)
+			return uxa_acquire_solid (pScreen, source);
+	}
+
+	pDst = uxa_picture_for_pixman_format(pScreen, format, width, height);
+	if (!pDst)
+		return 0;
+
+	if (uxa_prepare_access(pDst->pDrawable, UXA_ACCESS_RW)) {
+		fbComposite(PictOpSrc, pSrc, NULL, pDst,
+			    x, y, 0, 0, 0, 0, width, height);
+		uxa_finish_access(pDst->pDrawable);
+		return pDst;
+	} else {
+		FreePicture(pDst, 0);
+		return 0;
+	}
 }
 
 static Bool
-uxa_get_rgba_from_pixel(CARD32	pixel,
-		    CARD16	*red,
-		    CARD16	*green,
-		    CARD16	*blue,
-		    CARD16	*alpha,
-		    CARD32	format)
-{
-    int rbits, bbits, gbits, abits;
-    int rshift, bshift, gshift, ashift;
-
-    if (!PICT_FORMAT_COLOR(format))
-	return FALSE;
-
-    rbits = PICT_FORMAT_R(format);
-    gbits = PICT_FORMAT_G(format);
-    bbits = PICT_FORMAT_B(format);
-    abits = PICT_FORMAT_A(format);
-
-    if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
-	bshift = 0;
-	gshift = bbits;
-	rshift = gshift + gbits;
-	ashift = rshift + rbits;
-    } else {  /* PICT_TYPE_ABGR */
-	rshift = 0;
-	gshift = rbits;
-	bshift = gshift + gbits;
-	ashift = bshift + bbits;
-    }
+transform_is_integer_translation(PictTransformPtr t, int *tx, int *ty)
+{
+	if (t == NULL) {
+		*tx = *ty = 0;
+		return TRUE;
+	}
 
-    *red = ((pixel >> rshift ) & ((1 << rbits) - 1)) << (16 - rbits);
-    while (rbits < 16) {
-	*red |= *red >> rbits;
-	rbits <<= 1;
-    }
+	if (t->matrix[0][0] != IntToxFixed(1) ||
+	    t->matrix[0][1] != 0 ||
+	    t->matrix[1][0] != 0 ||
+	    t->matrix[1][1] != IntToxFixed(1) ||
+	    t->matrix[2][0] != 0 ||
+	    t->matrix[2][1] != 0 ||
+	    t->matrix[2][2] != IntToxFixed(1))
+		return FALSE;
+
+	if (xFixedFrac(t->matrix[0][2]) != 0 ||
+	    xFixedFrac(t->matrix[1][2]) != 0)
+		return FALSE;
 
-    *green = ((pixel >> gshift ) & ((1 << gbits) - 1)) << (16 - gbits);
-    while (gbits < 16) {
-	*green |= *green >> gbits;
-	gbits <<= 1;
-    }
+	*tx = xFixedToInt(t->matrix[0][2]);
+	*ty = xFixedToInt(t->matrix[1][2]);
+	return TRUE;
+}
 
-    *blue = ((pixel >> bshift ) & ((1 << bbits) - 1)) << (16 - bbits);
-    while (bbits < 16) {
-	*blue |= *blue >> bbits;
-	bbits <<= 1;
-    }
+static PicturePtr
+uxa_render_picture(ScreenPtr screen,
+		   PicturePtr src,
+		   pixman_format_code_t format,
+		   INT16 x, INT16 y,
+		   CARD16 width, CARD16 height)
+{
+	PicturePtr picture;
+	int ret = 0;
+
+	/* XXX we need a mechanism for the card to choose the fallback format */
 
-    if (abits) {
-	*alpha = ((pixel >> ashift ) & ((1 << abits) - 1)) << (16 - abits);
-	while (abits < 16) {
-	    *alpha |= *alpha >> abits;
-	    abits <<= 1;
+	/* force alpha channel in case source does not entirely cover the extents */
+	if (PIXMAN_FORMAT_A(format) == 0)
+		format = PIXMAN_a8r8g8b8; /* available on all hardware */
+
+	picture = uxa_picture_for_pixman_format(screen, format, width, height);
+	if (!picture)
+		return 0;
+
+	if (uxa_prepare_access(picture->pDrawable, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access(src->pDrawable, UXA_ACCESS_RO)) {
+			ret = 1;
+			fbComposite(PictOpSrc, src, NULL, picture,
+				    x, y, 0, 0, 0, 0, width, height);
+			uxa_finish_access(src->pDrawable);
+		}
+		uxa_finish_access(picture->pDrawable);
+	}
+
+	if (!ret) {
+		FreePicture(picture, 0);
+		return 0;
 	}
-    } else
-	*alpha = 0xffff;
 
-    return TRUE;
+	return picture;
 }
 
 static int
-uxa_try_driver_solid_fill(PicturePtr	pSrc,
-		      PicturePtr	pDst,
-		      INT16		xSrc,
-		      INT16		ySrc,
-		      INT16		xDst,
-		      INT16		yDst,
-		      CARD16		width,
-		      CARD16		height)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
-    RegionRec region;
-    BoxPtr pbox;
-    int nbox;
-    int dst_off_x, dst_off_y;
-    PixmapPtr pSrcPix, pDstPix;
-    CARD32 pixel;
-    CARD16 red, green, blue, alpha;
-
-    pDstPix = uxa_get_drawable_pixmap (pDst->pDrawable);
-    pSrcPix = uxa_get_drawable_pixmap (pSrc->pDrawable);
-
-    xDst += pDst->pDrawable->x;
-    yDst += pDst->pDrawable->y;
-    xSrc += pSrc->pDrawable->x;
-    ySrc += pSrc->pDrawable->y;
-
-    if (!miComputeCompositeRegion (&region, pSrc, NULL, pDst,
-				   xSrc, ySrc, 0, 0, xDst, yDst,
-				   width, height))
-	return 1;
+drawable_contains (DrawablePtr drawable, int x, int y, int w, int h)
+{
+	if (x < 0 || y < 0)
+		return FALSE;
 
-    uxa_get_drawable_deltas (pDst->pDrawable, pDstPix, &dst_off_x, &dst_off_y);
+	if (x + w > drawable->width)
+		return FALSE;
 
-    REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y);
+	if (y + h > drawable->height)
+		return FALSE;
 
-    pixel = uxa_get_pixmap_first_pixel (pSrcPix);
+	return TRUE;
+}
 
-    if (!uxa_pixmap_is_offscreen(pDstPix)) {
-	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-	return 0;
-    }
+PicturePtr
+uxa_acquire_drawable(ScreenPtr pScreen,
+		     PicturePtr pSrc,
+		     INT16 x, INT16 y,
+		     CARD16 width, CARD16 height,
+		     INT16 * out_x, INT16 * out_y)
+{
+	PixmapPtr pPixmap;
+	PicturePtr pDst;
+	int depth, error;
+	int tx, ty;
+	GCPtr pGC;
+
+	depth = pSrc->pDrawable->depth;
+	if (!transform_is_integer_translation(pSrc->transform, &tx, &ty) ||
+	    !drawable_contains(pSrc->pDrawable, x + tx, y + ty, width, height) ||
+	    depth == 1 ||
+	    pSrc->filter == PictFilterConvolution) {
+		/* XXX extract the sample extents and do the transformation on the GPU */
+		pDst = uxa_render_picture(pScreen, pSrc,
+					  pSrc->format | (BitsPerPixel(pSrc->pDrawable->depth) << 24),
+					  x, y, width, height);
 
-    if (!uxa_get_rgba_from_pixel(pixel, &red, &green, &blue, &alpha,
-			 pSrc->format))
-    {
-	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-	return -1;
-    }
+		goto done;
+	} else {
+		if (width == pSrc->pDrawable->width && height == pSrc->pDrawable->height) {
+			*out_x = x + pSrc->pDrawable->x;
+			*out_y = y + pSrc->pDrawable->y;
+			return pSrc;
+		}
+	}
 
-    if (!uxa_get_pixel_from_rgba(&pixel, red, green, blue, alpha,
-			pDst->format))
-    {
-	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-	return -1;
-    }
+	pPixmap = pScreen->CreatePixmap(pScreen,
+					width, height, depth,
+					CREATE_PIXMAP_USAGE_SCRATCH);
+	if (!pPixmap)
+		return 0;
+
+	/* Skip the copy if the result remains in memory and not a bo */
+	if (!uxa_pixmap_is_offscreen(pPixmap)) {
+		pScreen->DestroyPixmap(pPixmap);
+		return 0;
+	}
 
-    if (!(*uxa_screen->info->prepare_solid) (pDstPix, GXcopy, 0xffffffff, pixel))
-    {
-	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-	return -1;
-    }
+	pGC = GetScratchGC(depth, pScreen);
+	if (!pGC) {
+		pScreen->DestroyPixmap(pPixmap);
+		return 0;
+	}
 
-    nbox = REGION_NUM_RECTS(&region);
-    pbox = REGION_RECTS(&region);
+	ValidateGC(&pPixmap->drawable, pGC);
+	pGC->ops->CopyArea(pSrc->pDrawable, &pPixmap->drawable, pGC,
+			   x + tx, y + ty, width, height, 0, 0);
+	FreeScratchGC(pGC);
+
+	pDst = CreatePicture(0, &pPixmap->drawable,
+			     PictureMatchFormat(pScreen, depth, pSrc->format),
+			     0, 0, serverClient, &error);
+	pScreen->DestroyPixmap(pPixmap);
+	ValidatePicture(pDst);
 
-    while (nbox--)
-    {
-	(*uxa_screen->info->solid) (pDstPix, pbox->x1, pbox->y1, pbox->x2, pbox->y2);
-	pbox++;
-    }
+done:
+	pDst->componentAlpha = pSrc->componentAlpha;
+	*out_x = 0;
+	*out_y = 0;
+	return pDst;
+}
+
+static PicturePtr
+uxa_acquire_picture(ScreenPtr screen,
+		    PicturePtr src,
+		    pixman_format_code_t format,
+		    INT16 x, INT16 y,
+		    CARD16 width, CARD16 height,
+		    INT16 * out_x, INT16 * out_y)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+
+	if (uxa_screen->info->check_composite_texture &&
+	    uxa_screen->info->check_composite_texture(screen, src)) {
+		if (src->pDrawable) {
+			*out_x = x + src->pDrawable->x;
+			*out_y = y + src->pDrawable->y;
+		} else {
+			*out_x = x;
+			*out_y = y;
+		}
+		return src;
+	}
+
+	if (src->pDrawable) {
+		PicturePtr dst;
+
+		dst = uxa_acquire_drawable(screen, src,
+					   x, y, width, height,
+					   out_x, out_y);
+		if (!dst)
+			return 0;
+
+		if (uxa_screen->info->check_composite_texture &&
+		    !uxa_screen->info->check_composite_texture(screen, dst)) {
+			if (dst != src)
+				FreePicture(dst, 0);
+			return 0;
+		}
 
-    (*uxa_screen->info->done_solid) (pDstPix);
+		return dst;
+	}
 
-    REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-    return 1;
+	*out_x = 0;
+	*out_y = 0;
+	return uxa_acquire_pattern(screen, src,
+				   format, x, y, width, height);
 }
 
-static int
-uxa_try_driver_composite_rects(CARD8		    op,
-			       PicturePtr	    pSrc,
-			       PicturePtr	    pDst,
-			       int		    nrect,
-			       uxa_composite_rect_t *rects)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
-    int src_off_x, src_off_y, dst_off_x, dst_off_y;
-    PixmapPtr pSrcPix, pDstPix;
-
-    if (!uxa_screen->info->prepare_composite || uxa_screen->swappedOut)
-	return -1;
-
-    if (uxa_screen->info->check_composite &&
-	!(*uxa_screen->info->check_composite) (op, pSrc, NULL, pDst))
-    {
-	return -1;
-    }
-    
-    pDstPix = uxa_get_offscreen_pixmap(pDst->pDrawable, &dst_off_x, &dst_off_y);
-    if (!pDstPix)
-	return 0;
+static PicturePtr
+uxa_acquire_source(ScreenPtr screen,
+		   PicturePtr pict,
+		   INT16 x, INT16 y,
+		   CARD16 width, CARD16 height,
+		   INT16 * out_x, INT16 * out_y)
+{
+	return uxa_acquire_picture (screen, pict,
+				    PICT_a8r8g8b8,
+				    x, y,
+				    width, height,
+				    out_x, out_y);
+}
 
-    pSrcPix = uxa_get_offscreen_pixmap(pSrc->pDrawable, &src_off_x, &src_off_y);
-    if (!pSrcPix)
-	return 0;
+static PicturePtr
+uxa_acquire_mask(ScreenPtr screen,
+		 PicturePtr pict,
+		 INT16 x, INT16 y,
+		 INT16 width, INT16 height,
+		 INT16 * out_x, INT16 * out_y)
+{
+	return uxa_acquire_picture (screen, pict,
+				    PICT_a8,
+				    x, y,
+				    width, height,
+				    out_x, out_y);
+}
 
-    if (!(*uxa_screen->info->prepare_composite) (op, pSrc, NULL, pDst, pSrcPix,
-						 NULL, pDstPix))
-	return -1;
-
-    while (nrect--)
-    {
-	INT16 xDst = rects->xDst + pDst->pDrawable->x;
-	INT16 yDst = rects->yDst + pDst->pDrawable->y;
-	INT16 xSrc = rects->xSrc + pSrc->pDrawable->x;
-	INT16 ySrc = rects->ySrc + pSrc->pDrawable->y;
-	
-	RegionRec region;
-	BoxPtr pbox;
-	int nbox;
-	
-	if (!miComputeCompositeRegion (&region, pSrc, NULL, pDst,
-				       xSrc, ySrc, 0, 0, xDst, yDst,
-				       rects->width, rects->height))
-	    goto next_rect;
-	
-	REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y);
-	
-	nbox = REGION_NUM_RECTS(&region);
-	pbox = REGION_RECTS(&region);
+static Bool
+_pixman_region_init_rectangles(pixman_region16_t *region,
+			       int num_rects,
+			       xRectangle *rects,
+			       int tx, int ty)
+{
+	pixman_box16_t stack_boxes[64], *boxes = stack_boxes;
+	pixman_bool_t ret;
+	int i;
+
+	if (num_rects > sizeof(stack_boxes) / sizeof(stack_boxes[0])) {
+		boxes = malloc(sizeof(pixman_box16_t) * num_rects);
+		if (boxes == NULL)
+			return FALSE;
+	}
 
-	xSrc = xSrc + src_off_x - xDst - dst_off_x;
-	ySrc = ySrc + src_off_y - yDst - dst_off_y;
-	
-	while (nbox--)
-	{
-	    (*uxa_screen->info->composite) (pDstPix,
-					    pbox->x1 + xSrc,
-					    pbox->y1 + ySrc,
-					    0, 0,
-					    pbox->x1,
-					    pbox->y1,
-					    pbox->x2 - pbox->x1,
-					    pbox->y2 - pbox->y1);
-	    pbox++;
+	for (i = 0; i < num_rects; i++) {
+		boxes[i].x1 = rects[i].x + tx;
+		boxes[i].y1 = rects[i].y + ty;
+		boxes[i].x2 = rects[i].x + tx + rects[i].width;
+		boxes[i].y2 = rects[i].y + ty + rects[i].height;
 	}
 
-    next_rect:
-	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
+	ret = pixman_region_init_rects(region, boxes, num_rects);
 
-	rects++;
-    }
-    (*uxa_screen->info->done_composite) (pDstPix);
-	
-    return 1;
+	if (boxes != stack_boxes)
+		free(boxes);
+
+	return ret;
 }
 
-/**
- * Copy a number of rectangles from source to destination in a single
- * operation. This is specialized for building a glyph mask: we don'y
- * have a mask argument because we don't need it for that, and we
- * don't have he special-case fallbacks found in uxa_composite() - if the
- * driver can support it, we use the driver functionality, otherwise we
- * fallback straight to software.
- */
 void
-uxa_composite_rects(CARD8	          op,
-		    PicturePtr		  pSrc,
-		    PicturePtr		  pDst,
-		    int			  nrect,
-		    uxa_composite_rect_t  *rects)
-{
-    int			   n;
-    uxa_composite_rect_t   *r;
-    
-    /************************************************************/
-    
-    ValidatePicture (pSrc);
-    ValidatePicture (pDst);
-    
-    if (uxa_try_driver_composite_rects(op, pSrc, pDst, nrect, rects) != 1) {
-	n = nrect;
-	r = rects;
-	while (n--) {
-	    uxa_check_composite (op, pSrc, NULL, pDst,
-			       r->xSrc, r->ySrc,
-			       0, 0,
-			       r->xDst, r->yDst,
-			       r->width, r->height);
-	    r++;
+uxa_solid_rects (CARD8		op,
+		 PicturePtr	dst,
+		 xRenderColor  *color,
+		 int		num_rects,
+		 xRectangle    *rects)
+{
+	ScreenPtr screen = dst->pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PixmapPtr dst_pixmap, src_pixmap = NULL;
+	pixman_region16_t region;
+	pixman_box16_t *boxes, *extents;
+	PicturePtr src;
+	int dst_x, dst_y;
+	int num_boxes;
+
+	if (!pixman_region_not_empty(dst->pCompositeClip))
+		return;
+
+	if (dst->alphaMap)
+		goto fallback;
+
+	dst_pixmap = uxa_get_offscreen_pixmap(dst->pDrawable, &dst_x, &dst_y);
+	if (!dst_pixmap)
+		goto fallback;
+
+	if (!_pixman_region_init_rectangles(&region,
+					    num_rects, rects,
+					    dst->pDrawable->x, dst->pDrawable->y))
+		goto fallback;
+
+	if (!pixman_region_intersect(&region, &region, dst->pCompositeClip)) {
+		pixman_region_fini(&region);
+		return;
 	}
-    }
-    
-    /************************************************************/
 
+	/* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must
+	 * manually append the damaged regions ourselves.
+	 */
+	DamageRegionAppend(dst->pDrawable, &region);
+
+	pixman_region_translate(&region, dst_x, dst_y);
+	boxes = pixman_region_rectangles(&region, &num_boxes);
+	extents = pixman_region_extents (&region);
+
+	if (op == PictOpClear)
+		color->red = color->green = color->blue = color->alpha = 0;
+	if (color->alpha >= 0xff00 && op == PictOpOver) {
+		color->alpha = 0xffff;
+		op = PictOpSrc;
+	}
+
+	/* Using GEM, the relocation costs outweigh the advantages of the blitter */
+	if (num_boxes == 1 && (op == PictOpSrc || op == PictOpClear)) {
+		CARD32 pixel;
+
+try_solid:
+		if (uxa_screen->info->check_solid &&
+		    !uxa_screen->info->check_solid(&dst_pixmap->drawable, GXcopy, FB_ALLONES))
+			goto err_region;
+
+		if (!uxa_get_pixel_from_rgba(&pixel,
+					     color->red,
+					     color->green,
+					     color->blue,
+					     color->alpha,
+					     dst->format))
+			goto err_region;
+
+		if (!uxa_screen->info->prepare_solid(dst_pixmap, GXcopy, FB_ALLONES, pixel))
+			goto err_region;
+
+		while (num_boxes--) {
+			uxa_screen->info->solid(dst_pixmap,
+						boxes->x1, boxes->y1,
+						boxes->x2, boxes->y2);
+			boxes++;
+		}
+
+		uxa_screen->info->done_solid(dst_pixmap);
+	} else {
+		int error;
+
+		src = CreateSolidPicture(0, color, &error);
+		if (!src)
+			goto err_region;
+
+		if (!uxa_screen->info->check_composite(op, src, NULL, dst,
+						       extents->x2 - extents->x1,
+						       extents->y2 - extents->y1)) {
+			if (op == PictOpSrc || op == PictOpClear) {
+				FreePicture(src, 0);
+				goto try_solid;
+			}
+
+			goto err_src;
+		}
+
+		if (!uxa_screen->info->check_composite_texture ||
+		    !uxa_screen->info->check_composite_texture(screen, src)) {
+			PicturePtr solid;
+			int src_off_x, src_off_y;
+
+			solid = uxa_acquire_solid(screen, src->pSourcePict);
+			FreePicture(src, 0);
+
+			src = solid;
+			src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
+							      &src_off_x, &src_off_y);
+			if (!src_pixmap)
+				goto err_src;
+		}
+
+		if (!uxa_screen->info->prepare_composite(op, src, NULL, dst, src_pixmap, NULL, dst_pixmap))
+			goto err_src;
+
+		while (num_boxes--) {
+			uxa_screen->info->composite(dst_pixmap,
+						    0, 0, 0, 0,
+						    boxes->x1,
+						    boxes->y1,
+						    boxes->x2 - boxes->x1,
+						    boxes->y2 - boxes->y1);
+			boxes++;
+		}
+
+		uxa_screen->info->done_composite(dst_pixmap);
+		FreePicture(src, 0);
+	}
+
+	pixman_region_fini(&region);
+	return;
+
+err_src:
+	FreePicture(src, 0);
+err_region:
+	pixman_region_fini(&region);
+fallback:
+	uxa_screen->SavedCompositeRects(op, dst, color, num_rects, rects);
 }
 
 static int
-uxa_try_driver_composite(CARD8		op,
-			 PicturePtr	pSrc,
-			 PicturePtr	pMask,
-			 PicturePtr	pDst,
-			 INT16		xSrc,
-			 INT16		ySrc,
-			 INT16		xMask,
-			 INT16		yMask,
-			 INT16		xDst,
-			 INT16		yDst,
-			 CARD16		width,
-			 CARD16		height)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
-    RegionRec region;
-    BoxPtr pbox;
-    int nbox;
-    int src_off_x, src_off_y, mask_off_x, mask_off_y, dst_off_x, dst_off_y;
-    PixmapPtr pSrcPix, pMaskPix = NULL, pDstPix;
-
-    xDst += pDst->pDrawable->x;
-    yDst += pDst->pDrawable->y;
-
-    if (pMask) {
-	xMask += pMask->pDrawable->x;
-	yMask += pMask->pDrawable->y;
-    }
+uxa_try_driver_composite(CARD8 op,
+			 PicturePtr pSrc,
+			 PicturePtr pMask,
+			 PicturePtr pDst,
+			 INT16 xSrc, INT16 ySrc,
+			 INT16 xMask, INT16 yMask,
+			 INT16 xDst, INT16 yDst,
+			 CARD16 width, CARD16 height)
+{
+	ScreenPtr screen = pDst->pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	RegionRec region;
+	BoxPtr pbox;
+	int nbox;
+	int xDst_copy, yDst_copy;
+	int src_off_x, src_off_y, mask_off_x, mask_off_y, dst_off_x, dst_off_y;
+	PixmapPtr pSrcPix, pMaskPix = NULL, pDstPix;
+	PicturePtr localSrc, localMask = NULL;
+	PicturePtr localDst = pDst;
+
+	if (uxa_screen->info->check_composite &&
+	    !(*uxa_screen->info->check_composite) (op, pSrc, pMask, pDst, width, height))
+		return -1;
+
+	if (uxa_screen->info->check_composite_target &&
+	    !uxa_screen->info->check_composite_target(uxa_get_drawable_pixmap(pDst->pDrawable))) {
+		int depth = pDst->pDrawable->depth;
+		PixmapPtr pixmap;
+		int error;
+		GCPtr gc;
+
+		pixmap = uxa_get_drawable_pixmap(pDst->pDrawable);
+		if (uxa_screen->info->check_copy &&
+		    !uxa_screen->info->check_copy(pixmap, pixmap, GXcopy, FB_ALLONES))
+			return -1;
+
+		pixmap = screen->CreatePixmap(screen,
+					      width, height, depth,
+					      CREATE_PIXMAP_USAGE_SCRATCH);
+		if (!pixmap)
+			return 0;
+
+		gc = GetScratchGC(depth, screen);
+		if (!gc) {
+			screen->DestroyPixmap(pixmap);
+			return 0;
+		}
 
-    xSrc += pSrc->pDrawable->x;
-    ySrc += pSrc->pDrawable->y;
+		ValidateGC(&pixmap->drawable, gc);
+		gc->ops->CopyArea(pDst->pDrawable, &pixmap->drawable, gc,
+				  xDst, yDst, width, height, 0, 0);
+		FreeScratchGC(gc);
+
+		xDst_copy = xDst; xDst = 0;
+		yDst_copy = yDst; yDst = 0;
+
+		localDst = CreatePicture(0, &pixmap->drawable,
+					 PictureMatchFormat(screen, depth, pDst->format),
+					 0, 0, serverClient, &error);
+		screen->DestroyPixmap(pixmap);
 
-    if (uxa_screen->info->check_composite &&
-	!(*uxa_screen->info->check_composite) (op, pSrc, pMask, pDst))
-    {
-	return -1;
-    }
+		if (!localDst)
+			return 0;
 
-    if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,
-				   xSrc, ySrc, xMask, yMask, xDst, yDst,
-				   width, height))
-	return 1;
+		ValidatePicture(localDst);
+	}
 
-    pDstPix = uxa_get_offscreen_pixmap (pDst->pDrawable, &dst_off_x, &dst_off_y);
+	pDstPix =
+	    uxa_get_offscreen_pixmap(localDst->pDrawable, &dst_off_x, &dst_off_y);
+	if (!pDstPix) {
+		if (localDst != pDst)
+			FreePicture(localDst, 0);
+		return -1;
+	}
 
-    pSrcPix = uxa_get_offscreen_pixmap (pSrc->pDrawable, &src_off_x, &src_off_y);
+	xDst += localDst->pDrawable->x;
+	yDst += localDst->pDrawable->y;
 
-    if (pMask)
-	pMaskPix = uxa_get_offscreen_pixmap (pMask->pDrawable, &mask_off_x,
-					     &mask_off_y);
+	localSrc = uxa_acquire_source(screen, pSrc,
+				      xSrc, ySrc,
+				      width, height,
+				      &xSrc, &ySrc);
+	if (!localSrc) {
+		if (localDst != pDst)
+			FreePicture(localDst, 0);
+		return 0;
+	}
 
-    if (!pDstPix || !pSrcPix || (pMask && !pMaskPix)) {
-	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-	return 0;
-    }
+	if (pMask) {
+		localMask = uxa_acquire_mask(screen, pMask,
+					     xMask, yMask,
+					     width, height,
+					     &xMask, &yMask);
+		if (!localMask) {
+			if (localSrc != pSrc)
+				FreePicture(localSrc, 0);
+			if (localDst != pDst)
+				FreePicture(localDst, 0);
 
-    REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y);
+			return 0;
+		}
+	}
 
-    if (!(*uxa_screen->info->prepare_composite) (op, pSrc, pMask, pDst, pSrcPix,
-						 pMaskPix, pDstPix))
-    {
-	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-	return -1;
-    }
+	if (!miComputeCompositeRegion(&region, localSrc, localMask, localDst,
+				      xSrc, ySrc, xMask, yMask, xDst, yDst,
+				      width, height)) {
+		if (localSrc != pSrc)
+			FreePicture(localSrc, 0);
+		if (localMask && localMask != pMask)
+			FreePicture(localMask, 0);
+		if (localDst != pDst)
+			FreePicture(localDst, 0);
 
-    nbox = REGION_NUM_RECTS(&region);
-    pbox = REGION_RECTS(&region);
+		return 1;
+	}
 
-    xMask = xMask + mask_off_x - xDst - dst_off_x;
-    yMask = yMask + mask_off_y - yDst - dst_off_y;
+	if (localSrc->pDrawable) {
+		pSrcPix = uxa_get_offscreen_pixmap(localSrc->pDrawable,
+						   &src_off_x, &src_off_y);
+		if (!pSrcPix) {
+			REGION_UNINIT(screen, &region);
+
+			if (localSrc != pSrc)
+				FreePicture(localSrc, 0);
+			if (localMask && localMask != pMask)
+				FreePicture(localMask, 0);
+			if (localDst != pDst)
+				FreePicture(localDst, 0);
 
-    xSrc = xSrc + src_off_x - xDst - dst_off_x;
-    ySrc = ySrc + src_off_y - yDst - dst_off_y;
+			return 0;
+		}
+	} else {
+		pSrcPix = NULL;
+	}
 
-    while (nbox--)
-    {
-	(*uxa_screen->info->composite) (pDstPix,
-					pbox->x1 + xSrc,
-					pbox->y1 + ySrc,
-					pbox->x1 + xMask,
-					pbox->y1 + yMask,
-					pbox->x1,
-					pbox->y1,
-					pbox->x2 - pbox->x1,
-					pbox->y2 - pbox->y1);
-	pbox++;
-    }
-    (*uxa_screen->info->done_composite) (pDstPix);
+	if (localMask) {
+		if (localMask->pDrawable) {
+			pMaskPix = uxa_get_offscreen_pixmap(localMask->pDrawable,
+							    &mask_off_x, &mask_off_y);
+			if (!pMaskPix) {
+				REGION_UNINIT(screen, &region);
+
+				if (localSrc != pSrc)
+					FreePicture(localSrc, 0);
+				if (localMask && localMask != pMask)
+					FreePicture(localMask, 0);
+				if (localDst != pDst)
+					FreePicture(localDst, 0);
+
+				return 0;
+			}
+		} else {
+			pMaskPix = NULL;
+		}
+	}
+
+	if (!(*uxa_screen->info->prepare_composite)
+	    (op, localSrc, localMask, localDst, pSrcPix, pMaskPix, pDstPix)) {
+		REGION_UNINIT(screen, &region);
+
+		if (localSrc != pSrc)
+			FreePicture(localSrc, 0);
+		if (localMask && localMask != pMask)
+			FreePicture(localMask, 0);
+		if (localDst != pDst)
+			FreePicture(localDst, 0);
+
+		return -1;
+	}
 
-    REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-    return 1;
+	if (pMask) {
+		xMask = xMask + mask_off_x - xDst;
+		yMask = yMask + mask_off_y - yDst;
+	}
+
+	xSrc = xSrc + src_off_x - xDst;
+	ySrc = ySrc + src_off_y - yDst;
+
+	nbox = REGION_NUM_RECTS(&region);
+	pbox = REGION_RECTS(&region);
+	while (nbox--) {
+		(*uxa_screen->info->composite) (pDstPix,
+						pbox->x1 + xSrc,
+						pbox->y1 + ySrc,
+						pbox->x1 + xMask,
+						pbox->y1 + yMask,
+						pbox->x1 + dst_off_x,
+						pbox->y1 + dst_off_y,
+						pbox->x2 - pbox->x1,
+						pbox->y2 - pbox->y1);
+		pbox++;
+	}
+	(*uxa_screen->info->done_composite) (pDstPix);
+
+	REGION_UNINIT(screen, &region);
+
+	if (localSrc != pSrc)
+		FreePicture(localSrc, 0);
+	if (localMask && localMask != pMask)
+		FreePicture(localMask, 0);
+
+	if (localDst != pDst) {
+		GCPtr gc;
+
+		gc = GetScratchGC(pDst->pDrawable->depth, screen);
+		if (gc) {
+			ValidateGC(pDst->pDrawable, gc);
+			gc->ops->CopyArea(localDst->pDrawable, pDst->pDrawable, gc,
+					  0, 0, width, height, xDst_copy, yDst_copy);
+			FreeScratchGC(gc);
+		}
+
+		FreePicture(localDst, 0);
+	}
+
+	return 1;
 }
 
 /**
@@ -572,216 +1320,349 @@ uxa_try_driver_composite(CARD8		op,
 
 static int
 uxa_try_magic_two_pass_composite_helper(CARD8 op,
-				  PicturePtr pSrc,
-				  PicturePtr pMask,
-				  PicturePtr pDst,
-				  INT16 xSrc,
-				  INT16 ySrc,
-				  INT16 xMask,
-				  INT16 yMask,
-				  INT16 xDst,
-				  INT16 yDst,
-				  CARD16 width,
-				  CARD16 height)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
-
-    assert(op == PictOpOver);
-
-    if (uxa_screen->info->check_composite &&
-	(!(*uxa_screen->info->check_composite)(PictOpOutReverse, pSrc, pMask,
-					   pDst) ||
-	 !(*uxa_screen->info->check_composite)(PictOpAdd, pSrc, pMask, pDst)))
-    {
-	return -1;
-    }
+					PicturePtr pSrc,
+					PicturePtr pMask,
+					PicturePtr pDst,
+					INT16 xSrc, INT16 ySrc,
+					INT16 xMask, INT16 yMask,
+					INT16 xDst, INT16 yDst,
+					CARD16 width, CARD16 height)
+{
+	ScreenPtr screen = pDst->pDrawable->pScreen;
+	uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+	PicturePtr localDst = pDst;
+	int xDst_copy, yDst_copy;
+
+	assert(op == PictOpOver);
+
+	if (uxa_screen->info->check_composite &&
+	    (!(*uxa_screen->info->check_composite) (PictOpOutReverse, pSrc,
+						    pMask, pDst, width, height)
+	     || !(*uxa_screen->info->check_composite) (PictOpAdd, pSrc, pMask,
+						       pDst, width, height))) {
+		return -1;
+	}
+
+	if (uxa_screen->info->check_composite_target &&
+	    !uxa_screen->info->check_composite_target(uxa_get_drawable_pixmap(pDst->pDrawable))) {
+		int depth = pDst->pDrawable->depth;
+		PixmapPtr pixmap;
+		int error;
+		GCPtr gc;
+
+		pixmap = uxa_get_drawable_pixmap(pDst->pDrawable);
+		if (uxa_screen->info->check_copy &&
+		    !uxa_screen->info->check_copy(pixmap, pixmap, GXcopy, FB_ALLONES))
+			return -1;
+
+		pixmap = screen->CreatePixmap(screen,
+					      width, height, depth,
+					      CREATE_PIXMAP_USAGE_SCRATCH);
+		if (!pixmap)
+			return 0;
+
+		gc = GetScratchGC(depth, screen);
+		if (!gc) {
+			screen->DestroyPixmap(pixmap);
+			return 0;
+		}
+
+		ValidateGC(&pixmap->drawable, gc);
+		gc->ops->CopyArea(pDst->pDrawable, &pixmap->drawable, gc,
+				  xDst, yDst, width, height, 0, 0);
+		FreeScratchGC(gc);
+
+		xDst_copy = xDst; xDst = 0;
+		yDst_copy = yDst; yDst = 0;
+
+		localDst = CreatePicture(0, &pixmap->drawable,
+					 PictureMatchFormat(screen, depth, pDst->format),
+					 0, 0, serverClient, &error);
+		screen->DestroyPixmap(pixmap);
+
+		if (!localDst)
+			return 0;
 
-    /* Now, we think we should be able to accelerate this operation. First,
-     * composite the destination to be the destination times the source alpha
-     * factors.
-     */
-    uxa_composite(PictOpOutReverse, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
-		 xDst, yDst, width, height);
-
-    /* Then, add in the source value times the destination alpha factors (1.0).
-     */
-    uxa_composite(PictOpAdd, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
-		 xDst, yDst, width, height);
+		ValidatePicture(localDst);
+	}
+
+	/* Now, we think we should be able to accelerate this operation. First,
+	 * composite the destination to be the destination times the source alpha
+	 * factors.
+	 */
+	uxa_composite(PictOpOutReverse, pSrc, pMask, localDst,
+		      xSrc, ySrc,
+		      xMask, yMask,
+		      xDst, yDst,
+		      width, height);
 
-    return 1;
+	/* Then, add in the source value times the destination alpha factors (1.0).
+	 */
+	uxa_composite(PictOpAdd, pSrc, pMask, localDst,
+		      xSrc, ySrc,
+		      xMask, yMask,
+		      xDst, yDst,
+		      width, height);
+
+	if (localDst != pDst) {
+		GCPtr gc;
+
+		gc = GetScratchGC(pDst->pDrawable->depth, screen);
+		if (gc) {
+			ValidateGC(pDst->pDrawable, gc);
+			gc->ops->CopyArea(localDst->pDrawable, pDst->pDrawable, gc,
+					0, 0, width, height, xDst_copy, yDst_copy);
+			FreeScratchGC(gc);
+		}
+
+		FreePicture(localDst, 0);
+	}
+
+	return 1;
 }
 
-void
-uxa_composite(CARD8	op,
-	     PicturePtr pSrc,
-	     PicturePtr pMask,
-	     PicturePtr pDst,
-	     INT16	xSrc,
-	     INT16	ySrc,
-	     INT16	xMask,
-	     INT16	yMask,
-	     INT16	xDst,
-	     INT16	yDst,
-	     CARD16	width,
-	     CARD16	height)
-{
-    uxa_screen_t    *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
-    int ret = -1;
-    Bool saveSrcRepeat = pSrc->repeat;
-    Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
-    RegionRec region;
-
-    /* We currently don't support acceleration of gradients, or other pictures
-     * with a NULL pDrawable.
-     */
-    if (uxa_screen->swappedOut ||
-	pSrc->pDrawable == NULL || (pMask != NULL && pMask->pDrawable == NULL))
-    {
-	goto fallback;
-    }
+static int
+compatible_formats (CARD8 op, PicturePtr dst, PicturePtr src)
+{
+	if (op == PictOpSrc) {
+		if (src->format == dst->format)
+			return 1;
+
+		/* Is the destination an alpha-less version of source? */
+		if (dst->format == PICT_FORMAT(PICT_FORMAT_BPP(src->format),
+					       PICT_FORMAT_TYPE(src->format),
+					       0,
+					       PICT_FORMAT_R(src->format),
+					       PICT_FORMAT_G(src->format),
+					       PICT_FORMAT_B(src->format)))
+			return 1;
+
+		/* XXX xrgb is promoted to argb during image upload... */
+#if 0
+		if (dst->format == PICT_a8r8g8b8 && src->format == PICT_x8r8g8b8)
+			return 1;
+#endif
+	} else if (op == PictOpOver) {
+		if (PICT_FORMAT_A(src->format))
+			return 0;
 
-    /* Remove repeat in source if useless */
-    if (pSrc->repeat && !pSrc->transform && xSrc >= 0 &&
-	(xSrc + width) <= pSrc->pDrawable->width && ySrc >= 0 &&
-	(ySrc + height) <= pSrc->pDrawable->height)
-	    pSrc->repeat = 0;
-
-    if (!pMask)
-    {
-      if ((op == PictOpSrc &&
-	   ((pSrc->format == pDst->format) ||
-	    (pSrc->format==PICT_a8r8g8b8 && pDst->format==PICT_x8r8g8b8) ||
-	    (pSrc->format==PICT_a8b8g8r8 && pDst->format==PICT_x8b8g8r8))) ||
-	  (op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&
-	   pSrc->format == pDst->format &&
-	   (pSrc->format==PICT_x8r8g8b8 || pSrc->format==PICT_x8b8g8r8)))
-	{
-	    if (pSrc->pDrawable->width == 1 &&
-		pSrc->pDrawable->height == 1 &&
-		pSrc->repeat)
-	    {
-		ret = uxa_try_driver_solid_fill(pSrc, pDst, xSrc, ySrc, xDst, yDst,
-					    width, height);
-		if (ret == 1)
-		    goto done;
-	    }
-	    else if (pSrc->pDrawable != NULL &&
-		     !pSrc->repeat &&
-		     !pSrc->transform)
-	    {
-		xDst += pDst->pDrawable->x;
-		yDst += pDst->pDrawable->y;
-		xSrc += pSrc->pDrawable->x;
-		ySrc += pSrc->pDrawable->y;
+		return src->format == dst->format;
+	}
 
-		if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,
-					       xSrc, ySrc, xMask, yMask, xDst,
-					       yDst, width, height))
-		    goto done;
+	return 0;
+}
 
+void
+uxa_composite(CARD8 op,
+	      PicturePtr pSrc,
+	      PicturePtr pMask,
+	      PicturePtr pDst,
+	      INT16 xSrc, INT16 ySrc,
+	      INT16 xMask, INT16 yMask,
+	      INT16 xDst, INT16 yDst,
+	      CARD16 width, CARD16 height)
+{
+	uxa_screen_t *uxa_screen = uxa_get_screen(pDst->pDrawable->pScreen);
+	int ret = -1;
+	Bool saveSrcRepeat = pSrc->repeat;
+	Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
+	RegionRec region;
+	int tx, ty;
 
-		uxa_copy_n_to_n (pSrc->pDrawable, pDst->pDrawable, NULL,
-			     REGION_RECTS(&region), REGION_NUM_RECTS(&region),
-			     xSrc - xDst, ySrc - yDst,
-			     FALSE, FALSE, 0, NULL);
-		REGION_UNINIT(pDst->pDrawable->pScreen, &region);
-		goto done;
-	    }
-	    else if (pSrc->pDrawable != NULL &&
-		     pSrc->pDrawable->type == DRAWABLE_PIXMAP &&
-		     !pSrc->transform &&
-		     pSrc->repeatType == RepeatNormal)
-	    {
-		DDXPointRec patOrg;
-
-		/* Let's see if the driver can do the repeat in one go */
-		if (uxa_screen->info->prepare_composite && !pSrc->alphaMap &&
-		    !pDst->alphaMap)
-		{
-		    ret = uxa_try_driver_composite(op, pSrc, pMask, pDst, xSrc,
-						ySrc, xMask, yMask, xDst, yDst,
-						width, height);
-		    if (ret == 1)
-			goto done;
-		}
+	if (uxa_screen->swappedOut)
+		goto fallback;
 
-		/* Now see if we can use uxa_fill_region_tiled() */
-		xDst += pDst->pDrawable->x;
-		yDst += pDst->pDrawable->y;
-		xSrc += pSrc->pDrawable->x;
-		ySrc += pSrc->pDrawable->y;
+	if (!uxa_drawable_is_offscreen(pDst->pDrawable))
+		goto fallback;
 
-		if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, xSrc,
-					       ySrc, xMask, yMask, xDst, yDst,
-					       width, height))
-		    goto done;
-
-		/* pattern origin is the point in the destination drawable
-		 * corresponding to (0,0) in the source */
-		patOrg.x = xDst - xSrc;
-		patOrg.y = yDst - ySrc;
-
-		ret = uxa_fill_region_tiled(pDst->pDrawable, &region,
-					 (PixmapPtr)pSrc->pDrawable,
-					 &patOrg, FB_ALLONES, GXcopy);
 
-		REGION_UNINIT(pDst->pDrawable->pScreen, &region);
+	if (pDst->alphaMap || pSrc->alphaMap || (pMask && pMask->alphaMap))
+		goto fallback;
+
+
+	/* Remove repeat in source if useless */
+	if (pSrc->pDrawable && pSrc->repeat && pSrc->filter != PictFilterConvolution &&
+	    transform_is_integer_translation(pSrc->transform, &tx, &ty) &&
+	    (pSrc->pDrawable->width > 1 || pSrc->pDrawable->height > 1) &&
+	    drawable_contains(pSrc->pDrawable, xSrc + tx, ySrc + ty, width, height))
+		pSrc->repeat = 0;
+
+	if (!pMask) {
+		if (op == PictOpClear) {
+			PicturePtr clear = uxa_solid_clear(pDst->pDrawable->pScreen);
+			if (clear &&
+			    uxa_try_driver_solid_fill(clear, pDst,
+						      xSrc, ySrc,
+						      xDst, yDst,
+						      width, height) == 1)
+				goto done;
+		}
 
-		if (ret)
-		    goto done;
-	    }
+		if (pSrc->pDrawable == NULL) {
+			if (pSrc->pSourcePict) {
+				SourcePict *source = pSrc->pSourcePict;
+				if (source->type == SourcePictTypeSolidFill) {
+					if (op == PictOpSrc ||
+					    (op == PictOpOver &&
+					     (source->solidFill.color & 0xff000000) == 0xff000000)) {
+						ret = uxa_try_driver_solid_fill(pSrc, pDst,
+										xSrc, ySrc,
+										xDst, yDst,
+										width, height);
+						if (ret == 1)
+							goto done;
+					}
+				}
+			}
+		} else if (pSrc->pDrawable->width == 1 &&
+			   pSrc->pDrawable->height == 1 &&
+			   pSrc->repeat &&
+			   (op == PictOpSrc || (op == PictOpOver && !PICT_FORMAT_A(pSrc->format)))) {
+			ret = uxa_try_driver_solid_fill(pSrc, pDst,
+							xSrc, ySrc,
+							xDst, yDst,
+							width, height);
+			if (ret == 1)
+				goto done;
+		} else if (compatible_formats (op, pDst, pSrc) &&
+			   pSrc->filter != PictFilterConvolution &&
+			   transform_is_integer_translation(pSrc->transform, &tx, &ty)) {
+			if (!pSrc->repeat &&
+			    drawable_contains(pSrc->pDrawable,
+					     xSrc + tx, ySrc + ty,
+					     width, height)) {
+				xDst += pDst->pDrawable->x;
+				yDst += pDst->pDrawable->y;
+				xSrc += pSrc->pDrawable->x + tx;
+				ySrc += pSrc->pDrawable->y + ty;
+
+				if (!miComputeCompositeRegion
+				    (&region, pSrc, pMask, pDst, xSrc, ySrc,
+				     xMask, yMask, xDst, yDst, width, height))
+					goto done;
+
+				uxa_copy_n_to_n(pSrc->pDrawable,
+						pDst->pDrawable, NULL,
+						REGION_RECTS(&region),
+						REGION_NUM_RECTS(&region),
+						xSrc - xDst, ySrc - yDst, FALSE,
+						FALSE, 0, NULL);
+				REGION_UNINIT(pDst->pDrawable->pScreen,
+					      &region);
+				goto done;
+			} else if (pSrc->repeat && pSrc->repeatType == RepeatNormal &&
+				   pSrc->pDrawable->type == DRAWABLE_PIXMAP) {
+				DDXPointRec patOrg;
+
+				/* Let's see if the driver can do the repeat
+				 * in one go
+				 */
+				if (uxa_screen->info->prepare_composite) {
+					ret = uxa_try_driver_composite(op, pSrc,
+								       pMask, pDst,
+								       xSrc, ySrc,
+								       xMask, yMask,
+								       xDst, yDst,
+								       width, height);
+					if (ret == 1)
+						goto done;
+				}
+
+				/* Now see if we can use
+				 * uxa_fill_region_tiled()
+				 */
+				xDst += pDst->pDrawable->x;
+				yDst += pDst->pDrawable->y;
+				xSrc += pSrc->pDrawable->x + tx;
+				ySrc += pSrc->pDrawable->y + ty;
+
+				if (!miComputeCompositeRegion
+				    (&region, pSrc, pMask, pDst, xSrc, ySrc,
+				     xMask, yMask, xDst, yDst, width, height))
+					goto done;
+
+				/* pattern origin is the point in the
+				 * destination drawable
+				 * corresponding to (0,0) in the source */
+				patOrg.x = xDst - xSrc;
+				patOrg.y = yDst - ySrc;
+
+				ret = uxa_fill_region_tiled(pDst->pDrawable,
+							    &region,
+							    (PixmapPtr) pSrc->
+							    pDrawable, &patOrg,
+							    FB_ALLONES, GXcopy);
+
+				REGION_UNINIT(pDst->pDrawable->pScreen,
+					      &region);
+
+				if (ret)
+					goto done;
+			}
+		}
 	}
-    }
 
-    /* Remove repeat in mask if useless */
-    if (pMask && pMask->repeat && !pMask->transform && xMask >= 0 &&
-	(xMask + width) <= pMask->pDrawable->width && yMask >= 0 &&
-	(yMask + height) <= pMask->pDrawable->height)
-	    pMask->repeat = 0;
-
-    if (uxa_screen->info->prepare_composite &&
-	!pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap)
-    {
-	Bool isSrcSolid;
-
-	ret = uxa_try_driver_composite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask,
-				    yMask, xDst, yDst, width, height);
-	if (ret == 1)
-	    goto done;
+	/* Remove repeat in mask if useless */
+	if (pMask && pMask->pDrawable && pMask->repeat &&
+	    pMask->filter != PictFilterConvolution &&
+	    transform_is_integer_translation(pMask->transform, &tx, &ty) &&
+	    (pMask->pDrawable->width > 1 || pMask->pDrawable->height > 1) &&
+	    drawable_contains(pMask->pDrawable, xMask + tx, yMask + ty, width, height))
+		pMask->repeat = 0;
+
+	if (uxa_screen->info->prepare_composite) {
+		Bool isSrcSolid;
+
+		ret =
+		    uxa_try_driver_composite(op, pSrc, pMask, pDst, xSrc, ySrc,
+					     xMask, yMask, xDst, yDst, width,
+					     height);
+		if (ret == 1)
+			goto done;
+
+		/* For generic masks and solid src pictures, mach64 can do
+		 * Over in two passes, similar to the component-alpha case.
+		 */
+
+		isSrcSolid =
+			pSrc->pDrawable ?
+				pSrc->pDrawable->width == 1 &&
+				pSrc->pDrawable->height == 1 &&
+				pSrc->repeat :
+			pSrc->pSourcePict ?
+				pSrc->pSourcePict->type == SourcePictTypeSolidFill :
+			0;
+
+		/* If we couldn't do the Composite in a single pass, and it
+		 * was a component-alpha Over, see if we can do it in two
+		 * passes with an OutReverse and then an Add.
+		 */
+		if (ret == -1 && op == PictOpOver && pMask &&
+		    (pMask->componentAlpha || isSrcSolid)) {
+			ret =
+			    uxa_try_magic_two_pass_composite_helper(op, pSrc,
+								    pMask, pDst,
+								    xSrc, ySrc,
+								    xMask, yMask,
+								    xDst, yDst,
+								    width, height);
+			if (ret == 1)
+				goto done;
+		}
 
-	/* For generic masks and solid src pictures, mach64 can do Over in two
-	 * passes, similar to the component-alpha case.
-	 */
-	isSrcSolid = pSrc->pDrawable->width == 1 &&
-		     pSrc->pDrawable->height == 1 &&
-		     pSrc->repeat;
-
-	/* If we couldn't do the Composite in a single pass, and it was a
-	 * component-alpha Over, see if we can do it in two passes with
-	 * an OutReverse and then an Add.
-	 */
-	if (ret == -1 && op == PictOpOver && pMask &&
-	    (pMask->componentAlpha || isSrcSolid)) {
-	    ret = uxa_try_magic_two_pass_composite_helper(op, pSrc, pMask, pDst,
-						    xSrc, ySrc,
-						    xMask, yMask, xDst, yDst,
-						    width, height);
-	    if (ret == 1)
-		goto done;
 	}
-    }
 
 fallback:
-    if (uxa_screen->fallback_debug)
-	uxa_print_composite_fallback (op, pSrc, pMask, pDst);
+	uxa_print_composite_fallback("uxa_composite",
+				     op, pSrc, pMask, pDst);
 
-    uxa_check_composite (op, pSrc, pMask, pDst, xSrc, ySrc,
-		      xMask, yMask, xDst, yDst, width, height);
+	uxa_check_composite(op, pSrc, pMask, pDst, xSrc, ySrc,
+			    xMask, yMask, xDst, yDst, width, height);
 
 done:
-    pSrc->repeat = saveSrcRepeat;
-    if (pMask)
-	pMask->repeat = saveMaskRepeat;
+	pSrc->repeat = saveSrcRepeat;
+	if (pMask)
+		pMask->repeat = saveMaskRepeat;
 }
 #endif
 
@@ -793,57 +1674,35 @@ done:
  * See the comments about uxa_trapezoids and uxa_triangles.
  */
 static PicturePtr
-uxa_create_alpha_picture (ScreenPtr     pScreen,
-                       PicturePtr    pDst,
-                       PictFormatPtr pPictFormat,
-                       CARD16        width,
-                       CARD16        height)
-{
-    PixmapPtr	    pPixmap;
-    PicturePtr	    pPicture;
-    GCPtr	    pGC;
-    int		    error;
-    xRectangle	    rect;
-
-    if (width > 32767 || height > 32767)
-	return 0;
-
-    if (!pPictFormat)
-    {
-	if (pDst->polyEdge == PolyEdgeSharp)
-	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-	else
-	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-	if (!pPictFormat)
-	    return 0;
-    }
+uxa_create_alpha_picture(ScreenPtr pScreen,
+			 PicturePtr pDst,
+			 PictFormatPtr pPictFormat, CARD16 width, CARD16 height)
+{
+	PixmapPtr pPixmap;
+	PicturePtr pPicture;
+	int error;
+
+	if (width > 32767 || height > 32767)
+		return 0;
+
+	if (!pPictFormat) {
+		if (pDst->polyEdge == PolyEdgeSharp)
+			pPictFormat = PictureMatchFormat(pScreen, 1, PICT_a1);
+		else
+			pPictFormat = PictureMatchFormat(pScreen, 8, PICT_a8);
+		if (!pPictFormat)
+			return 0;
+	}
 
-#ifdef SERVER_1_5
-    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height,
-					pPictFormat->depth, 0);
-#else
-    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height,
-					pPictFormat->depth);
-#endif
-    if (!pPixmap)
-	return 0;
-    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-    if (!pGC)
-    {
+	pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height,
+					    pPictFormat->depth,
+					    UXA_CREATE_PIXMAP_FOR_MAP);
+	if (!pPixmap)
+		return 0;
+	pPicture = CreatePicture(0, &pPixmap->drawable, pPictFormat,
+				 0, 0, serverClient, &error);
 	(*pScreen->DestroyPixmap) (pPixmap);
-	return 0;
-    }
-    ValidateGC (&pPixmap->drawable, pGC);
-    rect.x = 0;
-    rect.y = 0;
-    rect.width = width;
-    rect.height = height;
-    uxa_check_poly_fill_rect (&pPixmap->drawable, pGC, 1, &rect);
-    FreeScratchGC (pGC);
-    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-			      0, 0, serverClient, &error);
-    (*pScreen->DestroyPixmap) (pPixmap);
-    return pPicture;
+	return pPicture;
 }
 
 /**
@@ -856,86 +1715,116 @@ uxa_create_alpha_picture (ScreenPtr
  * call to RasterizeTrapezoid won't be accelerated however, which
  * forces the pixmap to be moved out again.
  *
- * uxa_create_alpha_picture avoids this roundtrip by using uxa_check_poly_fill_rect
- * to initialize the contents.
+ * uxa_create_alpha_picture avoids this roundtrip by using
+ * uxa_check_poly_fill_rect to initialize the contents.
  */
 void
-uxa_trapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
-               PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
-               int ntrap, xTrapezoid *traps)
-{
-    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-    BoxRec		bounds;
-    Bool		direct = op == PictOpAdd && miIsSolidAlpha (pSrc);
+uxa_trapezoids(CARD8 op, PicturePtr src, PicturePtr dst,
+	       PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
+	       int ntrap, xTrapezoid * traps)
+{
+	ScreenPtr screen = dst->pDrawable->pScreen;
+	BoxRec bounds;
+	Bool direct;
+
+	direct = op == PictOpAdd && miIsSolidAlpha(src);
+	if (maskFormat || direct) {
+		miTrapezoidBounds(ntrap, traps, &bounds);
 
-    if (maskFormat || direct) {
-	miTrapezoidBounds (ntrap, traps, &bounds);
+		if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
+			return;
+	}
 
-	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-	    return;
-    }
+	/*
+	 * Check for solid alpha add
+	 */
+	if (direct) {
+		DrawablePtr pDraw = dst->pDrawable;
+		PixmapPtr pixmap = uxa_get_drawable_pixmap(pDraw);
+		int xoff, yoff;
+
+		uxa_get_drawable_deltas(pDraw, pixmap, &xoff, &yoff);
+
+		xoff += pDraw->x;
+		yoff += pDraw->y;
+
+		if (uxa_prepare_access(pDraw, UXA_ACCESS_RW)) {
+			PictureScreenPtr ps = GetPictureScreen(screen);
+
+			for (; ntrap; ntrap--, traps++)
+				(*ps->RasterizeTrapezoid) (dst, traps, 0, 0);
+			uxa_finish_access(pDraw);
+		}
+	} else if (maskFormat) {
+		PixmapPtr scratch = NULL;
+		PicturePtr mask;
+		INT16 xDst, yDst;
+		INT16 xRel, yRel;
+		int width, height;
+		pixman_image_t *image;
+		pixman_format_code_t format;
+
+		xDst = traps[0].left.p1.x >> 16;
+		yDst = traps[0].left.p1.y >> 16;
+
+		width  = bounds.x2 - bounds.x1;
+		height = bounds.y2 - bounds.y1;
+
+		format = maskFormat->format |
+			(BitsPerPixel(maskFormat->depth) << 24);
+		image =
+		    pixman_image_create_bits(format, width, height, NULL, 0);
+		if (!image)
+			return;
+
+		for (; ntrap; ntrap--, traps++)
+			pixman_rasterize_trapezoid(image,
+						   (pixman_trapezoid_t *) traps,
+						   -bounds.x1, -bounds.y1);
+		if (uxa_drawable_is_offscreen(dst->pDrawable)) {
+			mask = uxa_picture_from_pixman_image(screen, image, format);
+		} else {
+			int error;
+
+			scratch = GetScratchPixmapHeader(screen, width, height,
+							PIXMAN_FORMAT_DEPTH(format),
+							PIXMAN_FORMAT_BPP(format),
+							pixman_image_get_stride(image),
+							pixman_image_get_data(image));
+			mask = CreatePicture(0, &scratch->drawable,
+					     PictureMatchFormat(screen,
+								PIXMAN_FORMAT_DEPTH(format),
+								format),
+					     0, 0, serverClient, &error);
+		}
+		if (!mask) {
+			if (scratch)
+				FreeScratchPixmapHeader(scratch);
+			pixman_image_unref(image);
+			return;
+		}
 
-    /*
-     * Check for solid alpha add
-     */
-    if (direct)
-    {
-	DrawablePtr pDraw = pDst->pDrawable;
-	PixmapPtr pixmap = uxa_get_drawable_pixmap (pDraw);
-	int xoff, yoff;
-
-	uxa_get_drawable_deltas(pDraw, pixmap, &xoff, &yoff);
-
-	xoff += pDraw->x;
-	yoff += pDraw->y;
-
-	if (uxa_prepare_access(pDraw, UXA_ACCESS_RW))
-	{
-	    for (; ntrap; ntrap--, traps++)
-		(*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-	    uxa_finish_access(pDraw);
+		xRel = bounds.x1 + xSrc - xDst;
+		yRel = bounds.y1 + ySrc - yDst;
+		CompositePicture(op, src, mask, dst,
+				 xRel, yRel,
+				 0, 0,
+				 bounds.x1, bounds.y1,
+				 width, height);
+		FreePicture(mask, 0);
+
+		if (scratch)
+			FreeScratchPixmapHeader(scratch);
+		pixman_image_unref(image);
+	} else {
+		if (dst->polyEdge == PolyEdgeSharp)
+			maskFormat = PictureMatchFormat(screen, 1, PICT_a1);
+		else
+			maskFormat = PictureMatchFormat(screen, 8, PICT_a8);
+		for (; ntrap; ntrap--, traps++)
+			uxa_trapezoids(op, src, dst, maskFormat, xSrc, ySrc,
+				       1, traps);
 	}
-    }
-    else if (maskFormat)
-    {
-	PicturePtr	pPicture;
-	INT16		xDst, yDst;
-	INT16		xRel, yRel;
-
-	xDst = traps[0].left.p1.x >> 16;
-	yDst = traps[0].left.p1.y >> 16;
-
-	pPicture = uxa_create_alpha_picture (pScreen, pDst, maskFormat,
-	                                  bounds.x2 - bounds.x1,
-	                                  bounds.y2 - bounds.y1);
-	if (!pPicture)
-	    return;
-
-	if (uxa_prepare_access(pPicture->pDrawable, UXA_ACCESS_RW)) {
-	    for (; ntrap; ntrap--, traps++)
-		(*ps->RasterizeTrapezoid) (pPicture, traps,
-					   -bounds.x1, -bounds.y1);
-	    uxa_finish_access(pPicture->pDrawable);
-	}
-
-	xRel = bounds.x1 + xSrc - xDst;
-	yRel = bounds.y1 + ySrc - yDst;
-	CompositePicture (op, pSrc, pPicture, pDst,
-			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-			  bounds.x2 - bounds.x1,
-			  bounds.y2 - bounds.y1);
-	FreePicture (pPicture, 0);
-    }
-    else
-    {
-	if (pDst->polyEdge == PolyEdgeSharp)
-	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-	else
-	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-	for (; ntrap; ntrap--, traps++)
-	    uxa_trapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-    }
 }
 
 /**
@@ -948,72 +1837,86 @@ uxa_trapezoids (CARD8 op, PicturePtr pSr
  * call to AddTriangles won't be accelerated however, which forces the pixmap
  * to be moved out again.
  *
- * uxa_create_alpha_picture avoids this roundtrip by using uxa_check_poly_fill_rect
- * to initialize the contents.
+ * uxa_create_alpha_picture avoids this roundtrip by using
+ * uxa_check_poly_fill_rect to initialize the contents.
  */
 void
-uxa_triangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+uxa_triangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 	      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
-	      int ntri, xTriangle *tris)
+	      int ntri, xTriangle * tris)
 {
-    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-    BoxRec		bounds;
-    Bool		direct = op == PictOpAdd && miIsSolidAlpha (pSrc);
+	ScreenPtr pScreen = pDst->pDrawable->pScreen;
+	PictureScreenPtr ps = GetPictureScreen(pScreen);
+	BoxRec bounds;
+	Bool direct = op == PictOpAdd && miIsSolidAlpha(pSrc);
 
-    if (maskFormat || direct) {
-	miTriangleBounds (ntri, tris, &bounds);
+	if (maskFormat || direct) {
+		miTriangleBounds(ntri, tris, &bounds);
 
-	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-	    return;
-    }
-
-    /*
-     * Check for solid alpha add
-     */
-    if (direct)
-    {
-	DrawablePtr pDraw = pDst->pDrawable;
-	if (uxa_prepare_access(pDraw, UXA_ACCESS_RW)) {
-	    (*ps->AddTriangles) (pDst, 0, 0, ntri, tris);
-	    uxa_finish_access(pDraw);
+		if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
+			return;
 	}
-    }
-    else if (maskFormat)
-    {
-	PicturePtr	pPicture;
-	INT16		xDst, yDst;
-	INT16		xRel, yRel;
-	
-	xDst = tris[0].p1.x >> 16;
-	yDst = tris[0].p1.y >> 16;
-
-	pPicture = uxa_create_alpha_picture (pScreen, pDst, maskFormat,
-					  bounds.x2 - bounds.x1,
-					  bounds.y2 - bounds.y1);
-	if (!pPicture)
-	    return;
 
-	if (uxa_prepare_access(pPicture->pDrawable, UXA_ACCESS_RW)) {
-	    (*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1, ntri, tris);
-	    uxa_finish_access(pPicture->pDrawable);
-	}
-	
-	xRel = bounds.x1 + xSrc - xDst;
-	yRel = bounds.y1 + ySrc - yDst;
-	CompositePicture (op, pSrc, pPicture, pDst,
-			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-			  bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
-	FreePicture (pPicture, 0);
-    }
-    else
-    {
-	if (pDst->polyEdge == PolyEdgeSharp)
-	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-	else
-	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-	
-	for (; ntri; ntri--, tris++)
-	    uxa_triangles (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris);
-    }
+	/*
+	 * Check for solid alpha add
+	 */
+	if (direct) {
+		DrawablePtr pDraw = pDst->pDrawable;
+		if (uxa_prepare_access(pDraw, UXA_ACCESS_RW)) {
+			(*ps->AddTriangles) (pDst, 0, 0, ntri, tris);
+			uxa_finish_access(pDraw);
+		}
+	} else if (maskFormat) {
+		PicturePtr pPicture;
+		INT16 xDst, yDst;
+		INT16 xRel, yRel;
+		int width = bounds.x2 - bounds.x1;
+		int height = bounds.y2 - bounds.y1;
+		GCPtr pGC;
+		xRectangle rect;
+
+		xDst = tris[0].p1.x >> 16;
+		yDst = tris[0].p1.y >> 16;
+
+		pPicture = uxa_create_alpha_picture(pScreen, pDst, maskFormat,
+						    width, height);
+		if (!pPicture)
+			return;
+
+		/* Clear the alpha picture to 0. */
+		pGC = GetScratchGC(pPicture->pDrawable->depth, pScreen);
+		if (!pGC) {
+			FreePicture(pPicture, 0);
+			return;
+		}
+		ValidateGC(pPicture->pDrawable, pGC);
+		rect.x = 0;
+		rect.y = 0;
+		rect.width = width;
+		rect.height = height;
+		uxa_check_poly_fill_rect(pPicture->pDrawable, pGC, 1, &rect);
+		FreeScratchGC(pGC);
+
+		if (uxa_prepare_access(pPicture->pDrawable, UXA_ACCESS_RW)) {
+			(*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1,
+					     ntri, tris);
+			uxa_finish_access(pPicture->pDrawable);
+		}
+
+		xRel = bounds.x1 + xSrc - xDst;
+		yRel = bounds.y1 + ySrc - yDst;
+		CompositePicture(op, pSrc, pPicture, pDst,
+				 xRel, yRel, 0, 0, bounds.x1, bounds.y1,
+				 bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
+		FreePicture(pPicture, 0);
+	} else {
+		if (pDst->polyEdge == PolyEdgeSharp)
+			maskFormat = PictureMatchFormat(pScreen, 1, PICT_a1);
+		else
+			maskFormat = PictureMatchFormat(pScreen, 8, PICT_a8);
+
+		for (; ntri; ntri--, tris++)
+			uxa_triangles(op, pSrc, pDst, maskFormat, xSrc, ySrc, 1,
+				      tris);
+	}
 }
diff -Naurp old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-unaccel.c new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-unaccel.c
--- old/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-unaccel.c	2009-06-09 04:54:32.000000000 +0200
+++ new/xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-unaccel.c	2011-02-08 11:14:00.000000000 +0100
@@ -41,383 +41,360 @@
  * 1bpp and never in fb, so we don't worry about them.
  * We should worry about them for completeness sake and going forward.
  */
-Bool
-uxa_prepare_access_gc(GCPtr pGC)
+Bool uxa_prepare_access_gc(GCPtr pGC)
 {
-    if (pGC->stipple)
-        if (!uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RO))
-	    return FALSE;
-    if (pGC->fillStyle == FillTiled)
-	if (!uxa_prepare_access(&pGC->tile.pixmap->drawable, UXA_ACCESS_RO)) {
-	    if (pGC->stipple)
-		uxa_finish_access(&pGC->stipple->drawable);
-	    return FALSE;
-	}
-    return TRUE;
+	if (pGC->stipple)
+		if (!uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RO))
+			return FALSE;
+	if (pGC->fillStyle == FillTiled)
+		if (!uxa_prepare_access
+		    (&pGC->tile.pixmap->drawable, UXA_ACCESS_RO)) {
+			if (pGC->stipple)
+				uxa_finish_access(&pGC->stipple->drawable);
+			return FALSE;
+		}
+	return TRUE;
 }
 
 /**
  * Finishes access to the tile in the GC, if used.
  */
-void
-uxa_finish_access_gc(GCPtr pGC)
+void uxa_finish_access_gc(GCPtr pGC)
 {
-    if (pGC->fillStyle == FillTiled)
-	uxa_finish_access(&pGC->tile.pixmap->drawable);
-    if (pGC->stipple)
-        uxa_finish_access(&pGC->stipple->drawable);
+	if (pGC->fillStyle == FillTiled)
+		uxa_finish_access(&pGC->tile.pixmap->drawable);
+	if (pGC->stipple)
+		uxa_finish_access(&pGC->stipple->drawable);
 }
 
-char
-uxa_drawable_location(DrawablePtr pDrawable)
+char uxa_drawable_location(DrawablePtr pDrawable)
 {
-    return uxa_drawable_is_offscreen(pDrawable) ? 's' : 'm';
+	return uxa_drawable_is_offscreen(pDrawable) ? 's' : 'm';
 }
 
 void
-uxa_check_fill_spans (DrawablePtr pDrawable, GCPtr pGC, int nspans,
-		   DDXPointPtr ppt, int *pwidth, int fSorted)
+uxa_check_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int nspans,
+		     DDXPointPtr ppt, int *pwidth, int fSorted)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access_gc (pGC)) {
-	    fbFillSpans (pDrawable, pGC, nspans, ppt, pwidth, fSorted);
-	    uxa_finish_access_gc (pGC);
+	UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access_gc(pGC)) {
+			fbFillSpans(pDrawable, pGC, nspans, ppt, pwidth,
+				    fSorted);
+			uxa_finish_access_gc(pGC);
+		}
+		uxa_finish_access(pDrawable);
 	}
-	uxa_finish_access (pDrawable);
-    }
 }
 
 void
-uxa_check_set_spans (DrawablePtr pDrawable, GCPtr pGC, char *psrc,
-		 DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
+uxa_check_set_spans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
+		    DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	fbSetSpans (pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
-	uxa_finish_access (pDrawable);
-    }
+	UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		fbSetSpans(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
+		uxa_finish_access(pDrawable);
+	}
 }
 
 void
-uxa_check_put_image (DrawablePtr pDrawable, GCPtr pGC, int depth,
-		 int x, int y, int w, int h, int leftPad, int format,
-		 char *bits)
+uxa_check_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth,
+		    int x, int y, int w, int h, int leftPad, int format,
+		    char *bits)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	fbPutImage (pDrawable, pGC, depth, x, y, w, h, leftPad, format, bits);
-	uxa_finish_access (pDrawable);
-    }
+	UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		fbPutImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format,
+			   bits);
+		uxa_finish_access(pDrawable);
+	}
 }
 
 RegionPtr
-uxa_check_copy_area (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-		     int srcx, int srcy, int w, int h, int dstx, int dsty)
+uxa_check_copy_area(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		    int srcx, int srcy, int w, int h, int dstx, int dsty)
 {
-    ScreenPtr screen = pSrc->pScreen;
-    RegionPtr ret = NULL;
+	ScreenPtr screen = pSrc->pScreen;
+	RegionPtr ret = NULL;
 
-    UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
-		  uxa_drawable_location(pSrc), uxa_drawable_location(pDst)));
-    if (uxa_prepare_access (pDst, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access (pSrc, UXA_ACCESS_RO)) {
-	    ret = fbCopyArea (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty);
-	    uxa_finish_access (pSrc);
-	}
-	uxa_finish_access (pDst);
-    }
-    return ret;
+	UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
+		      uxa_drawable_location(pSrc),
+		      uxa_drawable_location(pDst)));
+	if (uxa_prepare_access(pDst, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access(pSrc, UXA_ACCESS_RO)) {
+			ret =
+			    fbCopyArea(pSrc, pDst, pGC, srcx, srcy, w, h, dstx,
+				       dsty);
+			uxa_finish_access(pSrc);
+		}
+		uxa_finish_access(pDst);
+	}
+	return ret;
 }
 
 RegionPtr
-uxa_check_copy_plane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-		  int srcx, int srcy, int w, int h, int dstx, int dsty,
-		  unsigned long bitPlane)
+uxa_check_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		     int srcx, int srcy, int w, int h, int dstx, int dsty,
+		     unsigned long bitPlane)
 {
-    ScreenPtr screen = pSrc->pScreen;
-    RegionPtr ret = NULL;
+	ScreenPtr screen = pSrc->pScreen;
+	RegionPtr ret = NULL;
 
-    UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
-		  uxa_drawable_location(pSrc), uxa_drawable_location(pDst)));
-    if (uxa_prepare_access (pDst, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access (pSrc, UXA_ACCESS_RO)) {
-	    ret = fbCopyPlane (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty,
-			       bitPlane);
-	    uxa_finish_access (pSrc);
+	UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
+		      uxa_drawable_location(pSrc),
+		      uxa_drawable_location(pDst)));
+	if (uxa_prepare_access(pDst, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access(pSrc, UXA_ACCESS_RO)) {
+			ret =
+			    fbCopyPlane(pSrc, pDst, pGC, srcx, srcy, w, h, dstx,
+					dsty, bitPlane);
+			uxa_finish_access(pSrc);
+		}
+		uxa_finish_access(pDst);
 	}
-	uxa_finish_access (pDst);
-    }
-    return ret;
+	return ret;
 }
 
 void
-uxa_check_poly_point (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
-		  DDXPointPtr pptInit)
+uxa_check_poly_point(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
+		     DDXPointPtr pptInit)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	fbPolyPoint (pDrawable, pGC, mode, npt, pptInit);
-	uxa_finish_access (pDrawable);
-    }
+	UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		fbPolyPoint(pDrawable, pGC, mode, npt, pptInit);
+		uxa_finish_access(pDrawable);
+	}
 }
 
 void
-uxa_check_poly_lines (DrawablePtr pDrawable, GCPtr pGC,
-		  int mode, int npt, DDXPointPtr ppt)
+uxa_check_poly_lines(DrawablePtr pDrawable, GCPtr pGC,
+		     int mode, int npt, DDXPointPtr ppt)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c), width %d, mode %d, count %d\n",
-		  pDrawable, uxa_drawable_location(pDrawable),
-		  pGC->lineWidth, mode, npt));
+	UXA_FALLBACK(("to %p (%c), width %d, mode %d, count %d\n",
+		      pDrawable, uxa_drawable_location(pDrawable),
+		      pGC->lineWidth, mode, npt));
 
-    if (pGC->lineWidth == 0) {
-	if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	    if (uxa_prepare_access_gc (pGC)) {
-		fbPolyLine (pDrawable, pGC, mode, npt, ppt);
-		uxa_finish_access_gc (pGC);
-	    }
-	    uxa_finish_access (pDrawable);
+	if (pGC->lineWidth == 0) {
+		if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+			if (uxa_prepare_access_gc(pGC)) {
+				fbPolyLine(pDrawable, pGC, mode, npt, ppt);
+				uxa_finish_access_gc(pGC);
+			}
+			uxa_finish_access(pDrawable);
+		}
+		return;
 	}
-	return;
-    }
-    /* fb calls mi functions in the lineWidth != 0 case. */
-    fbPolyLine (pDrawable, pGC, mode, npt, ppt);
+	/* fb calls mi functions in the lineWidth != 0 case. */
+	fbPolyLine(pDrawable, pGC, mode, npt, ppt);
 }
 
 void
-uxa_check_poly_segment (DrawablePtr pDrawable, GCPtr pGC,
-		    int nsegInit, xSegment *pSegInit)
+uxa_check_poly_segment(DrawablePtr pDrawable, GCPtr pGC,
+		       int nsegInit, xSegment * pSegInit)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c) width %d, count %d\n", pDrawable,
-		  uxa_drawable_location(pDrawable), pGC->lineWidth, nsegInit));
-    if (pGC->lineWidth == 0) {
-	if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	    if (uxa_prepare_access_gc (pGC)) {
-		fbPolySegment (pDrawable, pGC, nsegInit, pSegInit);
-		uxa_finish_access_gc (pGC);
-	    }
-	    uxa_finish_access (pDrawable);
+	UXA_FALLBACK(("to %p (%c) width %d, count %d\n", pDrawable,
+		      uxa_drawable_location(pDrawable), pGC->lineWidth,
+		      nsegInit));
+	if (pGC->lineWidth == 0) {
+		if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+			if (uxa_prepare_access_gc(pGC)) {
+				fbPolySegment(pDrawable, pGC, nsegInit,
+					      pSegInit);
+				uxa_finish_access_gc(pGC);
+			}
+			uxa_finish_access(pDrawable);
+		}
+		return;
 	}
-	return;
-    }
-    /* fb calls mi functions in the lineWidth != 0 case. */
-    fbPolySegment (pDrawable, pGC, nsegInit, pSegInit);
+	/* fb calls mi functions in the lineWidth != 0 case. */
+	fbPolySegment(pDrawable, pGC, nsegInit, pSegInit);
 }
 
 void
-uxa_check_poly_arc (DrawablePtr pDrawable, GCPtr pGC,
-		int narcs, xArc *pArcs)
+uxa_check_poly_arc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc * pArcs)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+	UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
 
-    /* Disable this as fbPolyArc can call miZeroPolyArc which in turn
-     * can call accelerated functions, that as yet, haven't been notified
-     * with uxa_finish_access().
-     */
+	/* Disable this as fbPolyArc can call miZeroPolyArc which in turn
+	 * can call accelerated functions, that as yet, haven't been notified
+	 * with uxa_finish_access().
+	 */
 #if 0
-    if (pGC->lineWidth == 0)
-    {
-	if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	    if (uxa_prepare_access_gc (pGC)) {
-		fbPolyArc (pDrawable, pGC, narcs, pArcs);
-		uxa_finish_access_gc (pGC);
-	    }
-	    uxa_finish_access (pDrawable);
+	if (pGC->lineWidth == 0) {
+		if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+			if (uxa_prepare_access_gc(pGC)) {
+				fbPolyArc(pDrawable, pGC, narcs, pArcs);
+				uxa_finish_access_gc(pGC);
+			}
+			uxa_finish_access(pDrawable);
+		}
+		return;
 	}
-	return;
-    }
 #endif
-    miPolyArc (pDrawable, pGC, narcs, pArcs);
+	miPolyArc(pDrawable, pGC, narcs, pArcs);
 }
 
 void
-uxa_check_poly_fill_rect (DrawablePtr pDrawable, GCPtr pGC,
-		     int nrect, xRectangle *prect)
+uxa_check_poly_fill_rect(DrawablePtr pDrawable, GCPtr pGC,
+			 int nrect, xRectangle * prect)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+	UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
 
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access_gc (pGC)) {
-	    fbPolyFillRect (pDrawable, pGC, nrect, prect);
-	    uxa_finish_access_gc (pGC);
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access_gc(pGC)) {
+			fbPolyFillRect(pDrawable, pGC, nrect, prect);
+			uxa_finish_access_gc(pGC);
+		}
+		uxa_finish_access(pDrawable);
 	}
-	uxa_finish_access (pDrawable);
-    }
 }
 
 void
-uxa_check_image_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
-		      int x, int y, unsigned int nglyph,
-		      CharInfoPtr *ppci, pointer pglyphBase)
+uxa_check_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
+			  int x, int y, unsigned int nglyph,
+			  CharInfoPtr * ppci, pointer pglyphBase)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c)\n", pDrawable,
-		  uxa_drawable_location(pDrawable)));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access_gc (pGC)) {
-	    fbImageGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
-	    uxa_finish_access_gc (pGC);
+	UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access_gc(pGC)) {
+			fbImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci,
+					pglyphBase);
+			uxa_finish_access_gc(pGC);
+		}
+		uxa_finish_access(pDrawable);
 	}
-	uxa_finish_access (pDrawable);
-    }
 }
 
 void
-uxa_check_poly_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
-		     int x, int y, unsigned int nglyph,
-		     CharInfoPtr *ppci, pointer pglyphBase)
+uxa_check_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
+			 int x, int y, unsigned int nglyph,
+			 CharInfoPtr * ppci, pointer pglyphBase)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,
-		  uxa_drawable_location(pDrawable), pGC->fillStyle, pGC->alu));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access_gc (pGC)) {
-	    fbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
-	    uxa_finish_access_gc (pGC);
+	UXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,
+		      uxa_drawable_location(pDrawable), pGC->fillStyle,
+		      pGC->alu));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access_gc(pGC)) {
+			fbPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci,
+				       pglyphBase);
+			uxa_finish_access_gc(pGC);
+		}
+		uxa_finish_access(pDrawable);
 	}
-	uxa_finish_access (pDrawable);
-    }
 }
 
 void
-uxa_check_push_pixels (GCPtr pGC, PixmapPtr pBitmap,
-		   DrawablePtr pDrawable,
-		   int w, int h, int x, int y)
+uxa_check_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
+		      DrawablePtr pDrawable, int w, int h, int x, int y)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("from %p to %p (%c,%c)\n", pBitmap, pDrawable,
-		  uxa_drawable_location(&pBitmap->drawable),
-		  uxa_drawable_location(pDrawable)));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access (&pBitmap->drawable, UXA_ACCESS_RO)) {
-	    if (uxa_prepare_access_gc (pGC)) {
-		fbPushPixels (pGC, pBitmap, pDrawable, w, h, x, y);
-		uxa_finish_access_gc (pGC);
-	    }
-	    uxa_finish_access (&pBitmap->drawable);
+	UXA_FALLBACK(("from %p to %p (%c,%c)\n", pBitmap, pDrawable,
+		      uxa_drawable_location(&pBitmap->drawable),
+		      uxa_drawable_location(pDrawable)));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RW)) {
+		if (uxa_prepare_access(&pBitmap->drawable, UXA_ACCESS_RO)) {
+			if (uxa_prepare_access_gc(pGC)) {
+				fbPushPixels(pGC, pBitmap, pDrawable, w, h, x,
+					     y);
+				uxa_finish_access_gc(pGC);
+			}
+			uxa_finish_access(&pBitmap->drawable);
+		}
+		uxa_finish_access(pDrawable);
 	}
-	uxa_finish_access (pDrawable);
-    }
 }
 
 void
-uxa_check_get_spans (DrawablePtr pDrawable,
-		 int wMax,
-		 DDXPointPtr ppt,
-		 int *pwidth,
-		 int nspans,
-		 char *pdstStart)
+uxa_check_get_spans(DrawablePtr pDrawable,
+		    int wMax,
+		    DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)
 {
-    ScreenPtr screen = pDrawable->pScreen;
+	ScreenPtr screen = pDrawable->pScreen;
 
-    UXA_FALLBACK(("from %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
-    if (uxa_prepare_access (pDrawable, UXA_ACCESS_RO)) {
-	fbGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
-	uxa_finish_access (pDrawable);
-    }
+	UXA_FALLBACK(("from %p (%c)\n", pDrawable,
+		      uxa_drawable_location(pDrawable)));
+	if (uxa_prepare_access(pDrawable, UXA_ACCESS_RO)) {
+		fbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
+		uxa_finish_access(pDrawable);
+	}
 }
 
-#ifndef SERVER_1_5
 void
-uxa_check_paint_window (WindowPtr pWin, RegionPtr pRegion, int what)
+uxa_check_composite(CARD8 op,
+		    PicturePtr pSrc,
+		    PicturePtr pMask,
+		    PicturePtr pDst,
+		    INT16 xSrc, INT16 ySrc,
+		    INT16 xMask, INT16 yMask,
+		    INT16 xDst, INT16 yDst,
+		    CARD16 width, CARD16 height)
 {
-    ScreenPtr screen = pWin->drawable.pScreen;
+	ScreenPtr screen = pDst->pDrawable->pScreen;
+
+	UXA_FALLBACK(("from picts %p/%p to pict %p\n", pSrc, pMask, pDst));
 
-    UXA_FALLBACK(("from %p (%c)\n", pWin,
-		  uxa_drawable_location (&pWin->drawable)));
-    if (uxa_prepare_access (&pWin->drawable, UXA_ACCESS_RW)) {
-	if (uxa_prepare_access_window (pWin)) {
-	    fbPaintWindow (pWin, pRegion, what);
-	    uxa_finish_access_window (pWin);
+	if (uxa_prepare_access(pDst->pDrawable, UXA_ACCESS_RW)) {
+		if (pSrc->pDrawable == NULL ||
+		    uxa_prepare_access(pSrc->pDrawable, UXA_ACCESS_RO)) {
+			if (!pMask || pMask->pDrawable == NULL ||
+			    uxa_prepare_access(pMask->pDrawable, UXA_ACCESS_RO))
+			{
+				fbComposite(op, pSrc, pMask, pDst,
+					    xSrc, ySrc,
+					    xMask, yMask,
+					    xDst, yDst,
+					    width, height);
+				if (pMask && pMask->pDrawable != NULL)
+					uxa_finish_access(pMask->pDrawable);
+			}
+			if (pSrc->pDrawable != NULL)
+				uxa_finish_access(pSrc->pDrawable);
+		}
+		uxa_finish_access(pDst->pDrawable);
 	}
-	uxa_finish_access(&pWin->drawable);
-    }
 }
-#endif
 
 void
-uxa_check_composite (CARD8      op,
-                   PicturePtr pSrc,
-                   PicturePtr pMask,
-                   PicturePtr pDst,
-                   INT16      xSrc,
-                   INT16      ySrc,
-                   INT16      xMask,
-                   INT16      yMask,
-                   INT16      xDst,
-                   INT16      yDst,
-                   CARD16     width,
-                   CARD16     height)
-{
-    ScreenPtr screen = pDst->pDrawable->pScreen;
-
-    UXA_FALLBACK(("from picts %p/%p to pict %p\n",
-		 pSrc, pMask, pDst));
-
-    if (uxa_prepare_access (pDst->pDrawable, UXA_ACCESS_RW))
-    {
-	if (pSrc->pDrawable == NULL ||
-	    uxa_prepare_access (pSrc->pDrawable, UXA_ACCESS_RO))
-	{
-	    if (!pMask || pMask->pDrawable == NULL ||
-		uxa_prepare_access (pMask->pDrawable, UXA_ACCESS_RO))
-	    {
-		fbComposite (op,
-			     pSrc,
-			     pMask,
-			     pDst,
-			     xSrc,
-			     ySrc,
-			     xMask,
-			     yMask,
-			     xDst,
-			     yDst,
-			     width,
-			     height);
-		if (pMask && pMask->pDrawable != NULL)
-		    uxa_finish_access (pMask->pDrawable);
-	    }
-	    if (pSrc->pDrawable != NULL)
-		uxa_finish_access (pSrc->pDrawable);
-	}
-	uxa_finish_access (pDst->pDrawable);
-    }
-}
+uxa_check_add_traps(PicturePtr pPicture,
+		    INT16 x_off, INT16 y_off, int ntrap, xTrap * traps)
+{
+	ScreenPtr screen = pPicture->pDrawable->pScreen;
 
-void
-uxa_check_add_traps (PicturePtr	pPicture,
-		  INT16		x_off,
-		  INT16		y_off,
-		  int		ntrap,
-		  xTrap		*traps)
-{
-    ScreenPtr screen = pPicture->pDrawable->pScreen;
-
-    UXA_FALLBACK(("to pict %p (%c)\n", pPicture,
-		  uxa_drawable_location(pPicture->pDrawable)));
-    if (uxa_prepare_access(pPicture->pDrawable, UXA_ACCESS_RW)) {
-	fbAddTraps (pPicture, x_off, y_off, ntrap, traps);
-	uxa_finish_access(pPicture->pDrawable);
-    }
+	UXA_FALLBACK(("to pict %p (%c)\n", pPicture,
+		      uxa_drawable_location(pPicture->pDrawable)));
+	if (uxa_prepare_access(pPicture->pDrawable, UXA_ACCESS_RW)) {
+		fbAddTraps(pPicture, x_off, y_off, ntrap, traps);
+		uxa_finish_access(pPicture->pDrawable);
+	}
 }
 
 /**
@@ -426,29 +403,28 @@ uxa_check_add_traps (PicturePtr	pPicture
  *
  * XXX This really belongs in fb, so it can be aware of tiling and etc.
  */
-CARD32
-uxa_get_pixmap_first_pixel (PixmapPtr pPixmap)
+CARD32 uxa_get_pixmap_first_pixel(PixmapPtr pPixmap)
 {
-    CARD32 pixel;
-    void *fb;
+	CARD32 pixel;
+	void *fb;
 
-    if (!uxa_prepare_access (&pPixmap->drawable, UXA_ACCESS_RO))
-	return 0;
+	if (!uxa_prepare_access(&pPixmap->drawable, UXA_ACCESS_RO))
+		return 0;
 
-    fb = pPixmap->devPrivate.ptr;
-
-    switch (pPixmap->drawable.bitsPerPixel) {
-    case 32:
-	pixel = *(CARD32 *)fb;
-	break;
-    case 16:
-	pixel = *(CARD16 *)fb;
-	break;
-    default:
-	pixel = *(CARD8 *)fb;
-	break;
-    }
-    uxa_finish_access(&pPixmap->drawable);
+	fb = pPixmap->devPrivate.ptr;
+
+	switch (pPixmap->drawable.bitsPerPixel) {
+	case 32:
+		pixel = *(CARD32 *) fb;
+		break;
+	case 16:
+		pixel = *(CARD16 *) fb;
+		break;
+	default:
+		pixel = *(CARD8 *) fb;
+		break;
+	}
+	uxa_finish_access(&pPixmap->drawable);
 
-    return pixel;
+	return pixel;
 }